[src/trunk]: src/sys/sys PR/55816: Martin Husemann: widen cfunit to 24 bits s...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a0c869e58d3
branches:  trunk
changeset: 946345:9a0c869e58d3
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Nov 24 16:17:04 2020 +0000

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

diffstat:

 sys/sys/device.h |  6 +++---
 sys/sys/param.h  |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 0d0178df112c -r 9a0c869e58d3 sys/sys/device.h
--- a/sys/sys/device.h  Tue Nov 24 15:59:18 2020 +0000
+++ b/sys/sys/device.h  Tue Nov 24 16:17:04 2020 +0000
@@ -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 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 */
diff -r 0d0178df112c -r 9a0c869e58d3 sys/sys/param.h
--- a/sys/sys/param.h   Tue Nov 24 15:59:18 2020 +0000
+++ b/sys/sys/param.h   Tue Nov 24 16:17:04 2020 +0000
@@ -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__)