Revision 5e0259e7 hw/pci.c

b/hw/pci.c
43 43

  
44 44
static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent);
45 45
static char *pcibus_get_dev_path(DeviceState *dev);
46
static char *pcibus_get_fw_dev_path(DeviceState *dev);
46 47
static int pcibus_reset(BusState *qbus);
47 48

  
48 49
struct BusInfo pci_bus_info = {
......
50 51
    .size       = sizeof(PCIBus),
51 52
    .print_dev  = pcibus_dev_print,
52 53
    .get_dev_path = pcibus_get_dev_path,
54
    .get_fw_dev_path = pcibus_get_fw_dev_path,
53 55
    .reset      = pcibus_reset,
54 56
    .props      = (Property[]) {
55 57
        DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
......
1117 1119
typedef struct {
1118 1120
    uint16_t class;
1119 1121
    const char *desc;
1122
    const char *fw_name;
1123
    uint16_t fw_ign_bits;
1120 1124
} pci_class_desc;
1121 1125

  
1122 1126
static const pci_class_desc pci_class_descriptions[] =
1123 1127
{
1124
    { 0x0100, "SCSI controller"},
1125
    { 0x0101, "IDE controller"},
1126
    { 0x0102, "Floppy controller"},
1127
    { 0x0103, "IPI controller"},
1128
    { 0x0104, "RAID controller"},
1128
    { 0x0001, "VGA controller", "display"},
1129
    { 0x0100, "SCSI controller", "scsi"},
1130
    { 0x0101, "IDE controller", "ide"},
1131
    { 0x0102, "Floppy controller", "fdc"},
1132
    { 0x0103, "IPI controller", "ipi"},
1133
    { 0x0104, "RAID controller", "raid"},
1129 1134
    { 0x0106, "SATA controller"},
1130 1135
    { 0x0107, "SAS controller"},
1131 1136
    { 0x0180, "Storage controller"},
1132
    { 0x0200, "Ethernet controller"},
1133
    { 0x0201, "Token Ring controller"},
1134
    { 0x0202, "FDDI controller"},
1135
    { 0x0203, "ATM controller"},
1137
    { 0x0200, "Ethernet controller", "ethernet"},
1138
    { 0x0201, "Token Ring controller", "token-ring"},
1139
    { 0x0202, "FDDI controller", "fddi"},
1140
    { 0x0203, "ATM controller", "atm"},
1136 1141
    { 0x0280, "Network controller"},
1137
    { 0x0300, "VGA controller"},
1142
    { 0x0300, "VGA controller", "display", 0x00ff},
1138 1143
    { 0x0301, "XGA controller"},
1139 1144
    { 0x0302, "3D controller"},
1140 1145
    { 0x0380, "Display controller"},
1141
    { 0x0400, "Video controller"},
1142
    { 0x0401, "Audio controller"},
1146
    { 0x0400, "Video controller", "video"},
1147
    { 0x0401, "Audio controller", "sound"},
1143 1148
    { 0x0402, "Phone"},
1144 1149
    { 0x0480, "Multimedia controller"},
1145
    { 0x0500, "RAM controller"},
1146
    { 0x0501, "Flash controller"},
1150
    { 0x0500, "RAM controller", "memory"},
1151
    { 0x0501, "Flash controller", "flash"},
1147 1152
    { 0x0580, "Memory controller"},
1148
    { 0x0600, "Host bridge"},
1149
    { 0x0601, "ISA bridge"},
1150
    { 0x0602, "EISA bridge"},
1151
    { 0x0603, "MC bridge"},
1152
    { 0x0604, "PCI bridge"},
1153
    { 0x0605, "PCMCIA bridge"},
1154
    { 0x0606, "NUBUS bridge"},
1155
    { 0x0607, "CARDBUS bridge"},
1153
    { 0x0600, "Host bridge", "host"},
1154
    { 0x0601, "ISA bridge", "isa"},
1155
    { 0x0602, "EISA bridge", "eisa"},
1156
    { 0x0603, "MC bridge", "mca"},
1157
    { 0x0604, "PCI bridge", "pci"},
1158
    { 0x0605, "PCMCIA bridge", "pcmcia"},
1159
    { 0x0606, "NUBUS bridge", "nubus"},
1160
    { 0x0607, "CARDBUS bridge", "cardbus"},
1156 1161
    { 0x0608, "RACEWAY bridge"},
1157 1162
    { 0x0680, "Bridge"},
1158
    { 0x0c03, "USB controller"},
1163
    { 0x0700, "Serial port", "serial"},
1164
    { 0x0701, "Parallel port", "parallel"},
1165
    { 0x0800, "Interrupt controller", "interrupt-controller"},
1166
    { 0x0801, "DMA controller", "dma-controller"},
1167
    { 0x0802, "Timer", "timer"},
1168
    { 0x0803, "RTC", "rtc"},
1169
    { 0x0900, "Keyboard", "keyboard"},
1170
    { 0x0901, "Pen", "pen"},
1171
    { 0x0902, "Mouse", "mouse"},
1172
    { 0x0A00, "Dock station", "dock", 0x00ff},
1173
    { 0x0B00, "i386 cpu", "cpu", 0x00ff},
1174
    { 0x0c00, "Fireware contorller", "fireware"},
1175
    { 0x0c01, "Access bus controller", "access-bus"},
1176
    { 0x0c02, "SSA controller", "ssa"},
1177
    { 0x0c03, "USB controller", "usb"},
1178
    { 0x0c04, "Fibre channel controller", "fibre-channel"},
1159 1179
    { 0, NULL}
1160 1180
};
1161 1181

  
......
1960 1980
    }
1961 1981
}
1962 1982

  
1983
static char *pci_dev_fw_name(DeviceState *dev, char *buf, int len)
1984
{
1985
    PCIDevice *d = (PCIDevice *)dev;
1986
    const char *name = NULL;
1987
    const pci_class_desc *desc =  pci_class_descriptions;
1988
    int class = pci_get_word(d->config + PCI_CLASS_DEVICE);
1989

  
1990
    while (desc->desc &&
1991
          (class & ~desc->fw_ign_bits) !=
1992
          (desc->class & ~desc->fw_ign_bits)) {
1993
        desc++;
1994
    }
1995

  
1996
    if (desc->desc) {
1997
        name = desc->fw_name;
1998
    }
1999

  
2000
    if (name) {
2001
        pstrcpy(buf, len, name);
2002
    } else {
2003
        snprintf(buf, len, "pci%04x,%04x",
2004
                 pci_get_word(d->config + PCI_VENDOR_ID),
2005
                 pci_get_word(d->config + PCI_DEVICE_ID));
2006
    }
2007

  
2008
    return buf;
2009
}
2010

  
2011
static char *pcibus_get_fw_dev_path(DeviceState *dev)
2012
{
2013
    PCIDevice *d = (PCIDevice *)dev;
2014
    char path[50], name[33];
2015
    int off;
2016

  
2017
    off = snprintf(path, sizeof(path), "%s@%x",
2018
                   pci_dev_fw_name(dev, name, sizeof name),
2019
                   PCI_SLOT(d->devfn));
2020
    if (PCI_FUNC(d->devfn))
2021
        snprintf(path + off, sizeof(path) + off, ",%x", PCI_FUNC(d->devfn));
2022
    return strdup(path);
2023
}
2024

  
1963 2025
static char *pcibus_get_dev_path(DeviceState *dev)
1964 2026
{
1965 2027
    PCIDevice *d = (PCIDevice *)dev;

Also available in: Unified diff