diff options
| author | Kevin Brace <kevinbrace@bracecomputerlab.com> | 2019-12-16 20:49:07 -0600 |
|---|---|---|
| committer | Kevin Brace <kevinbrace@bracecomputerlab.com> | 2019-12-16 20:49:56 -0600 |
| commit | 49b642e902f9f4ed3518de5f771d53b3332e3554 (patch) | |
| tree | ca76504a350de2f4a4a192ceb9781f897c299129 | |
| parent | 500ca55f6db62b45111117767dfb56f51ae21f56 (diff) | |
Clean up SiS PCI Device IDs
Define newer (?) SiS PCI Device IDs without the use of #ifndef.
Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
| -rw-r--r-- | src/sis.h | 32 |
1 files changed, 5 insertions, 27 deletions
@@ -322,38 +322,16 @@ #define PCI_CHIP_SIS6326 0x6326 #define PCI_CHIP_SIS300 0x0300 #define PCI_CHIP_SIS315H 0x0310 +#define PCI_CHIP_SIS315 0x0315 #define PCI_CHIP_SIS315PRO 0x0325 #define PCI_CHIP_SIS330 0x0330 -#define PCI_CHIP_SIS630 0x6300 #define PCI_CHIP_SIS540 0x5300 +#define PCI_CHIP_SIS630 0x6300 #define PCI_CHIP_SIS550 0x5315 #define PCI_CHIP_SIS650 0x6325 - -/* For SiS315/550/650/740/330/660 - these should be moved elsewhere! */ -#ifndef PCI_CHIP_SIS315H -#define PCI_CHIP_SIS315H 0x0310 -#endif -#ifndef PCI_CHIP_SIS315 -#define PCI_CHIP_SIS315 0x0315 -#endif -#ifndef PCI_CHIP_SIS315PRO -#define PCI_CHIP_SIS315PRO 0x0325 -#endif -#ifndef PCI_CHIP_SIS550 -#define PCI_CHIP_SIS550 0x5315 /* 550_VGA */ -#endif -#ifndef PCI_CHIP_SIS650 -#define PCI_CHIP_SIS650 0x6325 /* 650_VGA and 740_VGA */ -#endif -#ifndef PCI_CHIP_SIS330 -#define PCI_CHIP_SIS330 0x0330 -#endif -#ifndef PCI_CHIP_SIS660 -#define PCI_CHIP_SIS660 0x6330 /* 661_VGA, 741_VGA, 760_VGA, 761_VGA */ -#endif -#ifndef PCI_CHIP_SIS340 -#define PCI_CHIP_SIS340 0x0340 -#endif +#define PCI_CHIP_SIS330 0x0330 +#define PCI_CHIP_SIS660 0x6330 +#define PCI_CHIP_SIS340 0x0340 #ifndef PCI_VENDOR_XGI #define PCI_VENDOR_XGI 0x18ca |