Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allocate channel structures as part of the softc rather than malloc'ing them 

at run time.  This simplifies the code and avoids problems with uninitialised
variables, and if it's good enough for pciide(4), it's good enough for me.

Also normalise the prefix for channel-specific messages.
This commit is contained in:
bjh21 2002-09-15 11:00:11 +00:00
parent 40b2b53564
commit 166f9fdf01
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/arch/acorn32/podulebus/icside.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: icside.c,v 1.4 2002/09/14 18:12:16 bjh21 Exp $ */ /* $NetBSD: icside.c,v 1.5 2002/09/15 11:00:11 bjh21 Exp $ */
/* /*
* Copyright (c) 1997-1998 Mark Brinicombe * Copyright (c) 1997-1998 Mark Brinicombe
@ -86,6 +86,7 @@ struct icside_softc {
bus_space_tag_t sc_latchiot; /* EEPROM page latch etc */ bus_space_tag_t sc_latchiot; /* EEPROM page latch etc */
bus_space_handle_t sc_latchioh; bus_space_handle_t sc_latchioh;
void *sc_shutdownhook; void *sc_shutdownhook;
struct channel_softc *sc_chp[ICSIDE_MAX_CHANNELS];
struct icside_channel { struct icside_channel {
struct channel_softc wdc_channel; /* generic part */ struct channel_softc wdc_channel; /* generic part */
void *ic_ih; /* interrupt handler */ void *ic_ih; /* interrupt handler */
@ -94,7 +95,7 @@ struct icside_softc {
u_int ic_irqmask; /* location */ u_int ic_irqmask; /* location */
bus_space_tag_t ic_irqiot; /* Bus space tag */ bus_space_tag_t ic_irqiot; /* Bus space tag */
bus_space_handle_t ic_irqioh; /* handle for IRQ */ bus_space_handle_t ic_irqioh; /* handle for IRQ */
} *icside_channels; } sc_chan[ICSIDE_MAX_CHANNELS];
}; };
int icside_probe __P((struct device *, struct cfdata *, void *)); int icside_probe __P((struct device *, struct cfdata *, void *));
@ -256,22 +257,14 @@ icside_attach(parent, self, aux)
sc->sc_tag.bs_wm_2 = icside_bs_wm_2; sc->sc_tag.bs_wm_2 = icside_bs_wm_2;
/* Initialize wdc struct */ /* Initialize wdc struct */
sc->sc_wdcdev.channels = malloc( sc->sc_wdcdev.channels = sc->sc_chp;
sizeof(struct channel_softc *) * ide->channels, M_DEVBUF, M_NOWAIT);
sc->icside_channels = malloc(
sizeof(struct icside_channel) * ide->channels, M_DEVBUF, M_NOWAIT);
if (sc->sc_wdcdev.channels == NULL || sc->icside_channels == NULL) {
printf("%s: can't allocate channel infos\n",
sc->sc_wdcdev.sc_dev.dv_xname);
return;
}
sc->sc_wdcdev.nchannels = ide->channels; sc->sc_wdcdev.nchannels = ide->channels;
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16; sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16;
sc->sc_wdcdev.PIO_cap = 0; sc->sc_wdcdev.PIO_cap = 0;
sc->sc_pa = pa; sc->sc_pa = pa;
for (channel = 0; channel < ide->channels; ++channel) { for (channel = 0; channel < ide->channels; ++channel) {
icp = &sc->icside_channels[channel]; icp = &sc->sc_chan[channel];
sc->sc_wdcdev.channels[channel] = &icp->wdc_channel; sc->sc_wdcdev.channels[channel] = &icp->wdc_channel;
cp = &icp->wdc_channel; cp = &icp->wdc_channel;
@ -280,10 +273,9 @@ icside_attach(parent, self, aux)
cp->ch_queue = malloc(sizeof(struct channel_queue), M_DEVBUF, cp->ch_queue = malloc(sizeof(struct channel_queue), M_DEVBUF,
M_NOWAIT); M_NOWAIT);
if (cp->ch_queue == NULL) { if (cp->ch_queue == NULL) {
printf("%s %s channel: " printf("%s:%d: "
"can't allocate memory for command queue", "can't allocate memory for command queue",
sc->sc_wdcdev.sc_dev.dv_xname, sc->sc_wdcdev.sc_dev.dv_xname, channel);
(channel == 0) ? "primary" : "secondary");
continue; continue;
} }
cp->cmd_iot = &sc->sc_tag; cp->cmd_iot = &sc->sc_tag;

4
sys/arch/acorn32/podulebus/icsidereg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: icsidereg.h,v 1.2 2002/09/14 18:12:16 bjh21 Exp $ */ /* $NetBSD: icsidereg.h,v 1.3 2002/09/15 11:00:11 bjh21 Exp $ */
/* /*
* Copyright (c) 1997 Mark Brinicombe * Copyright (c) 1997 Mark Brinicombe
@ -47,6 +47,8 @@
/* IDE drive registers */ /* IDE drive registers */
#define ICSIDE_MAX_CHANNELS 2
/* ARCIN V5 registers */ /* ARCIN V5 registers */
#define V5_IDE_BASE 0x2800 /* byte offset from base */ #define V5_IDE_BASE 0x2800 /* byte offset from base */
#define V5_AUX_BASE 0x2a80 /* byte offset from base */ #define V5_AUX_BASE 0x2a80 /* byte offset from base */