diff options
author | jkim <jkim@FreeBSD.org> | 2013-08-15 20:03:22 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2013-08-15 20:03:22 +0000 |
commit | 6d37e23f0ac7ee8dd61ffd3d96cbdbef9994b541 (patch) | |
tree | 52f8122c52a39de6a2b12f337da0c3ca1466328f | |
parent | be2567e067bb9035f0c9670f5c599e2a7fbd3b46 (diff) | |
download | FreeBSD-src-6d37e23f0ac7ee8dd61ffd3d96cbdbef9994b541.zip FreeBSD-src-6d37e23f0ac7ee8dd61ffd3d96cbdbef9994b541.tar.gz |
Avoid potential redefinition of the macro.
-rw-r--r-- | sys/dev/iir/iir.c | 4 | ||||
-rw-r--r-- | sys/dev/iir/iir.h | 2 | ||||
-rw-r--r-- | sys/dev/iir/iir_ctrl.c | 2 | ||||
-rw-r--r-- | sys/dev/iir/iir_pci.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c index 4c907f0..684fce3 100644 --- a/sys/dev/iir/iir.c +++ b/sys/dev/iir/iir.c @@ -399,7 +399,7 @@ iir_init(struct gdt_softc *gdt) gdt->oem_name[7]='\0'; } else { /* Old method, based on PCI ID */ - if (gdt->sc_vendor == INTEL_VENDOR_ID) + if (gdt->sc_vendor == INTEL_VENDOR_ID_IIR) strcpy(gdt->oem_name,"Intel "); else strcpy(gdt->oem_name,"ICP "); @@ -1374,7 +1374,7 @@ iir_action( struct cam_sim *sim, union ccb *ccb ) (bus == gdt->sc_virt_bus ? 127 : gdt->sc_bus_id[bus]); cpi->base_transfer_speed = 3300; strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); - if (gdt->sc_vendor == INTEL_VENDOR_ID) + if (gdt->sc_vendor == INTEL_VENDOR_ID_IIR) strncpy(cpi->hba_vid, "Intel Corp.", HBA_IDLEN); else strncpy(cpi->hba_vid, "ICP vortex ", HBA_IDLEN); diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h index dca493d..dbae7d2 100644 --- a/sys/dev/iir/iir.h +++ b/sys/dev/iir/iir.h @@ -63,7 +63,7 @@ #define GDT_DEVICE_ID_MAX 0x2ff #define GDT_DEVICE_ID_NEWRX 0x300 -#define INTEL_VENDOR_ID 0x8086 +#define INTEL_VENDOR_ID_IIR 0x8086 #define INTEL_DEVICE_ID_IIR 0x600 #define GDT_MAXBUS 6 /* XXX Why not 5? */ diff --git a/sys/dev/iir/iir_ctrl.c b/sys/dev/iir/iir_ctrl.c index 5f9f3d5..94b18dd 100644 --- a/sys/dev/iir/iir_ctrl.c +++ b/sys/dev/iir/iir_ctrl.c @@ -273,7 +273,7 @@ iir_ioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread return (ENXIO); /* only RP controllers */ p->ext_type = 0x6000 | gdt->sc_device; - if (gdt->sc_vendor == INTEL_VENDOR_ID) { + if (gdt->sc_vendor == INTEL_VENDOR_ID_IIR) { p->oem_id = OEM_ID_INTEL; p->type = 0xfd; /* new -> subdevice into ext_type */ diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c index 7baee86..ec54d49 100644 --- a/sys/dev/iir/iir_pci.c +++ b/sys/dev/iir/iir_pci.c @@ -163,7 +163,7 @@ MODULE_DEPEND(iir, cam, 1, 1, 1); static int iir_pci_probe(device_t dev) { - if (pci_get_vendor(dev) == INTEL_VENDOR_ID && + if (pci_get_vendor(dev) == INTEL_VENDOR_ID_IIR && pci_get_device(dev) == INTEL_DEVICE_ID_IIR) { device_set_desc(dev, "Intel Integrated RAID Controller"); return (BUS_PROBE_DEFAULT); |