Module Name:    src
Committed By:   christos
Date:           Tue Nov 24 16:17:04 UTC 2020

Modified Files:
        src/sys/sys: device.h param.h

Log Message:
PR/55816: Martin Husemann: widen cfunit to 24 bits so that it fits the
largest minor number which is 20 bits. Welcome to 2x2x19.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/sys/device.h
cvs rdiff -u -r1.679 -r1.680 src/sys/sys/param.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/sys/device.h
diff -u src/sys/sys/device.h:1.158 src/sys/sys/device.h:1.159
--- src/sys/sys/device.h:1.158	Sat Oct  3 18:32:50 2020
+++ src/sys/sys/device.h	Tue Nov 24 11:17:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.158 2020/10/03 22:32:50 riastradh Exp $ */
+/* $NetBSD: device.h,v 1.159 2020/11/24 16:17:04 christos Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -279,8 +279,8 @@ struct cfparent {
 struct cfdata {
 	const char *cf_name;		/* driver name */
 	const char *cf_atname;		/* attachment name */
-	short	cf_unit;		/* unit number */
-	short	cf_fstate;		/* finding state (below) */
+	unsigned int cf_unit:24;	/* unit number */
+	unsigned char cf_fstate;	/* finding state (below) */
 	int	*cf_loc;		/* locators (machine dependent) */
 	int	cf_flags;		/* flags from config */
 	const struct cfparent *cf_pspec;/* parent specification */

Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.679 src/sys/sys/param.h:1.680
--- src/sys/sys/param.h:1.679	Thu Nov 12 02:44:01 2020
+++ src/sys/sys/param.h	Tue Nov 24 11:17:04 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.679 2020/11/12 07:44:01 simonb Exp $	*/
+/*	$NetBSD: param.h,v 1.680 2020/11/24 16:17:04 christos Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
  *	2.99.9		(299000900)
  */
 
-#define	__NetBSD_Version__	999007500	/* NetBSD 9.99.75 */
+#define	__NetBSD_Version__	999007600	/* NetBSD 9.99.76 */
 
 #define __NetBSD_Prereq__(M,m,p) (((((M) * 100000000) + \
     (m) * 1000000) + (p) * 100) <= __NetBSD_Version__)

Reply via email to