Module Name: src
Committed By: pgoyette
Date: Sun Mar 18 23:34:25 UTC 2018
Modified Files:
src/sys/compat/common [pgoyette-compat]: ccd_60.c compat_60_mod.c
compat_mod.h kern_cpu_60.c tty_60.c
src/sys/compat/sys [pgoyette-compat]: cpuio.h
Log Message:
Merge changes from HEAD into ccd_60.c
For all of the individual xxx_60_{init,fini} routines, don't force
them to artificially return a status; just make them void. This
simplifies the compat_60_{init,fini} handling of errors that remain.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/ccd_60.c
cvs rdiff -u -r1.1.2.9 -r1.1.2.10 src/sys/compat/common/compat_60_mod.c
cvs rdiff -u -r1.1.42.5 -r1.1.42.6 src/sys/compat/common/compat_mod.h
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 src/sys/compat/common/kern_cpu_60.c
cvs rdiff -u -r1.4.16.2 -r1.4.16.3 src/sys/compat/common/tty_60.c
cvs rdiff -u -r1.5.16.4 -r1.5.16.5 src/sys/compat/sys/cpuio.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/compat/common/ccd_60.c
diff -u src/sys/compat/common/ccd_60.c:1.1.2.3 src/sys/compat/common/ccd_60.c:1.1.2.4
--- src/sys/compat/common/ccd_60.c:1.1.2.3 Sun Mar 18 22:49:26 2018
+++ src/sys/compat/common/ccd_60.c Sun Mar 18 23:34:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd_60.c,v 1.1.2.3 2018/03/18 22:49:26 pgoyette Exp $ */
+/* $NetBSD: ccd_60.c,v 1.1.2.4 2018/03/18 23:34:25 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.3 2018/03/18 22:49:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd_60.c,v 1.1.2.4 2018/03/18 23:34:25 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -50,10 +50,8 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
int (*f)(dev_t, u_long, void *, int, struct lwp *))
{
switch (cmd) {
-#if defined(COMPAT_60) && !defined(_LP64)
+#ifdef CCDIOCSET_60
case CCDIOCSET_60: {
- int error;
-
if (data == NULL)
return 0;
@@ -65,7 +63,7 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
ccio.ccio_ileave = ccio60->ccio_ileave;
ccio.ccio_flags = ccio60->ccio_flags;
ccio.ccio_unit = ccio60->ccio_unit;
- error = (*f)(dev, CCDIOCSET, &ccio, flag, l);
+ int error = (*f)(dev, CCDIOCSET, &ccio, flag, l);
if (!error) {
/* Copy data back, adjust types if necessary */
ccio60->ccio_disks = ccio.ccio_disks;
@@ -79,31 +77,27 @@ compat_60_ccdioctl(dev_t dev, u_long cmd
}
case CCDIOCCLR_60:
- int error;
-
if (data == NULL)
return ENOSYS;
/*
* ccio_size member not used, so existing struct OK
* drop through to existing non-compat version
*/
- return (*f)(dev, CCDIOCLR, data, flag, l);
-#endif /* COMPAT_60 && !_LP64*/
+ return (*f)(dev, CCDIOCCLR, data, flag, l);
+#endif
default:
return ENOSYS;
}
}
-int
+void
ccd_60_init(void)
{
compat_ccd_ioctl_60 = compat_60_ccdioctl;
- return 0;
}
-int
+void
ccd_60_fini(void)
{
compat_ccd_ioctl_60 = (void *)enosys;
- return 0;
}
Index: src/sys/compat/common/compat_60_mod.c
diff -u src/sys/compat/common/compat_60_mod.c:1.1.2.9 src/sys/compat/common/compat_60_mod.c:1.1.2.10
--- src/sys/compat/common/compat_60_mod.c:1.1.2.9 Sun Mar 18 21:41:31 2018
+++ src/sys/compat/common/compat_60_mod.c Sun Mar 18 23:34:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_60_mod.c,v 1.1.2.9 2018/03/18 21:41:31 pgoyette Exp $ */
+/* $NetBSD: compat_60_mod.c,v 1.1.2.10 2018/03/18 23:34:25 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.9 2018/03/18 21:41:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_60_mod.c,v 1.1.2.10 2018/03/18 23:34:25 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_60_mo
#include <compat/common/compat_util.h>
#include <compat/common/compat_mod.h>
+#include <compat/sys/ccdvar.h>
#include <compat/sys/cpuio.h>
#define REQUIRED_60 "compat_70" /* XXX No compat_80 yet */
@@ -71,30 +72,10 @@ compat_60_init(void)
return 0;
}
- error = kern_tty_60_init();
- if (error != 0) {
- kern_sa_60_fini();
- kern_time_60_fini();
- return 0;
- }
-
- error = ccd_60_init();
- if (error != 0) {
- kern_tty_60_fini();
- kern_sa_60_fini();
- kern_time_60_fini();
- return 0;
- }
-
+ kern_tty_60_init();
+ ccd_60_init();
#ifdef CPU_UCODE
- error = kern_cpu_60_init();
- if (error != 0) {
- ccd_60_fini();
- kern_tty_60_fini();
- kern_sa_60_fini();
- kern_time_60_fini();
- return 0;
- }
+ kern_cpu_60_init();
#endif
return error;
@@ -106,27 +87,11 @@ compat_60_fini(void)
int error = 0;
#ifdef CPU_UCODE
- error = kern_cpu_60_fini();
- if (error != 0)
- return error;
-#endif
-
- error = ccd_60_fini():
- if (error != 0) {
-#ifdef CPU_UCODE
- kern_cpu_60_init();
- return error;
+ kern_cpu_60_fini();
#endif
- }
+ ccd_60_fini();
+ kern_tty_60_fini();
- error = kern_tty_60_fini();
- if (error != 0) {
- ccd_60_init();
-#ifdef CPU_UCODE
- kern_cpu_60_init();
-#endif
- return error;
- }
error = kern_sa_60_fini();
if (error != 0) {
@@ -140,8 +105,8 @@ compat_60_fini(void)
error = kern_time_60_fini();
if (error != 0) {
- kern_tty_60_init();
kern_sa_60_init();
+ kern_tty_60_init();
ccd_60_init();
#ifdef CPU_UCODE
kern_cpu_60_init();
Index: src/sys/compat/common/compat_mod.h
diff -u src/sys/compat/common/compat_mod.h:1.1.42.5 src/sys/compat/common/compat_mod.h:1.1.42.6
--- src/sys/compat/common/compat_mod.h:1.1.42.5 Sun Mar 18 09:00:55 2018
+++ src/sys/compat/common/compat_mod.h Sun Mar 18 23:34:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.h,v 1.1.42.5 2018/03/18 09:00:55 pgoyette Exp $ */
+/* $NetBSD: compat_mod.h,v 1.1.42.6 2018/03/18 23:34:25 pgoyette Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -52,8 +52,8 @@ int kern_time_60_init(void);
int kern_time_60_fini(void);
int kern_sa_60_init(void);
int kern_sa_60_fini(void);
-int kern_tty_60_init(void);
-int kern_tty_60_fini(void);
+void kern_tty_60_init(void);
+void kern_tty_60_fini(void);
#endif
#endif /* !_COMPAT_MOD_H_ */
Index: src/sys/compat/common/kern_cpu_60.c
diff -u src/sys/compat/common/kern_cpu_60.c:1.1.2.4 src/sys/compat/common/kern_cpu_60.c:1.1.2.5
--- src/sys/compat/common/kern_cpu_60.c:1.1.2.4 Sun Mar 18 09:00:55 2018
+++ src/sys/compat/common/kern_cpu_60.c Sun Mar 18 23:34:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu_60.c,v 1.1.2.4 2018/03/18 09:00:55 pgoyette Exp $ */
+/* $NetBSD: kern_cpu_60.c,v 1.1.2.5 2018/03/18 23:34:25 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu_60.c,v 1.1.2.4 2018/03/18 09:00:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu_60.c,v 1.1.2.5 2018/03/18 23:34:25 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -71,18 +71,16 @@ compat6_cpuctl_ioctl(struct lwp *l, u_lo
}
}
-int
+void
kern_cpu_60_init(void)
{
compat_cpuctl_ioctl = compat6_cpuctl_ioctl;
- return 0;
}
-int
+void
kern_cpu_60_fini(void)
{
compat_cpuctl_ioctl = (void *)enosys;
- return 0;
}
Index: src/sys/compat/common/tty_60.c
diff -u src/sys/compat/common/tty_60.c:1.4.16.2 src/sys/compat/common/tty_60.c:1.4.16.3
--- src/sys/compat/common/tty_60.c:1.4.16.2 Sun Mar 18 12:06:59 2018
+++ src/sys/compat/common/tty_60.c Sun Mar 18 23:34:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tty_60.c,v 1.4.16.2 2018/03/18 12:06:59 pgoyette Exp $ */
+/* $NetBSD: tty_60.c,v 1.4.16.3 2018/03/18 23:34:25 pgoyette Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.4.16.2 2018/03/18 12:06:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.4.16.3 2018/03/18 23:34:25 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -117,20 +117,17 @@ compat_60_ptmioctl(dev_t dev, u_long cmd
}
}
-int
+void
kern_tty_60_init(void)
{
vec_compat_ttioctl_60 = compat_60_ttioctl;
/* vec_compat_ptmioctl_60 = compat_60_ptmioctl; XXX NOT-YET */
- return 0;
}
-int
+void
kern_tty_60_fini(void)
{
vec_compat_ttioctl_60 = NULL;
/* vec_compat_ptmioctl_60 = NULL; XXX NOT-YET */
-
- return 0;
}
Index: src/sys/compat/sys/cpuio.h
diff -u src/sys/compat/sys/cpuio.h:1.5.16.4 src/sys/compat/sys/cpuio.h:1.5.16.5
--- src/sys/compat/sys/cpuio.h:1.5.16.4 Sun Mar 18 09:00:55 2018
+++ src/sys/compat/sys/cpuio.h Sun Mar 18 23:34:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuio.h,v 1.5.16.4 2018/03/18 09:00:55 pgoyette Exp $ */
+/* $NetBSD: cpuio.h,v 1.5.16.5 2018/03/18 23:34:25 pgoyette Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ extern int (*compat_cpuctl_ioctl)(struct
#define OIOC_CPU_UCODE_GET_VERSION _IOR('c', 4, struct compat6_cpu_ucode)
#define OIOC_CPU_UCODE_APPLY _IOW('c', 5, struct compat6_cpu_ucode)
-int kern_cpu_60_init(void);
-int kern_cpu_60_fini(void);
+void kern_cpu_60_init(void);
+void kern_cpu_60_fini(void);
#endif /* _COMPAT_SYS_CPUIO_H */
