Module Name: src
Committed By: christos
Date: Mon Dec 5 19:20:55 UTC 2011
Modified Files:
src/sys/dev/isa: joy_isa.c
src/sys/dev/isapnp: joy_isapnp.c
src/sys/dev/pci: joy_pci.c
Log Message:
make joy code consistent (avoid games with pointers), and fix the isa softc
declaration
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/isa/joy_isa.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/isapnp/joy_isapnp.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/joy_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isa/joy_isa.c
diff -u src/sys/dev/isa/joy_isa.c:1.13 src/sys/dev/isa/joy_isa.c:1.14
--- src/sys/dev/isa/joy_isa.c:1.13 Wed Nov 23 18:07:32 2011
+++ src/sys/dev/isa/joy_isa.c Mon Dec 5 14:20:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_isa.c,v 1.13 2011/11/23 23:07:32 jmcneill Exp $ */
+/* $NetBSD: joy_isa.c,v 1.14 2011/12/05 19:20:54 christos Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.13 2011/11/23 23:07:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.14 2011/12/05 19:20:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v
#define JOY_NPORTS 1
struct joy_isa_softc {
- struct joy_softc *sc;
+ struct joy_softc sc_joy;
kmutex_t sc_lock;
};
@@ -101,8 +101,8 @@ joy_isa_probe(device_t parent, cfdata_t
static void
joy_isa_attach(device_t parent, device_t self, void *aux)
{
- struct joy_softc *sc = device_private(self);
struct joy_isa_softc *isc = device_private(self);
+ struct joy_softc *sc = &isc->sc_joy;
struct isa_attach_args *ia = aux;
aprint_normal("\n");
Index: src/sys/dev/isapnp/joy_isapnp.c
diff -u src/sys/dev/isapnp/joy_isapnp.c:1.13 src/sys/dev/isapnp/joy_isapnp.c:1.14
--- src/sys/dev/isapnp/joy_isapnp.c:1.13 Wed Nov 23 18:07:33 2011
+++ src/sys/dev/isapnp/joy_isapnp.c Mon Dec 5 14:20:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_isapnp.c,v 1.13 2011/11/23 23:07:33 jmcneill Exp $ */
+/* $NetBSD: joy_isapnp.c,v 1.14 2011/12/05 19:20:54 christos Exp $ */
/*-
* Copyright (c) 1996, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.13 2011/11/23 23:07:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.14 2011/12/05 19:20:54 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,8 +71,8 @@ joy_isapnp_match(device_t parent, cfdata
static void
joy_isapnp_attach(device_t parent, device_t self, void *aux)
{
- struct joy_softc *sc = device_private(self);
struct joy_isapnp_softc *isc = device_private(self);
+ struct joy_softc *sc = &isc->sc_joy;
struct isapnp_attach_args *ipa = aux;
bus_space_handle_t ioh;
Index: src/sys/dev/pci/joy_pci.c
diff -u src/sys/dev/pci/joy_pci.c:1.18 src/sys/dev/pci/joy_pci.c:1.19
--- src/sys/dev/pci/joy_pci.c:1.18 Wed Nov 23 18:07:35 2011
+++ src/sys/dev/pci/joy_pci.c Mon Dec 5 14:20:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_pci.c,v 1.18 2011/11/23 23:07:35 jmcneill Exp $ */
+/* $NetBSD: joy_pci.c,v 1.19 2011/12/05 19:20:55 christos Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.18 2011/11/23 23:07:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.19 2011/12/05 19:20:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,8 +88,8 @@ bar_is_io(pci_chipset_tag_t pc, pcitag_t
static void
joy_pci_attach(device_t parent, device_t self, void *aux)
{
- struct joy_softc *sc = device_private(self);
struct joy_pci_softc *psc = device_private(self);
+ struct joy_softc *sc = &psc->sc_joy;
struct pci_attach_args *pa = aux;
char devinfo[256];
bus_size_t mapsize;
