Module Name: src
Committed By: he
Date: Sun May 31 17:47:26 UTC 2009
Modified Files:
src/sys/arch/evbarm/g42xxeb: gb225_pcic.c
Log Message:
Adapt to changes in sa11x0 code, with struct device * -> device_t changes.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/g42xxeb/gb225_pcic.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/arch/evbarm/g42xxeb/gb225_pcic.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.7 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.8
--- src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.7 Sat Dec 15 00:39:15 2007
+++ src/sys/arch/evbarm/g42xxeb/gb225_pcic.c Sun May 31 17:47:26 2009
@@ -120,7 +120,7 @@
{
struct opcic_softc *sc = (struct opcic_softc *)(so->ss.sc);
struct opio_softc *osc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
return bus_space_read_1(osc->sc_iot, osc->sc_ioh,
GB225_CFDET + 2 * so->ss.socket);
@@ -184,7 +184,7 @@
paa.iosize = 0x4000000;
sc->sc_socket[i].ss.pcmcia =
- (struct device *)config_found_ia(&sc->sc_pc.sc_dev,
+ config_found_ia(sc->sc_pc.sc_dev,
"pcmciabus", &paa, opcic_print);
#ifndef DONT_USE_CARD_DETECT_INTR
@@ -284,9 +284,9 @@
struct opcic_socket *so = (struct opcic_socket *)__so;
struct opcic_softc *sc = (struct opcic_softc *)so->ss.sc;
struct opio_softc *psc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
struct obio_softc *bsc =
- (struct obio_softc *) device_parent(&psc->sc_dev);
+ device_private(device_parent(&psc->sc_dev));
switch (which) {
case SAPCIC_CONTROL_RESET:
@@ -317,7 +317,7 @@
struct opcic_socket *so = (struct opcic_socket *)__so;
struct opcic_softc *sc = (struct opcic_softc *)so->ss.sc;
struct opio_softc *psc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
int shift, save;
volatile uint8_t *p;
@@ -352,9 +352,9 @@
{
struct opcic_softc *sc = (struct opcic_softc *)so->sc;
struct opio_softc *psc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
struct obio_softc *bsc =
- (struct obio_softc *) device_parent(&psc->sc_dev);
+ device_private(device_parent(&psc->sc_dev));
int irq;
DPRINTF(("opcic_intr_establish %d\n", so->socket));
@@ -369,7 +369,7 @@
{
struct opcic_softc *sc = (struct opcic_softc *)so->sc;
struct opio_softc *psc =
- (struct opio_softc *) device_parent(&sc->sc_pc.sc_dev);
+ device_private(device_parent(sc->sc_pc.sc_dev));
struct obio_softc *bsc =
(struct obio_softc *) device_parent(&psc->sc_dev);
int (* func)(void *) = ((struct obio_handler *)ih)->func;
