Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/sys sys: Split struct device into a private device_impl.h.



details:   https://anonhg.NetBSD.org/src/rev/514995427a5b
branches:  trunk
changeset: 364525:514995427a5b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Mar 28 12:38:57 2022 +0000

description:
sys: Split struct device into a private device_impl.h.

Include this only inside autoconf itself, and a few files that abuse
autoconf in ways I can't confidently make easy fixes for.

XXX kernel ABI change requires bump -- no more use of struct device
internals allowed, previously done by some drivers

diffstat:

 sys/arch/amiga/amiga/autoconf.c       |    5 +-
 sys/arch/amiga/dev/grf_cc.c           |    5 +-
 sys/arch/amiga/dev/grf_cl.c           |    5 +-
 sys/arch/amiga/dev/grf_cv.c           |    5 +-
 sys/arch/amiga/dev/grf_cv3d.c         |    5 +-
 sys/arch/amiga/dev/grf_et.c           |    5 +-
 sys/arch/amiga/dev/grf_rh.c           |    5 +-
 sys/arch/amiga/dev/grf_rt.c           |    5 +-
 sys/arch/amiga/dev/grf_ul.c           |    5 +-
 sys/arch/amigappc/amigappc/autoconf.c |    5 +-
 sys/arch/arm/iomd/iomdiic.c           |    3 +-
 sys/arch/atari/atari/autoconf.c       |    5 +-
 sys/arch/atari/dev/ite_cc.c           |    5 +-
 sys/arch/atari/dev/ite_et.c           |    5 +-
 sys/arch/dreamcast/dev/maple/maple.c  |    5 +-
 sys/arch/mips/mips/cpu_subr.c         |    5 +-
 sys/ddb/db_autoconf.c                 |    5 +-
 sys/dev/sbus/esp_sbus.c               |    5 +-
 sys/dev/wscons/wsmux.c                |    5 +-
 sys/kern/kern_pmf.c                   |    5 +-
 sys/kern/subr_autoconf.c              |    5 +-
 sys/kern/subr_device.c                |    5 +-
 sys/rump/librump/rumpkern/rump.c      |    5 +-
 sys/sys/device.h                      |   71 +------------
 sys/sys/device_impl.h                 |  183 ++++++++++++++++++++++++++++++++++
 25 files changed, 257 insertions(+), 110 deletions(-)

diffs (truncated from 852 to 300 lines):

diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/amiga/autoconf.c
--- a/sys/arch/amiga/amiga/autoconf.c   Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/amiga/autoconf.c   Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.120 2021/08/07 16:18:41 thorpej Exp $   */
+/*     $NetBSD: autoconf.c,v 1.121 2022/03/28 12:38:57 riastradh Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.120 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.121 2022/03/28 12:38:57 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,6 +39,7 @@
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/dev/grf_cc.c
--- a/sys/arch/amiga/dev/grf_cc.c       Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/dev/grf_cc.c       Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cc.c,v 1.43 2021/08/07 16:18:41 thorpej Exp $ */
+/*     $NetBSD: grf_cc.c,v 1.44 2022/03/28 12:38:57 riastradh Exp $ */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cc.c,v 1.43 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cc.c,v 1.44 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "grfcc.h"
 #include "ite.h"
