vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Undo r2063.

Browse source
This commit is contained in:
okuji 2009-04-04 09:22:35 +00:00
parent 838c454296
commit 6842cec424
18 changed files with 3144 additions and 3391 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/grub/efi/api.h
View file

@ -933,7 +933,7 @@ struct grub_efi_configuration_table
{
grub_efi_guid_t vendor_guid;
void *vendor_table;
} __attribute__ ((packed));
};
typedef struct grub_efi_configuration_table grub_efi_configuration_table_t;
struct grub_efi_simple_input_interface

35
include/grub/i386/pci.h
View file

@ -32,39 +32,4 @@ grub_pci_read (grub_pci_address_t addr)
return grub_inl (GRUB_PCI_DATA_REG);
}
static inline grub_uint16_t
grub_pci_read_word (grub_pci_address_t addr)
{
grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
return grub_inw (GRUB_PCI_DATA_REG + (addr & 3));
}
static inline grub_uint8_t
grub_pci_read_byte (grub_pci_address_t addr)
{
grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
return grub_inb (GRUB_PCI_DATA_REG + (addr & 3));
}
static inline void
grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
{
grub_outl (addr, GRUB_PCI_ADDR_REG);
grub_outl (data, GRUB_PCI_DATA_REG);
}
static inline void
grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
{
grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
grub_outw (data, GRUB_PCI_DATA_REG + (addr & 3));
}
static inline void
grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
{
grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
grub_outb (data, GRUB_PCI_DATA_REG + (addr & 3));
}
#endif /* GRUB_CPU_PCI_H */

4
include/grub/pci.h
View file

@ -36,8 +36,8 @@
#define GRUB_PCI_ADDR_IO_MASK ~0x03
typedef grub_uint32_t grub_pci_id_t;
typedef int NESTED_FUNC_ATTR (*grub_pci_iteratefunc_t)
(int bus, int device, int func, grub_pci_id_t pciid);
typedef int (*grub_pci_iteratefunc_t) (int bus, int device, int func,
grub_pci_id_t pciid);
typedef grub_uint32_t grub_pci_address_t;
grub_pci_address_t EXPORT_FUNC(grub_pci_make_address) (int bus, int device,