diff options
author | ru <ru@FreeBSD.org> | 2005-12-04 02:12:43 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2005-12-04 02:12:43 +0000 |
commit | 522e9c2b7b1ceeb0bc6a2edb3ee62885d8106ac3 (patch) | |
tree | f3ce65232b57836f87c8dc38dfcc8fbb95679c5d /sys/dev/advansys | |
parent | 7b7fd248389b497235a0e9dcef2aff317880a15b (diff) | |
download | FreeBSD-src-522e9c2b7b1ceeb0bc6a2edb3ee62885d8106ac3.zip FreeBSD-src-522e9c2b7b1ceeb0bc6a2edb3ee62885d8106ac3.tar.gz |
Fix -Wundef.
Diffstat (limited to 'sys/dev/advansys')
-rw-r--r-- | sys/dev/advansys/adv_pci.c | 2 | ||||
-rw-r--r-- | sys/dev/advansys/advlib.c | 10 | ||||
-rw-r--r-- | sys/dev/advansys/adw_pci.c | 2 | ||||
-rw-r--r-- | sys/dev/advansys/adwcam.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c index 455e204..666efdc 100644 --- a/sys/dev/advansys/adv_pci.c +++ b/sys/dev/advansys/adv_pci.c @@ -288,7 +288,7 @@ adv_pci_attach(device_t dev) adv->max_dma_count = ADV_PCI_MAX_DMA_COUNT; adv->max_dma_addr = ADV_PCI_MAX_DMA_ADDR; -#if CC_DISABLE_PCI_PARITY_INT +#if defined(CC_DISABLE_PCI_PARITY_INT) && CC_DISABLE_PCI_PARITY_INT { u_int16_t config_msw; diff --git a/sys/dev/advansys/advlib.c b/sys/dev/advansys/advlib.c index e89829f..565b8c2 100644 --- a/sys/dev/advansys/advlib.c +++ b/sys/dev/advansys/advlib.c @@ -238,7 +238,7 @@ static void adv_toggle_irq_act(struct adv_softc *adv); /* Chip Control */ static int adv_host_req_chip_halt(struct adv_softc *adv); static void adv_set_chip_ih(struct adv_softc *adv, u_int16_t ins_code); -#if UNUSED +#if 0 static u_int8_t adv_get_chip_scsi_ctrl(struct adv_softc *adv); #endif @@ -514,7 +514,7 @@ adv_get_eeprom_config(struct adv_softc *adv, struct for (s_addr = cfg_beg; s_addr <= (cfg_end - 1); s_addr++, wbuf++) { *wbuf = adv_read_eeprom_16(adv, s_addr); sum += *wbuf; -#if ADV_DEBUG_EEPROM +#ifdef ADV_DEBUG_EEPROM printf("Addr 0x%x: 0x%04x\n", s_addr, *wbuf); #endif } @@ -1615,7 +1615,7 @@ adv_set_chip_ih(struct adv_softc *adv, u_int16_t ins_code) adv_set_bank(adv, 0); } -#if UNUSED +#if 0 static u_int8_t adv_get_chip_scsi_ctrl(struct adv_softc *adv) { @@ -1826,12 +1826,12 @@ adv_put_ready_queue(struct adv_softc *adv, struct adv_scsi_q *scsiq, (u_int16_t *) &scsiq->q1.cntl, ((sizeof(scsiq->q1) + sizeof(scsiq->q2)) / 2) - 1); -#if CC_WRITE_IO_COUNT +#ifdef CC_WRITE_IO_COUNT adv_write_lram_16(adv, q_addr + ADV_SCSIQ_W_REQ_COUNT, adv->req_count); #endif -#if CC_CLEAR_DMA_REMAIN +#ifdef CC_CLEAR_DMA_REMAIN adv_write_lram_32(adv, q_addr + ADV_SCSIQ_DW_REMAIN_XFER_ADDR, 0); adv_write_lram_32(adv, q_addr + ADV_SCSIQ_DW_REMAIN_XFER_CNT, 0); diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c index 4d40ae3..74ea7b5 100644 --- a/sys/dev/advansys/adw_pci.c +++ b/sys/dev/advansys/adw_pci.c @@ -107,7 +107,7 @@ struct adw_pci_identity adw_pci_ident_table[] = &adw_asc38C0800_mcode_data, &adw_asc38C0800_default_eeprom }, -#if NOTYET +#ifdef NOTYET /* XXX Disabled until I have hardware to test with */ /* asc38C1600 based controllers */ { diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c index 3b9ce17..5de2a48 100644 --- a/sys/dev/advansys/adwcam.c +++ b/sys/dev/advansys/adwcam.c @@ -1290,7 +1290,7 @@ adw_intr(void *arg) * Handle RDMA failure by resetting the * SCSI Bus and chip. */ -#if XXX +#if 0 /* XXX */ AdvResetChipAndSB(adv_dvc_varp); #endif break; |