if pss(4) mpu support, or wdc isapnp support, or whatever else isn't done
yet in isa/, i'm officially betting it's not getting done. atticize.
Index: isapnp.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/isa/isapnp.c,v
retrieving revision 1.39
diff -u -r1.39 isapnp.c
--- isapnp.c 7 Apr 2011 15:30:16 -0000 1.39
+++ isapnp.c 28 Jun 2011 18:59:22 -0000
@@ -329,14 +329,6 @@
return error;
bad:
-#ifdef notyet
- for (ndrq--; ndrq >= 0; ndrq--)
- isapnp_free_pin(&ipa->ipa_drq[ndrq]);
-
- for (nirq--; nirq >= 0; nirq--)
- isapnp_free_pin(&ipa->ipa_irq[nirq]);
-#endif
-
for (nmem32--; nmem32 >= 0; nmem32--)
isapnp_free_region(memt, &ipa->ipa_mem32[nmem32]);
@@ -371,14 +363,6 @@
struct isa_attach_args *ipa;
{
int i;
-
-#ifdef notyet
- for (i = 0; i < ipa->ipa_ndrq; i++)
- isapnp_free_pin(&ipa->ipa_drq[i]);
-
- for (i = 0; i < ipa->ipa_nirq; i++)
- isapnp_free_pin(&ipa->ipa_irq[i]);
-#endif
for (i = 0; i < ipa->ipa_nmem32; i++)
isapnp_free_region(memt, &ipa->ipa_mem32[i]);
Index: pss.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/isa/pss.c,v
retrieving revision 1.24
diff -u -r1.24 pss.c
--- pss.c 30 Jun 2010 11:21:35 -0000 1.24
+++ pss.c 28 Jun 2011 19:02:07 -0000
@@ -127,24 +127,6 @@
int mic_mute, cd_mute, dac_mute;
};
-#ifdef notyet
-struct mpu_softc {
- struct device sc_dev; /* base device */
- void *sc_ih; /* interrupt vectoring */
-
- int sc_iobase; /* MIDI I/O port base address */
- int sc_irq; /* MIDI interrupt */
-};
-
-struct pcd_softc {
- struct device sc_dev; /* base device */
- void *sc_ih; /* interrupt vectoring */
-
- int sc_iobase; /* CD I/O port base address */
- int sc_irq; /* CD interrupt */
-};
-#endif
-
#ifdef AUDIO_DEBUG
#define DPRINTF(x) if (pssdebug) printf x
int pssdebug = 0;
@@ -158,18 +140,7 @@
int spprobe(struct device *, void *, void *);
void spattach(struct device *, struct device *, void *);
-#ifdef notyet
-int mpuprobe(struct device *, void *, void *);
-void mpuattach(struct device *, struct device *, void *);
-
-int pcdprobe(struct device *, void *, void *);
-void pcdattach(struct device *, struct device *, void *);
-#endif
-
int pssintr(void *);
-#ifdef notyet
-int mpuintr(void *);
-#endif
int pss_speaker_ctl(void *, int);
@@ -187,10 +158,6 @@
int pss_setdma(int, int);
int pss_testirq(struct pss_softc *, int);
int pss_testdma(struct pss_softc *, int);
-#ifdef notyet
-int pss_reset_dsp(struct pss_softc *);
-int pss_download_dsp(struct pss_softc *, u_char *, int);
-#endif
#ifdef AUDIO_DEBUG
void pss_dump_regs(struct pss_softc *);
#endif
@@ -268,24 +235,6 @@
NULL, "sp", DV_DULL
};
-#ifdef notyet
-struct cfattach mpu_ca = {
- sizeof(struct mpu_softc), mpuprobe, mpuattach
-};
-
-struct cfdriver mpu_cd = {
- NULL, "mpu", DV_DULL
-};
-
-struct cfattach pcd_ca = {
- sizeof(struct pcd_softc), pcdprobe, pcdattach
-};
-
-struct cfdriver pcd_cd = {
- NULL, "pcd", DV_DULL
-};
-#endif
-
struct audio_device pss_device = {
"pss,ad1848",
"",
@@ -577,109 +526,6 @@
return(ret);
}
-#ifdef notyet
-int
-pss_reset_dsp(sc)
- struct pss_softc *sc;
-{
- u_long i;
- int pss_base = sc->sc_iobase;
-
- outw(pss_base+PSS_CONTROL, PSS_RESET);
-
- for (i = 0; i < 32768; i++)
- inw(pss_base+PSS_CONTROL);
-
- outw(pss_base+PSS_CONTROL, 0);
-
- return 1;
-}
-
-/*
- * This function loads an image into the PSS
- * card. The function loads the file by
- * resetting the dsp and feeding it the boot bytes.
- * First you feed the ASIC the first byte of
- * the boot sequence. The ASIC waits until it
- * detects a BMS and RD and asserts BR
- * and outputs the byte. The host must poll for
- * the BG signal. It then feeds the ASIC another
- * byte which removes BR.
- */
-int
-pss_download_dsp(sc, block, size)
- struct pss_softc *sc;
- u_char *block;
- int size;
-{
- int i, val, count;
- int pss_base = sc->sc_iobase;
-
- DPRINTF(("pss: downloading boot code..."));
-
- /* Warn DSP software that a boot is coming */
- outw(pss_base+PSS_DATA, 0x00fe);
-
- for (i = 0; i < 32768; i++)
- if (inw(pss_base+PSS_DATA) == 0x5500)
- break;
- outw(pss_base+PSS_DATA, *block++);
-
- pss_reset_dsp(sc);
-
- DPRINTF(("start "));
-
- count = 1;
- while(1) {
- int j;
- for (j=0; j<327670; j++) {
- /* Wait for BG to appear */
- if (inw(pss_base+PSS_STATUS) & PSS_FLAG3)
- break;
- }
-
- if (j==327670) {
- /* It's ok we timed out when the file was empty */
- if (count >= size)
- break;
- else {
- printf("\npss: DownLoad timeout problems, byte %d=%d\n",
- count, size);
- return 0;
- }
- }
- /* Send the next byte */
- outw(pss_base+PSS_DATA, *block++);
- count++;
- }
-
- outw(pss_base+PSS_DATA, 0);
- for (i = 0; i < 32768; i++)
- (void) inw(pss_base+PSS_STATUS);
-
- DPRINTF(("downloaded\n"));
-
- for (i = 0; i < 32768; i++) {
- val = inw(pss_base+PSS_STATUS);
- if (val & PSS_READ_FULL)
- break;
- }
-
- /* now read the version */
- for (i = 0; i < 32000; i++) {
- val = inw(pss_base+PSS_STATUS);
- if (val & PSS_READ_FULL)
- break;
- }
- if (i == 32000)
- return 0;
-
- (void) inw(pss_base+PSS_DATA);
-
- return 1;
-}
-#endif /* notyet */
-
#ifdef AUDIO_DEBUG
void
wss_dump_regs(sc)
@@ -790,19 +636,6 @@
pss_setint(ia->ia_irq, sc->sc_iobase+PSS_CONFIG);
pss_setdma(sc->sc_drq, sc->sc_iobase+PSS_CONFIG);
-#ifdef notyet
- /* Setup the Game port */
-#ifdef PSS_GAMEPORT
- DPRINTF(("Turning Game Port On.\n"));
- outw(sc->sc_iobase+PSS_STATUS, inw(sc->sc_iobase+PSS_STATUS) | GAME_BIT);
-#else
- outw(sc->sc_iobase+PSS_STATUS, inw(sc->sc_iobase+PSS_STATUS) &
GAME_BIT_MASK);
-#endif
-
- /* Reset DSP */
- pss_reset_dsp(sc);
-#endif /* notyet */
-
return 1;
}
@@ -905,104 +738,6 @@
return 1;
}
-#ifdef notyet
-int
-mpuprobe(parent, match, aux)
- struct device *parent;
- void *match, *aux;
-{
- struct mpu_softc *sc = match;
- struct pss_softc *pc = (void *) parent;
- struct cfdata *cf = (void *)sc->sc_dev.dv_cfdata;
-
- /* Check if midi is enabled; if it is check the interrupt */
- sc->sc_iobase = cf->cf_iobase;
-
- if (cf->cf_irq == IRQUNK) {
- int i;
- for (i = 0; i < 16; i++) {
- if (pss_testirq(pc, i) != 0)
- break;
- }
- if (i == 16) {
- printf("mpu: unable to locate free IRQ channel for MIDI\n");
- return 0;
- }
- else {
- cf->cf_irq = i;
- sc->sc_irq = i;
- DPRINTF(("mpu: found IRQ %d free\n", i));
- }
- }
- else {
- sc->sc_irq = cf->cf_irq;
-
- if (pss_testirq(pc, sc->sc_irq) == 0) {
- printf("pss: configured MIDI IRQ unavailable (%d)\n", sc->sc_irq);
- return 0;
- }
- }
-
- outw(pc->sc_iobase+MIDI_CONFIG,0);
- DPRINTF(("pss: mpu port 0x%x irq %d\n", sc->sc_iobase, sc->sc_irq));
- pss_setaddr(sc->sc_iobase, pc->sc_iobase+MIDI_CONFIG);
- pss_setint(sc->sc_irq, pc->sc_iobase+MIDI_CONFIG);
-
- return 1;
-}
-
-int
-pcdprobe(parent, match, aux)
- struct device *parent;
- void *match, *aux;
-{
- struct pcd_softc *sc = match;
- struct pss_softc *pc = (void *) parent;
- struct cfdata *cf = (void *)sc->sc_dev.dv_cfdata;
- u_short val;
-
- sc->sc_iobase = cf->cf_iobase;
-
- pss_setaddr(sc->sc_iobase, pc->sc_iobase+CD_CONFIG);
-
- /* Set the correct irq polarity. */
- val = inw(pc->sc_iobase+CD_CONFIG);
- outw(pc->sc_iobase+CD_CONFIG, 0);
- val &= CD_POL_MASK;
- val |= CD_POL_BIT; /* XXX if (pol) */
- outw(pc->sc_iobase+CD_CONFIG, val);
-
- if (cf->cf_irq == IRQUNK) {
- int i;
- for (i = 0; i < 16; i++) {
- if (pss_testirq(pc, i) != 0)
- break;
- }
- if (i == 16) {
- printf("pcd: unable to locate free IRQ channel for CD\n");
- return 0;
- }
- else {
- cf->cf_irq = i;
- sc->sc_irq = i;
- DPRINTF(("pcd: found IRQ %d free\n", i));
- }
- }
- else {
- sc->sc_irq = cf->cf_irq;
-
- if (pss_testirq(pc, sc->sc_irq) == 0) {
- printf("pcd: configured CD IRQ unavailable (%d)\n", sc->sc_irq);
- return 0;
- }
- return 1;
- }
- pss_setint(sc->sc_irq, pc->sc_iobase+CD_CONFIG);
-
- return 1;
-}
-#endif /* notyet */
-
/*
* Attach hardware to driver, attach hardware driver to audio
* pseudo-device driver .
@@ -1063,50 +798,6 @@
printf("\n");
}
-#ifdef notyet
-void
-mpuattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-{
- struct mpu_softc *sc = (struct mpu_softc *)self;
- struct cfdata *cf = (void *)sc->sc_dev.dv_cfdata;
- isa_chipset_tag_t ic = aux; /* XXX */
- int iobase = cf->cf_iobase;
-
- sc->sc_iobase = iobase;
-
- sc->sc_ih = isa_intr_establish(ic, cf->cf_irq, IST_EDGE, IPL_AUDIO,
- mpuintr, sc, sc->sc_dev.dv_xname);
-
- /* XXX might use pssprint func ?? */
- printf(" port 0x%x/%d irq %d\n",
- sc->sc_iobase, MIDI_NPORT, cf->cf_irq);
-}
-
-void
-pcdattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-{
- struct pcd_softc *sc = (struct pcd_softc *)self;
- struct cfdata *cf = (void *)sc->sc_dev.dv_cfdata;
- int iobase = cf->cf_iobase;
-
- /*
- * The pss driver simply enables the cd interface. The CD
- * appropriate driver - scsi (aic6360) or Sony needs to be
- * used after this to handle the device.
- */
- sc->sc_iobase = iobase;
-
- /* XXX might use pssprint func ?? */
- printf(" port 0x%x/%d irq %d\n",
- sc->sc_iobase, 2, cf->cf_irq);
-}
-#endif /* notyet */
-
-
int
pss_set_master_gain(sc, gp)
struct pss_softc *sc;
@@ -1272,23 +963,6 @@
return 0;
}
-
-#ifdef notyet
-int
-mpuintr(arg)
- void *arg;
-{
- struct mpu_softc *sc = arg;
- u_char sr;
-
- sr = inb(sc->sc_iobase+MIDI_STATUS_REG);
-
- printf("mpuintr: sc=%p sr=%x\n", sc, sr);
-
- /* XXX Need to clear intr */
- return 1;
-}
-#endif
int
pss_getdev(addr, retp)
Index: wdc_isapnp.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/isa/wdc_isapnp.c,v
retrieving revision 1.9
diff -u -r1.9 wdc_isapnp.c
--- wdc_isapnp.c 9 May 2011 22:33:54 -0000 1.9
+++ wdc_isapnp.c 28 Jun 2011 18:59:42 -0000
@@ -62,12 +62,6 @@
sizeof(struct wdc_isapnp_softc), wdc_isapnp_match, wdc_isapnp_attach
};
-#ifdef notyet
-static void wdc_isapnp_dma_setup(struct wdc_isapnp_softc *);
-static void wdc_isapnp_dma_start(void *, void *, size_t, int);
-static void wdc_isapnp_dma_finish(void *);
-#endif
-
int
wdc_isapnp_match(parent, match, aux)
struct device *parent;
@@ -118,16 +112,6 @@
ipa->ipa_irq[0].type, IPL_BIO, wdcintr, &sc->wdc_channel,
sc->sc_wdcdev.sc_dev.dv_xname);
-#ifdef notyet
- if (ipa->ipa_ndrq > 0) {
- sc->sc_drq = ipa->ipa_drq[0].num;
-
- sc->sc_ad.cap |= WDC_CAPABILITY_DMA;
- sc->sc_ad.dma_start = &wdc_isapnp_dma_start;
- sc->sc_ad.dma_finish = &wdc_isapnp_dma_finish;
- wdc_isapnp_dma_setup(sc);
- }
-#endif
sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32;
sc->sc_wdcdev.PIO_cap = 0;
sc->wdc_chanptr = &sc->wdc_channel;
@@ -145,40 +129,3 @@
wdcattach(&sc->wdc_channel);
wdc_print_current_modes(&sc->wdc_channel);
}
-
-#ifdef notyet
-static void
-wdc_isapnp_dma_setup(sc)
- struct wdc_isapnp_softc *sc;
-{
-
- if (isa_dmamap_create(sc->sc_ic, sc->sc_drq,
- MAXPHYS, BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW)) {
- printf("%s: can't create map for drq %d\n",
- sc->sc_wdcdev.sc_dev.dv_xname, sc->sc_drq);
- sc->sc_wdcdev.cap &= ~WDC_CAPABILITY_DMA;
- }
-}
-
-static void
-wdc_isapnp_dma_start(scv, buf, size, read)
- void *scv, *buf;
- size_t size;
- int read;
-{
- struct wdc_isapnp_softc *sc = scv;
-
- isa_dmastart(sc->sc_ic, sc->sc_drq, buf, size, NULL,
- (read ? DMAMODE_READ : DMAMODE_WRITE) | DMAMODE_DEMAND,
- BUS_DMA_NOWAIT);
-}
-
-static void
-wdc_isapnp_dma_finish(scv)
- void *scv;
-{
- struct wdc_isapnp_softc *sc = scv;
-
- isa_dmadone(sc->sc_ic, sc->sc_drq);
-}
-#endif
Index: wds.c
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/isa/wds.c,v
retrieving revision 1.38
diff -u -r1.38 wds.c
--- wds.c 3 Apr 2011 12:42:36 -0000 1.38
+++ wds.c 28 Jun 2011 19:00:41 -0000
@@ -304,9 +304,6 @@
/*
* fill in the prototype scsi_link.
*/
-#ifdef notyet
- sc->sc_link.channel = SCSI_CHANNEL_ONLY_ONE;
-#endif
sc->sc_link.adapter_softc = sc;
sc->sc_link.adapter_target = sc->sc_scsi_dev;
sc->sc_link.adapter = &wds_switch;
@@ -375,10 +372,6 @@
#endif /* WDSDEBUG */
timeout_del(&scb->xs->stimeout);
-#ifdef notyet
- isadma_copyfrombuf((caddr_t)scb, SCB_PHYS_SIZE,
- 1, scb->scb_phys);
-#endif
wds_done(sc, scb, wmbi->stat);
next:
@@ -641,16 +634,10 @@
timeout_set(&scb->xs->stimeout, wds_timeout, scb);
/* Link scb to mbo. */
-#ifdef notyet
- isadma_copytobuf((caddr_t)scb, SCB_PHYS_SIZE,
- 1, scb->scb_phys);
- ltophys(scb->scb_phys[0].addr, wmbo->scb_addr);
-#else
if (scb->flags & SCB_SENSE)
ltophys(KVTOPHYS(&scb->sense), wmbo->scb_addr);
else
ltophys(KVTOPHYS(&scb->cmd), wmbo->scb_addr);
-#endif
/* XXX What about aborts? */
wmbo->cmd = WDS_MBO_START;
@@ -756,15 +743,6 @@
}
} /* XS_NOERROR */
-#ifdef notyet
- if (scb->data_nseg) {
- if (xs->flags & SCSI_DATA_IN)
- isadma_copyfrombuf(xs->data, xs->datalen,
- scb->data_nseg, scb->data_phys);
- isadma_unmap(xs->data, xs->datalen,
- scb->data_nseg, scb->data_phys);
- }
-#endif
scsi_done(xs);
}
@@ -849,9 +827,6 @@
struct wds_setup init;
u_char c;
int i;
-#ifdef notyet
- struct isadma_seg mbx_phys[1];
-#endif
/*
* Set up initial mail box for round-robin operation.
@@ -878,14 +853,7 @@
init.buson_t = 48;
init.busoff_t = 24;
init.xx = 0;
-#ifdef notyet
- if (isadma_map((caddr_t)(wmbx), sizeof(struct wds_mbx),
- mbx_phys, ISADMA_MAP_CONTIG) != 1)
- panic("wds_init: cannot map mail box");
- ltophys(mbx_phys[0].addr, init.mbaddr);
-#else
ltophys(KVTOPHYS(wmbx), init.mbaddr);
-#endif
init.nomb = init.nimb = WDS_MBX_SIZE;
wds_cmd(sc, (u_char *)&init, sizeof init);
@@ -972,9 +940,6 @@
u_long thiskv, thisphys, nextphys;
int bytes_this_seg, bytes_this_page, datalen, flags;
int s;
-#ifdef notyet
- int mflags;
-#endif
if (xs->flags & SCSI_RESET) {
/* XXX Fix me! */
@@ -985,12 +950,6 @@
}
flags = xs->flags;
-#ifdef notyet
- if (flags & SCSI_NOSLEEP)
- mflags = ISADMA_MAP_BOUNCE;
- else
- mflags = ISADMA_MAP_BOUNCE | ISADMA_MAP_WAITOK;
-#endif
scb = xs->io;
scb->xs = xs;
scb->timeout = xs->timeout;
@@ -1017,16 +976,6 @@
SC_DEBUG(sc_link, SDEV_DB4,
("%d @0x%x:- ", xs->datalen, xs->data));
-#ifdef notyet
- scb->data_nseg = isadma_map(xs->data, xs->datalen,
- scb->data_phys, mflags);
- for (seg = 0; seg < scb->data_nseg; seg++) {
- ltophys(scb->data_phys[seg].addr,
- sg[seg].seg_addr);
- ltophys(scb->data_phys[seg].length,
- sg[seg].seg_len);
- }
-#else
datalen = xs->datalen;
thiskv = (int)xs->data;
thisphys = KVTOPHYS(xs->data);
@@ -1076,7 +1025,6 @@
ltophys(bytes_this_seg, sg->seg_len);
sg++;
seg++;
-#endif
}
SC_DEBUGN(sc_link, SDEV_DB4, ("\n"));
@@ -1088,23 +1036,9 @@
sc->sc_dev.dv_xname, WDS_NSEG);
goto bad;
}
-#ifdef notyet
- if (scb->data_nseg == 0) {
- printf("%s: wds_scsi_cmd, cannot map\n",
- sc->sc_dev.dv_xname);
- goto bad;
- } else if (flags & SCSI_DATA_OUT)
- isadma_copytobuf(xs->data, xs->datalen,
- scb->data_nseg, scb->data_phys);
- ltophys((unsigned)((struct wds_scb
*)(scb->scb_phys[0].addr))->scat_gath,
- scb->data_addr);
- ltophys(scb->data_nseg * sizeof(struct wds_scat_gath),
- scb->data_length);
-#else
scb->cmd.opcode = WDSX_SCSISG;
ltophys(KVTOPHYS(scb->scat_gath), scb->cmd.data);
ltophys(seg * sizeof(struct wds_scat_gath), scb->cmd.len);
-#endif
} else if (xs->datalen > 0) {
/* The board is an ASC or ASE. Do not use scatter/gather. */
if (xs->datalen > BUFLEN) {
@@ -1142,23 +1076,6 @@
s = splbio();
wds_queue_scb(sc, scb);
-#ifdef notyet
- if (VOLATILE_XS(xs)) {
- while ((scb->xs->flags & ITSDONE) == 0) {
- tsleep(scb, PRIBIO, "wdswait", 0);
- }
- if (scb->data_nseg) {
- if (flags & SCSI_DATA_IN)
- isadma_copyfrombuf(xs->data, xs->datalen,
- scb->data_nseg, scb->data_phys);
- isadma_unmap(xs->data, xs->datalen,
- scb->data_nseg, scb->data_phys);
- }
- scsi_done(xs);
- splx(s);
- return;
- }
-#endif
splx(s);
if ((flags & SCSI_POLL) == 0)
@@ -1300,9 +1217,6 @@
int s;
s = splbio();
-#ifdef notyet
- isadma_copyfrombuf((caddr_t)scb, SCB_PHYS_SIZE, 1, scb->scb_phys);
-#endif
xs = scb->xs;
sc_link = xs->sc_link;
sc = sc_link->adapter_softc;
Index: wdsreg.h
===================================================================
RCS file: /home/tedu/cvs/src/sys/dev/isa/wdsreg.h,v
retrieving revision 1.4
diff -u -r1.4 wdsreg.h
--- wdsreg.h 7 Nov 1997 08:07:11 -0000 1.4
+++ wdsreg.h 28 Jun 2011 19:02:23 -0000
@@ -89,11 +89,6 @@
#define SCB_BUFFER 0x40
int timeout;
-#ifdef notyet
- struct isadma_seg scb_phys[1]; /* phys segment of this scb */
- struct isadma_seg data_phys[WDS_NSEG]; /* phys segments of data */
- int data_nseg; /* number of phys segments of data */
-#endif
struct wds_buf *buf;
};
