diff options
| author | Marty Connor | 2007-07-05 00:33:22 +0200 |
|---|---|---|
| committer | Marty Connor | 2007-07-05 00:33:22 +0200 |
| commit | 77c1777b446eaaa6034af7f3a28c83e0dc710614 (patch) | |
| tree | 59b9b0c81244b8cf6ddeba9c2d7dd75c7850c0be | |
| parent | Remove deprecation of pci_bar_size() (diff) | |
| parent | Kill off lots of warnings in via-velocity.c by correcting these definitions. (diff) | |
| download | ipxe-77c1777b446eaaa6034af7f3a28c83e0dc710614.tar.gz ipxe-77c1777b446eaaa6034af7f3a28c83e0dc710614.tar.xz ipxe-77c1777b446eaaa6034af7f3a28c83e0dc710614.zip | |
Merge branch 'master' of /pub/scm/gpxe
| -rw-r--r-- | src/arch/i386/include/io.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/arch/i386/include/io.h b/src/arch/i386/include/io.h index f2f67cbd..46b8a1fb 100644 --- a/src/arch/i386/include/io.h +++ b/src/arch/i386/include/io.h @@ -1,6 +1,7 @@ #ifndef ETHERBOOT_IO_H #define ETHERBOOT_IO_H +#include <stdint.h> #include "virtaddr.h" /* virt_to_bus converts an addresss inside of etherboot [_start, _end] @@ -71,13 +72,13 @@ static inline void iounmap(void *virt_addr __unused) * differently. On the x86 architecture, we just read/write the * memory location directly. */ -#define readb(addr) (*(volatile unsigned char *) (addr)) -#define readw(addr) (*(volatile unsigned short *) (addr)) -#define readl(addr) (*(volatile unsigned int *) (addr)) +#define readb(addr) (*(volatile uint8_t *) (addr)) +#define readw(addr) (*(volatile uint16_t *) (addr)) +#define readl(addr) (*(volatile uint32_t *) (addr)) -#define writeb(b,addr) ((*(volatile unsigned char *) (addr)) = (b)) -#define writew(b,addr) ((*(volatile unsigned short *) (addr)) = (b)) -#define writel(b,addr) ((*(volatile unsigned int *) (addr)) = (b)) +#define writeb(b,addr) ((*(volatile uint8_t *) (addr)) = (b)) +#define writew(b,addr) ((*(volatile uint16_t *) (addr)) = (b)) +#define writel(b,addr) ((*(volatile uint32_t *) (addr)) = (b)) #define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) #define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) |