* include/grub/pci.h: Move enums into no-asm part.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-04 10:54:38 +02:00
parent 0a308f64e9
commit 49717bf429
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,7 @@
2012-05-04 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/pci.h: Move enums into no-asm part.
2012-05-04 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-04 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/bfs.c (bfs_strcmp) [MODE_AFS]: Use signed comparison. * grub-core/fs/bfs.c (bfs_strcmp) [MODE_AFS]: Use signed comparison.

View file

@ -81,6 +81,9 @@
#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_SUBCLASS_VGA 0x0300
#ifndef ASM_FILE
enum enum
{ {
GRUB_PCI_CLASS_NETWORK = 0x02 GRUB_PCI_CLASS_NETWORK = 0x02
@ -95,7 +98,7 @@ enum
GRUB_PCI_VENDOR_BROADCOM = 0x14e4 GRUB_PCI_VENDOR_BROADCOM = 0x14e4
}; };
#ifndef ASM_FILE
typedef grub_uint32_t grub_pci_id_t; typedef grub_uint32_t grub_pci_id_t;
#ifdef GRUB_MACHINE_EMU #ifdef GRUB_MACHINE_EMU