pciconf(8): Update PCIC/PCIS macro names accordingly

diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c
index c9ce58e..a903ea1 100644 (file)
--- a/usr.sbin/pciconf/pciconf.c
+++ b/usr.sbin/pciconf/pciconf.c
@@ -263,7 +263,7 @@ static struct
        {PCIC_STORAGE,          PCIS_STORAGE_FLOPPY,    "floppy disk"},
        {PCIC_STORAGE,          PCIS_STORAGE_IPI,       "IPI"},
        {PCIC_STORAGE,          PCIS_STORAGE_RAID,      "RAID"},
-       {PCIC_STORAGE,          PCIS_STORAGE_ATA,       "ATA"},
+       {PCIC_STORAGE,          PCIS_STORAGE_ATA_ADMA,  "ATA"},
        {PCIC_STORAGE,          PCIS_STORAGE_SATA,      "SATA"},
        {PCIC_NETWORK,          -1,                     "network"},
        {PCIC_NETWORK,          PCIS_NETWORK_ETHERNET,  "ethernet"},
@@ -278,7 +278,7 @@ static struct
        {PCIC_MULTIMEDIA,       -1,                     "multimedia"},
        {PCIC_MULTIMEDIA,       PCIS_MULTIMEDIA_VIDEO,  "video"},
        {PCIC_MULTIMEDIA,       PCIS_MULTIMEDIA_AUDIO,  "audio"},
-       {PCIC_MULTIMEDIA,       PCIS_MULTIMEDIA_TEL,    "telephony"},
+       {PCIC_MULTIMEDIA,       PCIS_MULTIMEDIA_TELE,   "telephony"},
        {PCIC_MEMORY,           -1,                     "memory"},
        {PCIC_MEMORY,           PCIS_MEMORY_RAM,        "RAM"},
        {PCIC_MEMORY,           PCIS_MEMORY_FLASH,      "flash"},
@@ -291,20 +291,20 @@ static struct
        {PCIC_BRIDGE,           PCIS_BRIDGE_PCMCIA,     "PCI-PCMCIA"},
        {PCIC_BRIDGE,           PCIS_BRIDGE_NUBUS,      "PCI-NuBus"},
        {PCIC_BRIDGE,           PCIS_BRIDGE_CARDBUS,    "PCI-CardBus"},
-       {PCIC_BRIDGE,           PCIS_BRIDGE_INFINI,     "PCI-InfiniBand"},
+       {PCIC_BRIDGE,           PCIS_BRIDGE_INFINIBAND, "PCI-InfiniBand"},
        {PCIC_BRIDGE,           PCIS_BRIDGE_OTHER,      "PCI-unknown"},
        {PCIC_SIMPLECOMM,       -1,                     "simple comms"},
        {PCIC_SIMPLECOMM,       PCIS_SIMPLECOMM_UART,   "UART"},        /* could detect 16550 */
        {PCIC_SIMPLECOMM,       PCIS_SIMPLECOMM_PAR,    "parallel port"},
-       {PCIC_SIMPLECOMM,       PCIS_SIMPLECOMM_MULTSER,"multiport serial"},
+       {PCIC_SIMPLECOMM,       PCIS_SIMPLECOMM_MULSER, "multiport serial"},
        {PCIC_SIMPLECOMM,       PCIS_SIMPLECOMM_MODEM,  "generic modem"},
-       {PCIC_SIMPLECOMM,       PCIS_SIMPLECOMM_SMART,  "smartcard"},
+       {PCIC_SIMPLECOMM,       PCIS_SIMPLECOMM_SMART_CARD,"smartcard"},
        {PCIC_BASEPERIPH,       -1,                     "base peripheral"},
        {PCIC_BASEPERIPH,       PCIS_BASEPERIPH_PIC,    "interrupt controller"},
        {PCIC_BASEPERIPH,       PCIS_BASEPERIPH_DMA,    "DMA controller"},
        {PCIC_BASEPERIPH,       PCIS_BASEPERIPH_TIMER,  "timer"},
        {PCIC_BASEPERIPH,       PCIS_BASEPERIPH_RTC,    "realtime clock"},
-       {PCIC_BASEPERIPH,       PCIS_BASEPERIPH_HOTPLUG,"PCI Hotplug"},
+       {PCIC_BASEPERIPH,       PCIS_BASEPERIPH_PCIHOT, "PCI Hotplug"},
        {PCIC_INPUTDEV,         -1,                     "input device"},
        {PCIC_INPUTDEV,         PCIS_INPUTDEV_KEYBOARD, "keyboard"},
        {PCIC_INPUTDEV,         PCIS_INPUTDEV_DIGITIZER,"digitizer"},
@@ -320,7 +320,7 @@ static struct
        {PCIC_SERIALBUS,        PCIS_SERIALBUS_USB,     "USB"},
        {PCIC_SERIALBUS,        PCIS_SERIALBUS_FC,      "Fibre Channel"},
        {PCIC_SERIALBUS,        PCIS_SERIALBUS_SMBUS,   "SMBus"},
-       {PCIC_SERIALBUS,        PCIS_SERIALBUS_INFINI,  "InfiniBand"},
+       {PCIC_SERIALBUS,        PCIS_SERIALBUS_INFINIBAND,"InfiniBand"},
        {PCIC_WIRELESS,         -1,                     "wireless"},
        {PCIC_WIRELESS,         PCIS_WIRELESS_IRDA,     "iRDA"},
        {PCIC_WIRELESS,         PCIS_WIRELESS_IR,       "consumer IR"},
@@ -329,11 +329,11 @@ static struct
        {PCIC_WIRELESS,         PCIS_WIRELESS_BROADBAND,"broadband"},
        {PCIC_WIRELESS,         PCIS_WIRELESS_80211A,   "Ethernet (802.11a)"},
        {PCIC_WIRELESS,         PCIS_WIRELESS_80211B,   "Ethernet (802.11b)"},
-       {PCIC_I2O,              -1,                     "I2O"},
-       {PCIC_I2O,              PCIS_I2O_10,            "I2O 1.0"},
-       {PCIC_SATELLITE,        -1,                     "satellite"},
+       {PCIC_INTELLIIO,        -1,                     "I2O"},
+       {PCIC_INTELLIIO,        PCIS_INTELLIIO_I2O,     "I2O 1.0"},
+       {PCIC_SATCOM,           -1,                     "satellite"},
        {PCIC_CRYPTO,           -1,                     "crypto controller"},
-       {PCIC_SIGPROC,          -1,                     "signal processing"},
+       {PCIC_DASP,             -1,                     "signal processing"},
        {0, 0,          NULL}
 };