diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 1999-08-30 16:12:39 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 1999-08-30 16:12:39 +0000 |
| commit | 9be376cc324c4f1a1a587d0590063dec9c35694c (patch) | |
| tree | cc37c0640876a55ad13989c3bc28fbbc8508a93f /sys/dev | |
| parent | 5bdd92770e908687b88bf79a730c392b30b8f6bd (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx.c | 6 | ||||
| -rw-r--r-- | sys/dev/aic7xxx/aic7xxx.h | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index af30729e86dd..d8278b2c1b4c 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -3677,6 +3677,7 @@ ahc_handle_devreset(struct ahc_softc *ahc, struct ahc_devinfo *devinfo, found = ahc_abort_scbs(ahc, devinfo->target, devinfo->channel, CAM_LUN_WILDCARD, SCB_LIST_NULL, devinfo->role, status); + /* * Send an immediate notify ccb to all target more peripheral * drivers affected by this action. @@ -3865,11 +3866,6 @@ ahc_init(struct ahc_softc *ahc) size_t driver_data_size; u_int32_t physaddr; -#if 0 - printf("SBLKCTL = 0x%x\n", ahc_inb(ahc, SBLKCTL)); - printf("SSTAT0 = 0x%x\n", ahc_inb(ahc, SSTAT0)); - printf("SFUNCT = 0x%x\n", ahc_inb(ahc, SFUNCT)); -#endif #ifdef AHC_PRINT_SRAM printf("Scratch Ram:"); for (i = 0x20; i < 0x5f; i++) { diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h index fca4aeaf965f..c0f9eab8e693 100644 --- a/sys/dev/aic7xxx/aic7xxx.h +++ b/sys/dev/aic7xxx/aic7xxx.h @@ -94,12 +94,14 @@ typedef enum { AHC_CHIPID_MASK = 0x00FF, AHC_AIC7770 = 0x0001, AHC_AIC7850 = 0x0002, - AHC_AIC7860 = 0x0003, - AHC_AIC7870 = 0x0004, - AHC_AIC7880 = 0x0005, - AHC_AIC7890 = 0x0006, - AHC_AIC7895 = 0x0007, - AHC_AIC7896 = 0x0008, + AHC_AIC7855 = 0x0003, + AHC_AIC7859 = 0x0004, + AHC_AIC7860 = 0x0005, + AHC_AIC7870 = 0x0006, + AHC_AIC7880 = 0x0007, + AHC_AIC7890 = 0x0008, + AHC_AIC7895 = 0x0009, + AHC_AIC7896 = 0x000a, AHC_VL = 0x0100, /* Bus type VL */ AHC_EISA = 0x0200, /* Bus type EISA */ AHC_PCI = 0x0400, /* Bus type PCI */ @@ -120,6 +122,8 @@ typedef enum { AHC_HS_MAILBOX = 0x0400, /* Has HS_MAILBOX register */ AHC_AIC7770_FE = AHC_FENONE, AHC_AIC7850_FE = AHC_FENONE|AHC_SPIOCAP, + AHC_AIC7855_FE = AHC_FENONE|AHC_SPIOCAP, + AHC_AIC7859_FE = AHC_ULTRA|AHC_SPIOCAP, AHC_AIC7860_FE = AHC_ULTRA|AHC_SPIOCAP, AHC_AIC7870_FE = AHC_FENONE, AHC_AIC7880_FE = AHC_ULTRA, |