From 49717bf42992675d1d47da2f1e49d45bb19ce021 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Fri, 4 May 2012 10:54:38 +0200 Subject: [PATCH] * include/grub/pci.h: Move enums into no-asm part. --- ChangeLog | 4 ++++ include/grub/pci.h | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4cfd49245..59fd5ae63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-04 Vladimir Serbinenko + + * include/grub/pci.h: Move enums into no-asm part. + 2012-05-04 Vladimir Serbinenko * grub-core/fs/bfs.c (bfs_strcmp) [MODE_AFS]: Use signed comparison. diff --git a/include/grub/pci.h b/include/grub/pci.h index 2154d2951..aaf0101f9 100644 --- a/include/grub/pci.h +++ b/include/grub/pci.h @@ -81,6 +81,9 @@ #define GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9 #define GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600 #define GRUB_PCI_CLASS_SUBCLASS_VGA 0x0300 + +#ifndef ASM_FILE + enum { GRUB_PCI_CLASS_NETWORK = 0x02 @@ -95,7 +98,7 @@ enum GRUB_PCI_VENDOR_BROADCOM = 0x14e4 }; -#ifndef ASM_FILE + typedef grub_uint32_t grub_pci_id_t; #ifdef GRUB_MACHINE_EMU