[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 2/2] pci: Rename GRUB_PCI_CLASS_*
|
From: |
Glenn Washburn |
|
Subject: |
[PATCH v3 2/2] pci: Rename GRUB_PCI_CLASS_* |
|
Date: |
Sat, 13 May 2023 02:54:52 -0500 |
From: "peterz@infradead.org" <peterz@infradead.org>
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>
---
grub-core/kern/i386/qemu/init.c | 4 ++--
grub-core/video/efi_uga.c | 2 +-
grub-core/video/radeon_fuloong2e.c | 2 +-
grub-core/video/radeon_yeeloong3a.c | 2 +-
grub-core/video/sis315pro.c | 2 +-
grub-core/video/sm712.c | 2 +-
include/grub/pci.h | 4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/grub-core/kern/i386/qemu/init.c b/grub-core/kern/i386/qemu/init.c
index 4e84d3ba1e35..08f81d25e686 100644
--- a/grub-core/kern/i386/qemu/init.c
+++ b/grub-core/kern/i386/qemu/init.c
@@ -168,11 +168,11 @@ enable_cards (grub_pci_device_t dev,
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
| GRUB_PCI_COMMAND_MEM_ENABLED;
- if (class == GRUB_PCI_CLASS_SUBCLASS_USB)
+ if (class == GRUB_PCI_CLASS_SERIAL_USB)
return 0;
addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
diff --git a/grub-core/video/efi_uga.c b/grub-core/video/efi_uga.c
index e74d6c235000..ac636caa28fc 100644
--- a/grub-core/video/efi_uga.c
+++ b/grub-core/video/efi_uga.c
@@ -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);
subclass = (grub_pci_read (addr) >> 16) & 0xffff;
- if (subclass != GRUB_PCI_CLASS_SUBCLASS_VGA)
+ if (subclass != GRUB_PCI_CLASS_DISPLAY_VGA)
return 0;
/* Enable MEM address spaces */
diff --git a/grub-core/video/radeon_fuloong2e.c
b/grub-core/video/radeon_fuloong2e.c
index 40917acb765d..f1b4c591bbf3 100644
--- a/grub-core/video/radeon_fuloong2e.c
+++ b/grub-core/video/radeon_fuloong2e.c
@@ -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);
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)
return 0;
diff --git a/grub-core/video/radeon_yeeloong3a.c
b/grub-core/video/radeon_yeeloong3a.c
index 48631c1815df..61b70ef26b43 100644
--- a/grub-core/video/radeon_yeeloong3a.c
+++ b/grub-core/video/radeon_yeeloong3a.c
@@ -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);
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)
return 0;
diff --git a/grub-core/video/sis315pro.c b/grub-core/video/sis315pro.c
index 4d2f9999a9a7..ad3bb4dc7bd2 100644
--- a/grub-core/video/sis315pro.c
+++ b/grub-core/video/sis315pro.c
@@ -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);
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)
return 0;
diff --git a/grub-core/video/sm712.c b/grub-core/video/sm712.c
index 65f59f84b11a..e8967308d54c 100644
--- a/grub-core/video/sm712.c
+++ b/grub-core/video/sm712.c
@@ -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);
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)
return 0;
diff --git a/include/grub/pci.h b/include/grub/pci.h
index b228bb1b71fd..d4ce92b2d5f0 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -81,8 +81,8 @@
#define GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9
#define GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600
-#define GRUB_PCI_CLASS_SUBCLASS_VGA 0x0300
-#define GRUB_PCI_CLASS_SUBCLASS_USB 0x0c03
+#define GRUB_PCI_CLASS_DISPLAY_VGA 0x0300
+#define GRUB_PCI_CLASS_SERIAL_USB 0x0c03
#define GRUB_PCI_CLASS_COMMUNICATION_SERIAL 0x0700
#define GRUB_PCI_CLASS_COMMUNICATION_MODEM 0x0703
--
2.34.1