updated include/portio.h to not use gcc-specific "statement blocks" but instead have inportX() be static inline functions. Verified that the compiler does in fact inline them

git-svn-id: svn://anubis/hos/trunk@60 5b3e749e-e535-0410-8002-a9bb6afbdfca
This commit is contained in:
josh 2009-07-20 19:21:20 +00:00
parent e70b1a5213
commit 63289deade

View File

@ -13,25 +13,25 @@
#define outportd(port, val) \
__asm__ __volatile__ ("outl %%eax, %%dx" : : "a" (val), "d" (port));
#define inportb(port) \
({ \
u8_t val; \
__asm__ __volatile__ ("inb %%dx, %%al" : "=a" (val) : "d" (port)); \
val; \
});
static inline u8_t inportb(u16_t port)
{
u8_t val;
__asm__ __volatile__ ("inb %%dx, %%al" : "=a" (val) : "d" (port));
return val;
}
#define inportw(port) \
({ \
u16_t val; \
__asm__ __volatile__ ("inw %%dx, %%al" : "=a" (val) : "d" (port)); \
val; \
});
static inline u16_t inportw(u16_t port)
{
u16_t val;
__asm__ __volatile__ ("inw %%dx, %%al" : "=a" (val) : "d" (port));
return val;
}
#define inportd(port) \
({ \
u32_t val; \
__asm__ __volatile__ ("inl %%dx, %%al" : "=a" (val) : "d" (port)); \
val; \
});
static inline u32_t inportd(u16_t port)
{
u32_t val;
__asm__ __volatile__ ("inl %%dx, %%al" : "=a" (val) : "d" (port));
return val;
}
#endif