david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Kill off lots of warnings in via-velocity.c by correcting these definitions.

This commit is contained in:
Michael Brown 2007-07-04 23:36:16 +01:00
parent 1af1668c95
commit 5e3f2247e0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/arch/i386/include/io.h
View File

@ -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))