1. Move run_bios prototype to device.h
2. Use time.h for get_time() and move tb_freq into functions.c 3. Move read_io and write_io to io.c and make them static 4. Make a couple of functions static in interrupt.c 5. Refactor a cast from char[] to u64 to get rid of potential alignment problems and a warning Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5191 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@ -18,6 +18,7 @@
|
||||
#include <device/device.h>
|
||||
#include "../debug.h"
|
||||
#include "../biosemu.h"
|
||||
#include "../compat/time.h"
|
||||
|
||||
#define VMEM_SIZE (1024 * 1024) /* 1 MB */
|
||||
|
||||
@ -52,6 +53,8 @@ void run_bios(struct device * dev, unsigned long addr)
|
||||
}
|
||||
}
|
||||
|
||||
unsigned long tb_freq = 0;
|
||||
|
||||
u64 get_time(void)
|
||||
{
|
||||
u64 act;
|
||||
@ -64,50 +67,3 @@ u64 get_time(void)
|
||||
act = ((u64) edx << 32) | eax;
|
||||
return act;
|
||||
}
|
||||
|
||||
unsigned int
|
||||
read_io(void *addr, size_t sz)
|
||||
{
|
||||
unsigned int ret;
|
||||
/* since we are using inb instructions, we need the port number as 16bit value */
|
||||
u16 port = (u16)(u32) addr;
|
||||
|
||||
switch (sz) {
|
||||
case 1:
|
||||
asm volatile ("inb %1, %b0" : "=a"(ret) : "d" (port));
|
||||
break;
|
||||
case 2:
|
||||
asm volatile ("inw %1, %w0" : "=a"(ret) : "d" (port));
|
||||
break;
|
||||
case 4:
|
||||
asm volatile ("inl %1, %0" : "=a"(ret) : "d" (port));
|
||||
break;
|
||||
default:
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
int
|
||||
write_io(void *addr, unsigned int value, size_t sz)
|
||||
{
|
||||
u16 port = (u16)(u32) addr;
|
||||
switch (sz) {
|
||||
/* since we are using inb instructions, we need the port number as 16bit value */
|
||||
case 1:
|
||||
asm volatile ("outb %b0, %1" : : "a"(value), "d" (port));
|
||||
break;
|
||||
case 2:
|
||||
asm volatile ("outw %w0, %1" : : "a"(value), "d" (port));
|
||||
break;
|
||||
case 4:
|
||||
asm volatile ("outl %0, %1" : : "a"(value), "d" (port));
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user