diff options
| -rw-r--r-- | sys/conf/files | 10 | ||||
| -rw-r--r-- | sys/dev/aha/aha.c | 24 | ||||
| -rw-r--r-- | sys/dev/aha/ahareg.h | 6 | ||||
| -rw-r--r-- | sys/modules/aha/Makefile | 6 |
4 files changed, 10 insertions, 36 deletions
diff --git a/sys/conf/files b/sys/conf/files index a6e9d4a..f175471 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -215,7 +215,7 @@ dev/advansys/adw_pci.c optional adw pci dev/advansys/adwcam.c optional adw dev/advansys/adwlib.c optional adw dev/advansys/adwmcode.c optional adw -dev/aha/aha.c count aha +dev/aha/aha.c optional aha dev/aha/aha_isa.c optional aha isa dev/aha/aha_mca.c optional aha mca dev/ahb/ahb.c optional ahb eisa @@ -236,6 +236,7 @@ dev/amr/amr_pci.c optional amr dev/an/if_an.c optional an dev/an/if_an_isa.c optional an isa dev/an/if_an_pccard.c optional an card +#dev/an/if_an_pccard.c optional an pccard dev/an/if_an_pci.c optional an pci dev/ar/if_ar.c optional ar dev/ar/if_ar_pci.c optional ar pci @@ -255,6 +256,7 @@ dev/awi/awi.c optional awi dev/awi/awi_wep.c optional awi dev/awi/awi_wicfg.c optional awi dev/awi/if_awi_pccard.c optional awi card +dev/awi/if_awi_pccard.c optional awi pccard dev/bktr/bktr_audio.c optional bktr pci dev/bktr/bktr_card.c optional bktr pci dev/bktr/bktr_core.c count bktr pci @@ -293,8 +295,10 @@ dev/ep/if_ep_pccard.c optional ep pccard dev/ex/if_ex.c optional ex dev/ex/if_ex_isa.c optional ex isa dev/ex/if_ex_pccard.c optional ex card +#dev/ex/if_ex_pccard.c optional ex pccard dev/fe/if_fe.c optional fe dev/fe/if_fe_pccard.c optional fe card +#dev/fe/if_fe_pccard.c optional fe pccard dev/hea/eni.c optional hea dev/hea/eni_buffer.c optional hea dev/hea/eni_globals.c optional hea @@ -345,8 +349,10 @@ dev/lnc/if_lnc_pc98.c optional lnc isa dev/lnc/if_lnc_pci.c optional lnc pci dev/ncv/ncr53c500.c optional ncv dev/ncv/ncr53c500_pccard.c optional ncv card +#dev/ncv/ncr53c500_pccard.c optional ncv pccard dev/nsp/nsp.c optional nsp dev/nsp/nsp_pccard.c optional nsp card +#dev/nsp/nsp_pccard.c optional nsp pccard dev/mca/mca_bus.c optional mca dev/md/md.c optional md dev/mii/amphy.c optional miibus @@ -492,6 +498,7 @@ dev/sr/if_sr_pci.c optional sr pci dev/streams/streams.c optional streams dev/stg/tmc18c30.c optional stg dev/stg/tmc18c30_pccard.c optional stg card +#dev/stg/tmc18c30_pccard.c optional stg pccard dev/stg/tmc18c30_isa.c optional stg isa dev/sym/sym_hipd.c optional sym \ dependency "$S/dev/sym/sym_{conf,defs}.h" @@ -544,6 +551,7 @@ dev/vn/vn.c optional vn \ dev/vx/if_vx.c optional vx dev/vx/if_vx_eisa.c optional vx eisa dev/vx/if_vx_pci.c optional vx pci +#dev/wlp/if_wlp.c optional wlp card dev/wds/wd7000.c optional wds isa dev/wi/if_wi.c optional wi card dev/wi/if_wi.c optional wi pccard diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c index d42a3e8..ec2f012 100644 --- a/sys/dev/aha/aha.c +++ b/sys/dev/aha/aha.c @@ -76,8 +76,6 @@ #include <dev/aha/ahareg.h> -struct aha_softc *aha_softcs[NAHATOT]; - #define PRVERB(x) if (bootverbose) printf x /* Macro to determine that a rev is potentially a new valid one @@ -205,21 +203,6 @@ aha_alloc(int unit, bus_space_tag_t tag, bus_space_handle_t bsh) { struct aha_softc *aha; - if (unit != AHA_TEMP_UNIT) { - if (unit >= NAHATOT) { - printf("aha: unit number (%d) too high\n", unit); - return NULL; - } - - /* - * Allocate a storage area for us - */ - if (aha_softcs[unit]) { - printf("aha%d: memory already allocated\n", unit); - return NULL; - } - } - aha = malloc(sizeof(struct aha_softc), M_DEVBUF, M_NOWAIT | M_ZERO); if (!aha) { printf("aha%d: cannot malloc!\n", unit); @@ -233,10 +216,6 @@ aha_alloc(int unit, bus_space_tag_t tag, bus_space_handle_t bsh) aha->bsh = bsh; aha->ccb_sg_opcode = INITIATOR_SG_CCB_WRESID; aha->ccb_ccb_opcode = INITIATOR_CCB_WRESID; - - if (aha->unit != AHA_TEMP_UNIT) { - aha_softcs[unit] = aha; - } return (aha); } @@ -279,9 +258,6 @@ aha_free(struct aha_softc *aha) bus_dma_tag_destroy(aha->mailbox_dmat); case 0: } - if (aha->unit != AHA_TEMP_UNIT) { - aha_softcs[aha->unit] = NULL; - } free(aha, M_DEVBUF); } diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h index 339eace..914bed1 100644 --- a/sys/dev/aha/ahareg.h +++ b/sys/dev/aha/ahareg.h @@ -36,8 +36,6 @@ #ifndef _AHAREG_H_ #define _AHAREG_H_ -#include "aha.h" - #include <sys/queue.h> #include <cam/scsi/scsi_all.h> @@ -426,10 +424,6 @@ int aha_probe(struct aha_softc *); #define aha_outb(aha, port, value) \ bus_space_write_1((aha)->tag, (aha)->bsh, port, value) -/* XXX BAD */ -#define EXTRA_AHA 4 -#define NAHATOT (NAHA + EXTRA_AHA) - #define ADP0100_PNP 0x00019004 /* ADP0100 */ #define AHA1540_PNP 0x40159004 /* ADP1540 */ #define AHA1542_PNP 0x42159004 /* ADP1542 */ diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile index 48b6b2c..44b4f93 100644 --- a/sys/modules/aha/Makefile +++ b/sys/modules/aha/Makefile @@ -3,12 +3,8 @@ .PATH: ${.CURDIR}/../../dev/aha KMOD= aha -SRCS= aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h aha.h \ +SRCS= aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h \ opt_scsi.h isa_if.h -CLEANFILES= aha.h - -aha.h: - echo "#define NAHA 1" > aha.h opt_scsi.h: echo "#define SCSI_DELAY 15000" > opt_scsi.h |
