- use build in data types

git-svn-id: http://moon:8086/svn/mips@35 a8ebac50-d88d-4704-bea3-6648445a41b3
This commit is contained in:
2015-05-28 19:19:01 +00:00
parent 3263f9d79c
commit a655e1c5d9
54 changed files with 1551 additions and 1583 deletions
+14 -14
View File
@@ -6,16 +6,16 @@
ps2_if_t ps2_if[2] =
{
{ps2_type_unknown, (UINT32*)SYS_PS2_0_STAT, (UINT32*)SYS_PS2_0_DATA},
{ps2_type_unknown, (UINT32*)SYS_PS2_1_STAT, (UINT32*)SYS_PS2_1_DATA}
{ps2_type_unknown, (uint32_t*)SYS_PS2_0_STAT, (uint32_t*)SYS_PS2_0_DATA},
{ps2_type_unknown, (uint32_t*)SYS_PS2_1_STAT, (uint32_t*)SYS_PS2_1_DATA}
};
UINT32 PS2_get_num_if(void)
uint32_t PS2_get_num_if(void)
{
return (sizeof(ps2_if)/sizeof(ps2_if_t));
}
ps2_if_t *PS2_get_if(UINT32 port)
ps2_if_t *PS2_get_if(uint32_t port)
{
if (port < PS2_get_num_if())
return &ps2_if[port];
@@ -23,7 +23,7 @@ ps2_if_t *PS2_get_if(UINT32 port)
return NULL;
}
void PS2_byte_write(UINT32 port, UINT8 byte)
void PS2_byte_write(uint32_t port, uint8_t byte)
{
ps2_if_t *pIF;
@@ -31,10 +31,10 @@ void PS2_byte_write(UINT32 port, UINT8 byte)
while(!(*pIF->pCTRL & SYS_PS2_BIT_TX_EMPTY));
*pIF->pDATA = (UINT32)byte;
*pIF->pDATA = (uint32_t)byte;
}
UINT32 PS2_byte_read(UINT32 port, UINT32 timeout_ms)
uint32_t PS2_byte_read(uint32_t port, uint32_t timeout_ms)
{
ps2_if_t *pIF;
@@ -48,12 +48,12 @@ UINT32 PS2_byte_read(UINT32 port, UINT32 timeout_ms)
sleep(1);
}
return (UINT32)*pIF->pDATA;
return (uint32_t)*pIF->pDATA;
}
UINT32 PS2_cmd(UINT32 port, UINT8 cmd, UINT32 ack_timeout_ms)
uint32_t PS2_cmd(uint32_t port, uint8_t cmd, uint32_t ack_timeout_ms)
{
UINT32 result;
uint32_t result;
PS2_byte_write(port, cmd);
result = PS2_byte_read(port, ack_timeout_ms);
@@ -65,21 +65,21 @@ UINT32 PS2_cmd(UINT32 port, UINT8 cmd, UINT32 ack_timeout_ms)
return 0;
}
void PS2_flush(UINT32 port)
void PS2_flush(uint32_t port)
{
while (!IS_ERROR(PS2_byte_read(port, 10)));
}
UINT32 PS2_init(UINT32 port)
uint32_t PS2_init(uint32_t port)
{
int i;
ps2_if_t *pIF;
UINT8 id[2];
uint8_t id[2];
pIF = &ps2_if[port];
pIF->type = ps2_type_unknown;
UINT32 result;
uint32_t result;
// Disable RX-interrupt
*pIF->pCTRL &= ~SYS_PS2_BIT_RX_INTEN;