aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ps2
diff options
context:
space:
mode:
Diffstat (limited to 'backends/platform/ps2')
-rw-r--r--backends/platform/ps2/cd.c8
-rw-r--r--backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c4
-rw-r--r--backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c6
-rw-r--r--backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c2
-rw-r--r--backends/platform/ps2/iop/rpckbd/src/ps2kbd.c68
-rw-r--r--backends/platform/ps2/rpckbd.c2
6 files changed, 45 insertions, 45 deletions
diff --git a/backends/platform/ps2/cd.c b/backends/platform/ps2/cd.c
index 5694d9a960..cd44b3d034 100644
--- a/backends/platform/ps2/cd.c
+++ b/backends/platform/ps2/cd.c
@@ -29,7 +29,7 @@ int cdvdInit(int mode)
u8 *pkt;
cdvdCd.server = NULL;
-
+
do {
if ((ret = SifBindRpc(&cdvdCd, CDVD_INIT_BIND_RPC, 0)) < 0) {
return -1;
@@ -40,14 +40,14 @@ int cdvdInit(int mode)
}
while(!cdvdCd.server);
- pkt = sendBuffer;
+ pkt = sendBuffer;
PUSHDATA( int, pkt, mode, i);
pkt += i; len += i;
if ((ret = SifCallRpc(&cdvdCd, 0, 0, sendBuffer, len, NULL, 0, 0, 0)) < 0)
return -1;
-
+
cdvdInitialised = 1;
-
+
return 0;
}
diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
index e5eb76fdc8..b423b44a1d 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
+++ b/backends/platform/ps2/iop/CoDyVDfs/iop/codyvdfs.c
@@ -76,7 +76,7 @@ int cacheEnterDir(ISODirectoryRecord *dir) {
cacheName = cachedDir + strlen(cachedDir);
memcpy(cacheName, dir->name, dir->len_fi);
cacheName[dir->len_fi] = '/';
- cacheName[dir->len_fi + 1] = '\0';
+ cacheName[dir->len_fi + 1] = '\0';
return cdReadSectors(cachedDirLba, 1, cacheBuf, &rmode);
}
@@ -144,7 +144,7 @@ ISODirectoryRecord *findPath(const char *path) {
initRootCache();
return (ISODirectoryRecord *)cacheBuf;
}
-
+
do {
tok = strchr(path, '/');
if (tok)
diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c b/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
index f4d512a6e4..a64b2f2f3b 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
+++ b/backends/platform/ps2/iop/CoDyVDfs/iop/fiofs.c
@@ -162,7 +162,7 @@ int cd_read(iop_file_t *handle, void *dest, int length) {
doCopy = 0x800 - readPos;
if (doCopy > bytesLeft)
doCopy = bytesLeft;
-
+
memcpy(destPos, fd->buf + readPos, doCopy);
readPos += doCopy;
readLba += readPos >> 11;
@@ -180,7 +180,7 @@ int cd_read(iop_file_t *handle, void *dest, int length) {
bytesLeft &= 0x7FF;
}
}
- return destPos - (uint8*)dest;
+ return destPos - (uint8*)dest;
}
int cd_close(iop_file_t *handle) {
@@ -204,7 +204,7 @@ int cd_dopen(iop_file_t *handle, const char *path) {
return -ENOENT;
fdSlot = allocDioHandle();
-
+
if (fdSlot < 0)
return -ENFILE;
diff --git a/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c b/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c
index c46d452d2c..a9bfd636c7 100644
--- a/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c
+++ b/backends/platform/ps2/iop/CoDyVDfs/iop/rpcfs.c
@@ -48,7 +48,7 @@ int initRpc(void) {
thread.attr = 0;
tid = CreateThread(&thread);
- if (tid >= 0)
+ if (tid >= 0)
StartThread(tid, 0);
else {
printf("Unable to start RPC Thread!\n");
diff --git a/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c b/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c
index f87a47f0cb..bb7de8ff2b 100644
--- a/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c
+++ b/backends/platform/ps2/iop/rpckbd/src/ps2kbd.c
@@ -137,7 +137,7 @@ int ps2kbd_probe(int devId)
//printf("PS2Kbd_probe devId %d\n", devId);
dev = UsbGetDeviceStaticDescriptor(devId, NULL, USB_DT_DEVICE); /* Get device descriptor */
- if(!dev)
+ if(!dev)
{
printf("ERROR: Couldn't get device descriptor\n");
return 0;
@@ -164,7 +164,7 @@ int ps2kbd_probe(int devId)
printf("ERROR: No interfaces available\n");
return 0;
}
-
+
intf = (UsbInterfaceDescriptor *) ((char *) conf + conf->bLength); /* Get first interface */
/* printf("Interface Length %d Endpoints %d Class %d Sub %d Proto %d\n", intf->bLength, */
/* intf->bNumEndpoints, intf->bInterfaceClass, intf->bInterfaceSubClass, */
@@ -182,7 +182,7 @@ int ps2kbd_probe(int devId)
endp = (UsbEndpointDescriptor *) ((char *) endp + endp->bLength); /* Go to the data endpoint */
//printf("Endpoint 1 Addr %d, Attr %d, MaxPacket %d\n", endp->bEndpointAddress, endp->bmAttributes, endp->wMaxPacketSizeLB);
-
+
if(((endp->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT) ||
((endp->bEndpointAddress & USB_ENDPOINT_DIR_MASK) != USB_DIR_IN))
{
@@ -210,7 +210,7 @@ int ps2kbd_connect(int devId)
//printf("PS2Kbd_connect devId %d\n", devId);
dev = UsbGetDeviceStaticDescriptor(devId, NULL, USB_DT_DEVICE); /* Get device descriptor */
- if(!dev)
+ if(!dev)
{
printf("ERROR: Couldn't get device descriptor\n");
return 1;
@@ -222,7 +222,7 @@ int ps2kbd_connect(int devId)
printf("ERROR: Couldn't get configuration descriptor\n");
return 1;
}
-
+
intf = (UsbInterfaceDescriptor *) ((char *) conf + conf->bLength); /* Get first interface */
endp = (UsbEndpointDescriptor *) ((char *) intf + intf->bLength);
endp = (UsbEndpointDescriptor *) ((char *) endp + endp->bLength); /* Go to the data endpoint */
@@ -311,7 +311,7 @@ typedef struct _string_descriptor
{
u8 buf[200];
char *desc;
-} string_descriptor;
+} string_descriptor;
void ps2kbd_getstring_set(int resultCode, int bytes, void *arg)
@@ -334,7 +334,7 @@ void ps2kbd_getstring_set(int resultCode, int bytes, void *arg)
}
printf("%s: %s\n", strBuf->desc, string);
}
-
+
FreeSysMemory(arg);
}
@@ -343,7 +343,7 @@ void usb_getstring(int endp, int index, char *desc)
{
u8 *data;
string_descriptor *str;
- int ret;
+ int ret;
data = (u8 *) AllocSysMemory(0, sizeof(string_descriptor), NULL);
str = (string_descriptor *) data;
@@ -351,7 +351,7 @@ void usb_getstring(int endp, int index, char *desc)
if(data != NULL)
{
str->desc = desc;
- ret = UsbControlTransfer(endp, 0x80, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) | index,
+ ret = UsbControlTransfer(endp, 0x80, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) | index,
0, sizeof(string_descriptor) - 4, data, ps2kbd_getstring_set, data);
if(ret != USB_RC_OK)
{
@@ -380,7 +380,7 @@ void ps2kbd_config_set(int resultCode, int bytes, void *arg)
if(dev != NULL)
{
int ret;
-
+
ret = UsbControlTransfer(dev->configEndp, 0x21, USB_REQ_SET_IDLE, 0, dev->interfaceNo, 0, NULL, ps2kbd_idlemode_set, arg);
}
}
@@ -397,12 +397,12 @@ void ps2kbd_idlemode_set(int resultCode, int bytes, void *arg)
printf("PS2KBD: Idlemode set error res %d, bytes %d, arg %p\n", resultCode, bytes, arg);
return;
}
-
+
dev = (kbd_dev *) arg;
if(dev != NULL)
{
int ret;
-
+
ret = UsbInterruptTransfer(dev->dataEndp, &dev->data, dev->packetSize, ps2kbd_data_recv, arg);
}
}
@@ -474,7 +474,7 @@ void ps2kbd_getkeys(u8 keyMods, u8 ledStatus, const u8 *keys, kbd_dev *dev)
{
tempPos = lineStartP;
}
-
+
for(loopKey = 0; loopKey < PS2KBD_MAXKEYS; loopKey++)
{
u8 currKey = keys[loopKey];
@@ -581,7 +581,7 @@ void ps2kbd_getkeys(u8 keyMods, u8 ledStatus, const u8 *keys, kbd_dev *dev)
}
}
- if(byteCount > 0)
+ if(byteCount > 0)
{
iop_sys_clock_t t;
/* Set alarm to do repeat rate */
@@ -619,11 +619,11 @@ void ps2kbd_getkeys_raw(u8 newKeyMods, u8 oldKeyMods, u8 *new, const u8 *old)
{
tempPos = lineStartP;
}
-
+
for(loopKey = 0; loopKey < 8; loopKey++)
{
int currMod = (1 << loopKey);
- if(keyMods & currMod)
+ if(keyMods & currMod)
{
if(lineEndP == (tempPos - 2))
{
@@ -708,7 +708,7 @@ void ps2kbd_data_recv(int resultCode, int bytes, void *arg)
printf("PS2KEYBOARD: Data Recv set res %d, bytes %d, arg %p\n", resultCode, bytes, arg);
return;
}
-
+
//printf("PS2KBD: Data Recv set res %d, bytes %d, arg %p\n", resultCode, bytes, arg);
dev = (kbd_dev *) arg;
@@ -717,7 +717,7 @@ void ps2kbd_data_recv(int resultCode, int bytes, void *arg)
printf("PS2KBD: dev == NULL\n");
return;
}
-
+
/* printf("PS2KBD Modifiers %02X, Keys ", dev->data.mod_keys); */
/* for(loop = 0; loop < PS2KBD_MAXKEYS; loop++) */
/* { */
@@ -737,7 +737,7 @@ void ps2kbd_data_recv(int resultCode, int bytes, void *arg)
break;
}
}
-
+
if(!phantom) /* If not in a phantom state */
{
u8 uniqueKeys[PS2KBD_MAXKEYS];
@@ -763,23 +763,23 @@ void ps2kbd_data_recv(int resultCode, int bytes, void *arg)
/* printf("%02X ", missingKeys[loopKey]); */
/* } */
/* printf("\n"); */
-
+
if(kbd_readmode == PS2KBD_READMODE_NORMAL)
{
u8 ledStatus;
ledStatus = dev->ledStatus;
//printf("ledStatus %02X\n", ledStatus);
-
+
for(loopKey = 0; loopKey < PS2KBD_MAXKEYS; loopKey++) /* Process key codes */
{
switch(uniqueKeys[loopKey])
{
- case USB_KEYB_NUMLOCK :
+ case USB_KEYB_NUMLOCK :
ledStatus ^= PS2KBD_LED_NUMLOCK;
uniqueKeys[loopKey] = 0;
break;
- case USB_KEYB_CAPSLOCK :
+ case USB_KEYB_CAPSLOCK :
ledStatus ^= PS2KBD_LED_CAPSLOCK;
uniqueKeys[loopKey] = 0;
break;
@@ -789,16 +789,16 @@ void ps2kbd_data_recv(int resultCode, int bytes, void *arg)
break;
}
}
-
+
if(ledStatus != dev->ledStatus)
{
dev->ledStatus = ledStatus & PS2KBD_LED_MASK;
//printf("LEDS %02X\n", dev->ledStatus);
/* Call Set LEDS */
- UsbControlTransfer(dev->configEndp, 0x21, USB_REQ_SET_REPORT, 0x200,
+ UsbControlTransfer(dev->configEndp, 0x21, USB_REQ_SET_REPORT, 0x200,
dev->interfaceNo, 1, &dev->ledStatus, ps2kbd_led_set, arg);
}
-
+
WaitSema(lineSema); /* Make sure no other thread is going to manipulate the buffer */
ps2kbd_getkeys(dev->data.mod_keys, dev->ledStatus, uniqueKeys, dev); /* read in remaining keys */
SignalSema(lineSema);
@@ -812,7 +812,7 @@ void ps2kbd_data_recv(int resultCode, int bytes, void *arg)
memcpy(&dev->oldData, &dev->data, sizeof(kbd_data_recv));
}
-
+
ret = UsbInterruptTransfer(dev->dataEndp, &dev->data, dev->packetSize, ps2kbd_data_recv, arg);
}
@@ -824,14 +824,14 @@ void flushbuffer()
lineStartP = 0;
lineEndP = 0;
memset(lineBuffer, 0, lineSize);
-
+
DeleteSema(bufferSema);
s.initial = 0;
s.max = lineSize;
s.option = 0;
s.attr = 0;
bufferSema = CreateSema(&s); /* Create a sema to maintain status of readable data */
-
+
if(bufferSema <= 0)
{
printf("Error creating buffer sema\n");
@@ -843,7 +843,7 @@ void ps2kbd_rpc_setreadmode(u32 readmode)
{
int devLoop;
- if(readmode == kbd_readmode) return;
+ if(readmode == kbd_readmode) return;
if((readmode == PS2KBD_READMODE_NORMAL) || (readmode == PS2KBD_READMODE_RAW))
{
@@ -1006,7 +1006,7 @@ void repeat_thread(void *arg)
if(lineEndP != (tempPos - 2))
{
lineBuffer[lineEndP++] = devices[devLoop]->repeatkeys[0];
- lineEndP %= lineSize;
+ lineEndP %= lineSize;
lineBuffer[lineEndP++] = devices[devLoop]->repeatkeys[1];
lineEndP %= lineSize;
SignalSema(bufferSema);
@@ -1018,7 +1018,7 @@ void repeat_thread(void *arg)
if(lineEndP != (tempPos - 1))
{
lineBuffer[lineEndP++] = devices[devLoop]->repeatkeys[0];
- lineEndP %= lineSize;
+ lineEndP %= lineSize;
SignalSema(bufferSema);
}
}
@@ -1051,7 +1051,7 @@ int init_repeatthread()
StartThread(repeat_tid, 0);
return 0;
}
- else
+ else
{
return 1;
}
@@ -1171,7 +1171,7 @@ int ps2kbd_init() {
lineEndP = 0;
lineSize = PS2KBD_DEFLINELEN;
memset(lineBuffer, 0, PS2KBD_DEFLINELEN);
-
+
memset(devices, 0, sizeof(kbd_dev *) * PS2KBD_MAXDEV);
dev_count = 0;
kbd_readmode = PS2KBD_READMODE_NORMAL;
diff --git a/backends/platform/ps2/rpckbd.c b/backends/platform/ps2/rpckbd.c
index 8291df681a..0d37e4cfcb 100644
--- a/backends/platform/ps2/rpckbd.c
+++ b/backends/platform/ps2/rpckbd.c
@@ -58,7 +58,7 @@ int PS2KbdRead(char *key)
int res;
if ((!kbdInitialized) || (curr_readmode != PS2KBD_READMODE_NORMAL))
return -1;
-
+
if (PollSema(kbdRpcSema) >= 0) {
// last rpc call completed
res = (rpcKey != 0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 23:29:39 +0000