diff options
| author | Warner Losh <imp@FreeBSD.org> | 2001-02-04 16:45:39 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2001-02-04 16:45:39 +0000 |
| commit | 1bd4d8627552bad0c83690784853687d458952e2 (patch) | |
| tree | ffa68b14cb4e14e22dbd5e2db89273f93d11d7b0 /sys/dev/aha | |
| parent | 37d400662666a604243e587c70d492fe357d150a (diff) | |
Notes
Diffstat (limited to 'sys/dev/aha')
| -rw-r--r-- | sys/dev/aha/aha.c | 24 | ||||
| -rw-r--r-- | sys/dev/aha/ahareg.h | 6 |
2 files changed, 0 insertions, 30 deletions
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c index d42a3e8f16b6..ec2f0128375a 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 339eace12e20..914bed1bd432 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 */ |