Module Name:    src
Committed By:   riastradh
Date:           Sun Dec 19 01:38:58 UTC 2021

Modified Files:
        src/sys/external/bsd/drm2/include/linux: ioport.h

Log Message:
Linux uses inclusive start/end, not start/size. Match.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/ioport.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/include/linux/ioport.h
diff -u src/sys/external/bsd/drm2/include/linux/ioport.h:1.3 src/sys/external/bsd/drm2/include/linux/ioport.h:1.4
--- src/sys/external/bsd/drm2/include/linux/ioport.h:1.3	Sun Dec 19 01:35:04 2021
+++ src/sys/external/bsd/drm2/include/linux/ioport.h	Sun Dec 19 01:38:58 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ioport.h,v 1.3 2021/12/19 01:35:04 riastradh Exp $	*/
+/*	$NetBSD: ioport.h,v 1.4 2021/12/19 01:38:58 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
 
 struct resource {
 	bus_addr_t start;
-	bus_size_t size;
+	bus_addr_t end;		/* WARNING: Inclusive! */
 	const char *name;
 	unsigned int flags;
 	bus_space_tag_t r_bst;	/* This milk is not organic.  */
@@ -50,13 +50,14 @@ struct resource {
 static inline bus_size_t
 resource_size(struct resource *resource)
 {
-	return resource->size;
+	return resource->end - resource->start + 1;
 }
 
 static inline void
 release_resource(struct resource *resource)
 {
-	bus_space_free(resource->r_bst, resource->r_bsh, resource->size);
+	bus_space_free(resource->r_bst, resource->r_bsh,
+	    resource_size(resource));
 }
 
 #endif  /* _LINUX_IOPORT_H_ */

Reply via email to