diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2010-12-20 23:50:13 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-22 12:56:46 +0900 |
| commit | f48b9644ef330a13c6bb16ca85c2efdbe7e25558 (patch) | |
| tree | 5290969092a6040b692910a9d95612b55fc5fa00 /drivers/video/sis | |
| parent | e68046b72e9b35d054e3d98d71dc2c69d7e88e1e (diff) | |
sisfb: change register I/O functions to use fixed size types
Use fixed-sized types (u8, u16, u32) instead of plain C types.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sis')
| -rw-r--r-- | drivers/video/sis/init.c | 42 | ||||
| -rw-r--r-- | drivers/video/sis/sis.h | 22 |
2 files changed, 32 insertions, 32 deletions
diff --git a/drivers/video/sis/init.c b/drivers/video/sis/init.c index 5f49db145bbd..66de832361cc 100644 --- a/drivers/video/sis/init.c +++ b/drivers/video/sis/init.c @@ -876,59 +876,59 @@ SiS_GetModeID_VGA2(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDispl /*********************************************/ void -SiS_SetReg(SISIOADDRESS port, unsigned short index, unsigned short data) +SiS_SetReg(SISIOADDRESS port, u8 index, u8 data) { - outb((u8)index, port); - outb((u8)data, port + 1); + outb(index, port); + outb(data, port + 1); } void -SiS_SetRegByte(SISIOADDRESS port, unsigned short data) +SiS_SetRegByte(SISIOADDRESS port, u8 data) { - outb((u8)data, port); + outb(data, port); } void -SiS_SetRegShort(SISIOADDRESS port, unsigned short data) +SiS_SetRegShort(SISIOADDRESS port, u16 data) { - outw((u16)data, port); + outw(data, port); } void -SiS_SetRegLong(SISIOADDRESS port, unsigned int data) +SiS_SetRegLong(SISIOADDRESS port, u32 data) { - outl((u32)data, port); + outl(data, port); } -unsigned char -SiS_GetReg(SISIOADDRESS port, unsigned short index) +u8 +SiS_GetReg(SISIOADDRESS port, u8 index) { - outb((u8)index, port); + outb(index, port); return inb(port + 1); } -unsigned char +u8 SiS_GetRegByte(SISIOADDRESS port) { return inb(port); } -unsigned short +u16 SiS_GetRegShort(SISIOADDRESS port) { return inw(port); } -unsigned int +u32 SiS_GetRegLong(SISIOADDRESS port) { return inl(port); } void -SiS_SetRegANDOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND, unsigned short DataOR) +SiS_SetRegANDOR(SISIOADDRESS Port, u8 Index, u8 DataAND, u8 DataOR) { - unsigned short temp; + u8 temp; temp = SiS_GetReg(Port, Index); temp = (temp & (DataAND)) | DataOR; @@ -936,9 +936,9 @@ SiS_SetRegANDOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND, } void -SiS_SetRegAND(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND) +SiS_SetRegAND(SISIOADDRESS Port, u8 Index, u8 DataAND) { - unsigned short temp; + u8 temp; temp = SiS_GetReg(Port, Index); temp &= DataAND; @@ -946,9 +946,9 @@ SiS_SetRegAND(SISIOADDRESS Port, unsigned short Index, unsigned short DataAND) } void -SiS_SetRegOR(SISIOADDRESS Port, unsigned short Index, unsigned short DataOR) +SiS_SetRegOR(SISIOADDRESS Port, u8 Index, u8 DataOR) { - unsigned short temp; + u8 temp; temp = SiS_GetReg(Port, Index); temp |= DataOR; diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h index a94272d0126e..acf0766c4dbf 100644 --- a/drivers/video/sis/sis.h +++ b/drivers/video/sis/sis.h @@ -309,17 +309,17 @@ /* I/O port access macros and functions */ -void SiS_SetReg(SISIOADDRESS, unsigned short, unsigned short); -void SiS_SetRegByte(SISIOADDRESS, unsigned short); -void SiS_SetRegShort(SISIOADDRESS, unsigned short); -void SiS_SetRegLong(SISIOADDRESS, unsigned int); -void SiS_SetRegANDOR(SISIOADDRESS, unsigned short, unsigned short, unsigned short); -void SiS_SetRegAND(SISIOADDRESS, unsigned short, unsigned short); -void SiS_SetRegOR(SISIOADDRESS, unsigned short, unsigned short); -unsigned char SiS_GetReg(SISIOADDRESS, unsigned short); -unsigned char SiS_GetRegByte(SISIOADDRESS); -unsigned short SiS_GetRegShort(SISIOADDRESS); -unsigned int SiS_GetRegLong(SISIOADDRESS); +void SiS_SetReg(SISIOADDRESS, u8, u8); +void SiS_SetRegByte(SISIOADDRESS, u8); +void SiS_SetRegShort(SISIOADDRESS, u16); +void SiS_SetRegLong(SISIOADDRESS, u32); +void SiS_SetRegANDOR(SISIOADDRESS, u8, u8, u8); +void SiS_SetRegAND(SISIOADDRESS, u8, u8); +void SiS_SetRegOR(SISIOADDRESS, u8, u8); +u8 SiS_GetReg(SISIOADDRESS, u8); +u8 SiS_GetRegByte(SISIOADDRESS); +u16 SiS_GetRegShort(SISIOADDRESS); +u32 SiS_GetRegLong(SISIOADDRESS); #define inSISREG(base) inb(base) |