@@ -47,6 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/queue.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <machine/cpu.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/dev/grf_cl.c
--- a/sys/arch/amiga/dev/grf_cl.c       Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/dev/grf_cl.c       Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cl.c,v 1.54 2021/12/26 16:08:19 andvar Exp $ */
+/*     $NetBSD: grf_cl.c,v 1.55 2022/03/28 12:38:57 riastradh Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.54 2021/12/26 16:08:19 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.55 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "grfcl.h"
 #include "ite.h"
@@ -78,6 +78,7 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/malloc.h>
 
 #include <machine/cpu.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/dev/grf_cv.c
--- a/sys/arch/amiga/dev/grf_cv.c       Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/dev/grf_cv.c       Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cv.c,v 1.63 2022/01/01 11:45:37 msaitoh Exp $ */
+/*     $NetBSD: grf_cv.c,v 1.64 2022/03/28 12:38:57 riastradh Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.63 2022/01/01 11:45:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.64 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "grfcv.h"
 #include "ite.h"
@@ -57,6 +57,7 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/dev/grf_cv3d.c
--- a/sys/arch/amiga/dev/grf_cv3d.c     Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/dev/grf_cv3d.c     Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cv3d.c,v 1.38 2022/01/01 11:45:37 msaitoh Exp $ */
+/*     $NetBSD: grf_cv3d.c,v 1.39 2022/03/28 12:38:57 riastradh Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.38 2022/01/01 11:45:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.39 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "grfcv3d.h"
 #include "ite.h"
@@ -81,6 +81,7 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/dev/grf_et.c
--- a/sys/arch/amiga/dev/grf_et.c       Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/dev/grf_et.c       Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_et.c,v 1.39 2021/12/26 16:08:19 andvar Exp $ */
+/*     $NetBSD: grf_et.c,v 1.40 2022/03/28 12:38:57 riastradh Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -37,7 +37,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.39 2021/12/26 16:08:19 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.40 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "grfet.h"
 #include "ite.h"
@@ -69,6 +69,7 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/malloc.h>
 
 #include <machine/cpu.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/dev/grf_rh.c
--- a/sys/arch/amiga/dev/grf_rh.c       Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/dev/grf_rh.c       Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_rh.c,v 1.60 2021/08/09 21:13:05 andvar Exp $ */
+/*     $NetBSD: grf_rh.c,v 1.61 2022/03/28 12:38:57 riastradh Exp $ */
 
 /*
  * Copyright (c) 1994 Markus Wild
@@ -34,7 +34,7 @@
 #include "opt_retina.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_rh.c,v 1.60 2021/08/09 21:13:05 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_rh.c,v 1.61 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "grfrh.h"
 #include "ite.h"
@@ -50,6 +50,7 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/malloc.h>
 #include <machine/cpu.h>
 #include <amiga/amiga/device.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/dev/grf_rt.c
--- a/sys/arch/amiga/dev/grf_rt.c       Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/dev/grf_rt.c       Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_rt.c,v 1.60 2021/08/07 16:18:41 thorpej Exp $ */
+/*     $NetBSD: grf_rt.c,v 1.61 2022/03/28 12:38:57 riastradh Exp $ */
 
 /*
  * Copyright (c) 1993 Markus Wild
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_rt.c,v 1.60 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_rt.c,v 1.61 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "grfrt.h"
 #include "ite.h"
@@ -47,6 +47,7 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <machine/cpu.h>
 #include <amiga/amiga/device.h>
 #include <amiga/dev/zbusvar.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amiga/dev/grf_ul.c
--- a/sys/arch/amiga/dev/grf_ul.c       Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amiga/dev/grf_ul.c       Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_ul.c,v 1.53 2021/08/07 16:18:41 thorpej Exp $ */
+/*     $NetBSD: grf_ul.c,v 1.54 2022/03/28 12:38:57 riastradh Exp $ */
 #define UL_DEBUG
 
 /*-
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.53 2021/08/07 16:18:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.54 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "grful.h"
 #include "ite.h"
@@ -47,6 +47,7 @@
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 
diff -r 9df7a090e68a -r 514995427a5b sys/arch/amigappc/amigappc/autoconf.c
--- a/sys/arch/amigappc/amigappc/autoconf.c     Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/amigappc/amigappc/autoconf.c     Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.9 2021/08/07 16:18:42 thorpej Exp $     */
+/*     $NetBSD: autoconf.c,v 1.10 2022/03/28 12:38:57 riastradh Exp $  */
 
 /*
  * Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2021/08/07 16:18:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2022/03/28 12:38:57 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -39,6 +39,7 @@
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/arm/iomd/iomdiic.c
--- a/sys/arch/arm/iomd/iomdiic.c       Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/arm/iomd/iomdiic.c       Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iomdiic.c,v 1.11 2021/08/07 16:18:44 thorpej Exp $     */
+/*     $NetBSD: iomdiic.c,v 1.12 2022/03/28 12:38:57 riastradh Exp $   */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -37,6 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
diff -r 9df7a090e68a -r 514995427a5b sys/arch/atari/atari/autoconf.c
--- a/sys/arch/atari/atari/autoconf.c   Mon Mar 28 12:38:33 2022 +0000
+++ b/sys/arch/atari/atari/autoconf.c   Mon Mar 28 12:38:57 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.71 2021/08/07 16:18:46 thorpej Exp $    */
+/*     $NetBSD: autoconf.c,v 1.72 2022/03/28 12:38:57 riastradh Exp $  */
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.71 2021/08/07 16:18:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.72 2022/03/28 12:38:57 riastradh Exp $");
 
 #include "opt_md.h"
 
@@ -41,6 +41,7 @@
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/device.h>
+#include <sys/device_impl.h>   /* XXX autoconf abuse */



Home | Main Index | Thread Index | Old Index