d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid potential redefinition of the macro.

Browse Source
This commit is contained in:
jkim 2013-08-15 20:03:22 +00:00
parent be2567e067
commit 6d37e23f0a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/iir/iir.c
View File

@ -399,7 +399,7 @@ iir_init(struct gdt_softc *gdt)
gdt->oem_name[7]='\0'; gdt->oem_name[7]='\0';
} else { } else {
/* Old method, based on PCI ID */ /* 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 "); strcpy(gdt->oem_name,"Intel ");
else else
strcpy(gdt->oem_name,"ICP "); 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]); (bus == gdt->sc_virt_bus ? 127 : gdt->sc_bus_id[bus]);
cpi->base_transfer_speed = 3300; cpi->base_transfer_speed = 3300;
strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); 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); strncpy(cpi->hba_vid, "Intel Corp.", HBA_IDLEN);
else else
strncpy(cpi->hba_vid, "ICP vortex ", HBA_IDLEN); strncpy(cpi->hba_vid, "ICP vortex ", HBA_IDLEN);

2
sys/dev/iir/iir.h
View File

@ -63,7 +63,7 @@
#define GDT_DEVICE_ID_MAX 0x2ff #define GDT_DEVICE_ID_MAX 0x2ff
#define GDT_DEVICE_ID_NEWRX 0x300 #define GDT_DEVICE_ID_NEWRX 0x300
#define INTEL_VENDOR_ID 0x8086 #define INTEL_VENDOR_ID_IIR 0x8086
#define INTEL_DEVICE_ID_IIR 0x600 #define INTEL_DEVICE_ID_IIR 0x600
#define GDT_MAXBUS 6 /* XXX Why not 5? */ #define GDT_MAXBUS 6 /* XXX Why not 5? */

2
sys/dev/iir/iir_ctrl.c
View File

@ -273,7 +273,7 @@ iir_ioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread
return (ENXIO); return (ENXIO);
/* only RP controllers */ /* only RP controllers */
p->ext_type = 0x6000 | gdt->sc_device; 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->oem_id = OEM_ID_INTEL;
p->type = 0xfd; p->type = 0xfd;
/* new -> subdevice into ext_type */ /* new -> subdevice into ext_type */

2
sys/dev/iir/iir_pci.c
View File

@ -163,7 +163,7 @@ MODULE_DEPEND(iir, cam, 1, 1, 1);
static int static int
iir_pci_probe(device_t dev) 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) { pci_get_device(dev) == INTEL_DEVICE_ID_IIR) {
device_set_desc(dev, "Intel Integrated RAID Controller"); device_set_desc(dev, "Intel Integrated RAID Controller");
return (BUS_PROBE_DEFAULT); return (BUS_PROBE_DEFAULT);