Sun Dec 19 01:38:58 2021 UTC ()

Linux uses inclusive start/end, not start/size. Match.


(riastradh)

diff -r1.3 -r1.4 src/sys/external/bsd/drm2/include/linux/ioport.h

--- src/sys/external/bsd/drm2/include/linux/ioport.h 2021/12/19 01:35:04	1.3
+++ src/sys/external/bsd/drm2/include/linux/ioport.h 2021/12/19 01:38:58	1.4

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -30,33 +30,34 @@
  */
 #ifndef _LINUX_IOPORT_H_
 #define _LINUX_IOPORT_H_
 #include <sys/types.h>
 #include <sys/bus.h>
 #define	IORESOURCE_IO	0
 #define	IORESOURCE_MEM	1
 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.  */
 	bus_space_handle_t r_bsh;
 };
 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_ */