mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
pci: Rename GRUB_PCI_CLASS_*
Glenn suggested to rename the existing PCI_CLASS defines to have explicit class and subclass names. Suggested-by: Glenn Washburn <development@efficientek.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
1 parent
8eb3d4df3f
commit
caf11e803c
7 files changed
+9
-9
No files matched your search
@@ -168,11 +168,11 @@ enable_cards (grub_pci_device_t dev,
|
|||||||
|
|
||||||
class = (grub_pci_read (addr) >> 16) & 0xffff;
|
class = (grub_pci_read (addr) >> 16) & 0xffff;
|
||||||
|
|
||||||
if (class == GRUB_PCI_CLASS_SUBCLASS_VGA)
|
if (class == GRUB_PCI_CLASS_DISPLAY_VGA)
|
||||||
cmd |= GRUB_PCI_COMMAND_IO_ENABLED
|
cmd |= GRUB_PCI_COMMAND_IO_ENABLED
|
||||||
| GRUB_PCI_COMMAND_MEM_ENABLED;
|
| GRUB_PCI_COMMAND_MEM_ENABLED;
|
||||||
|
|
||||||
if (class == GRUB_PCI_CLASS_SUBCLASS_USB)
|
if (class == GRUB_PCI_CLASS_SERIAL_USB)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
|
addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)
|
|||||||
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
||||||
subclass = (grub_pci_read (addr) >> 16) & 0xffff;
|
subclass = (grub_pci_read (addr) >> 16) & 0xffff;
|
||||||
|
|
||||||
if (subclass != GRUB_PCI_CLASS_SUBCLASS_VGA)
|
if (subclass != GRUB_PCI_CLASS_DISPLAY_VGA)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* Enable MEM address spaces */
|
/* Enable MEM address spaces */
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)
|
|||||||
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
||||||
class = grub_pci_read (addr);
|
class = grub_pci_read (addr);
|
||||||
|
|
||||||
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA
|
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_DISPLAY_VGA
|
||||||
|| pciid != 0x515a1002)
|
|| pciid != 0x515a1002)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)
|
|||||||
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
||||||
class = grub_pci_read (addr);
|
class = grub_pci_read (addr);
|
||||||
|
|
||||||
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA
|
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_DISPLAY_VGA
|
||||||
|| pciid != 0x96151002)
|
|| pciid != 0x96151002)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)
|
|||||||
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
||||||
class = grub_pci_read (addr);
|
class = grub_pci_read (addr);
|
||||||
|
|
||||||
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA
|
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_DISPLAY_VGA
|
||||||
|| pciid != GRUB_SIS315PRO_PCIID)
|
|| pciid != GRUB_SIS315PRO_PCIID)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|||||||
@@ -372,7 +372,7 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void *data)
|
|||||||
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
|
||||||
class = grub_pci_read (addr);
|
class = grub_pci_read (addr);
|
||||||
|
|
||||||
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA
|
if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_DISPLAY_VGA
|
||||||
|| pciid != GRUB_SM712_PCIID)
|
|| pciid != GRUB_SM712_PCIID)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -81,8 +81,8 @@
|
|||||||
#define GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9
|
#define GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9
|
||||||
#define GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600
|
#define GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600
|
||||||
|
|
||||||
#define GRUB_PCI_CLASS_SUBCLASS_VGA 0x0300
|
#define GRUB_PCI_CLASS_DISPLAY_VGA 0x0300
|
||||||
#define GRUB_PCI_CLASS_SUBCLASS_USB 0x0c03
|
#define GRUB_PCI_CLASS_SERIAL_USB 0x0c03
|
||||||
#define GRUB_PCI_CLASS_COMMUNICATION_SERIAL 0x0700
|
#define GRUB_PCI_CLASS_COMMUNICATION_SERIAL 0x0700
|
||||||
#define GRUB_PCI_CLASS_COMMUNICATION_MODEM 0x0703
|
#define GRUB_PCI_CLASS_COMMUNICATION_MODEM 0x0703
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user