diff options
author | Eugene Sandulenko | 2009-01-01 15:06:43 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2009-01-01 15:06:43 +0000 |
commit | 696897b0583ad52ebc6f7666525277847619a8ce (patch) | |
tree | 5ac2be2991e94dce32c5bb7fdb0dcc4188221503 /backends/platform/ps2 | |
parent | 05d3633eb32ead8e11435b85a9db1ddaa1482fcb (diff) | |
download | scummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.tar.gz scummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.tar.bz2 scummvm-rg350-696897b0583ad52ebc6f7666525277847619a8ce.zip |
Whoa! Removing trailing spaces.
svn-id: r35648
Diffstat (limited to 'backends/platform/ps2')
-rw-r--r-- | backends/platform/ps2/Gs2dScreen.cpp | 10 | ||||
-rw-r--r-- | backends/platform/ps2/fileio.cpp | 2 | ||||
-rw-r--r-- | backends/platform/ps2/iop/rpckbd/include/ps2kbd.h | 2 | ||||
-rw-r--r-- | backends/platform/ps2/iop/rpckbd/src/irx_imports.h | 2 | ||||
-rw-r--r-- | backends/platform/ps2/iop/rpckbd/src/us_keymap.h | 50 | ||||
-rw-r--r-- | backends/platform/ps2/irxboot.cpp | 4 | ||||
-rw-r--r-- | backends/platform/ps2/savefilemgr.cpp | 6 | ||||
-rw-r--r-- | backends/platform/ps2/savefilemgr.h | 2 | ||||
-rw-r--r-- | backends/platform/ps2/systemps2.cpp | 10 |
9 files changed, 44 insertions, 44 deletions
diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp index 92ba731433..51c10c10f2 100644 --- a/backends/platform/ps2/Gs2dScreen.cpp +++ b/backends/platform/ps2/Gs2dScreen.cpp @@ -149,7 +149,7 @@ Gs2dScreen::Gs2dScreen(uint16 width, uint16 height, TVMode tvMode) { _videoMode = tvMode; printf("Setting up %s mode\n", (_videoMode == TV_PAL) ? "PAL" : "NTSC"); - + // set screen size, 640x544 for pal, 640x448 for ntsc _tvWidth = 640; _tvHeight = ((_videoMode == TV_PAL) ? 544 : 448); @@ -175,7 +175,7 @@ Gs2dScreen::Gs2dScreen(uint16 width, uint16 height, TVMode tvMode) { _clutPtrs[TEXT] = _clutPtrs[SCREEN] + 0x2000; _texPtrs[SCREEN] = _clutPtrs[SCREEN] + 0x3000; _texPtrs[TEXT] = 0; // these buffers are stored in the alpha gaps of the frame buffers - _texPtrs[MOUSE] = 128 * 256 * 4; + _texPtrs[MOUSE] = 128 * 256 * 4; _texPtrs[PRINTF] = _texPtrs[MOUSE] + M_SIZE * M_SIZE * 4; _showOverlay = false; @@ -224,7 +224,7 @@ Gs2dScreen::Gs2dScreen(uint16 width, uint16 height, TVMode tvMode) { updateScreen(); createAnimTextures(); - + // create anim thread ee_thread_t animThread, thisThread; ReferThreadStatus(GetThreadId(), &thisThread); @@ -636,7 +636,7 @@ void Gs2dScreen::animThread(void) { do { WaitSema(g_AnimSema); } while ((!_systemQuit) && (!g_RunAnim)); - + if (_systemQuit) break; @@ -761,7 +761,7 @@ const uint32 Gs2dScreen::_binaryClut[16] __attribute__((aligned(64))) = { GS_RGBA( 0, 0, 0, 0x20), // scrPrintf: semitransparent GS_RGBA(0xC0, 0xC0, 0xC0, 0), // scrPrintf: red GS_RGBA(0x16, 0x16, 0xF0, 0), // scrPrintf: blue - + GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), // unused GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), GS_RGBA(0xFF, 0xFF, 0xFF, 0x80), diff --git a/backends/platform/ps2/fileio.cpp b/backends/platform/ps2/fileio.cpp index b7fa8d03f1..039e309eb9 100644 --- a/backends/platform/ps2/fileio.cpp +++ b/backends/platform/ps2/fileio.cpp @@ -355,7 +355,7 @@ FILE *ps2_fopen(const char *fname, const char *mode) { file = new Ps2McWriteFile((Ps2SaveFileManager *)g_systemPs2->getSavefileManager()); if (file->open(fname + 4)) // + 4 to skip "mc0:" return (FILE *)file; - + delete file; return NULL; } else { diff --git a/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h b/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h index f16c7ca12b..bebbe73d6a 100644 --- a/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h +++ b/backends/platform/ps2/iop/rpckbd/include/ps2kbd.h @@ -52,7 +52,7 @@ typedef struct _kbd_rawkey { #define PS2KBD_READMODE_RAW 2 /* Notes on read mode */ -/* In normal readmode (default) read multiples of 1 character off the keyboard file. These are +/* In normal readmode (default) read multiples of 1 character off the keyboard file. These are processed by the keymaps so that you get back ASCII data */ /* In raw readmode must read multiples of 2. First byte indicates state (i.e. Up or Down) Second byte is the USB key code for that key. This table is presented in the USB HID Usage Tables manaual diff --git a/backends/platform/ps2/iop/rpckbd/src/irx_imports.h b/backends/platform/ps2/iop/rpckbd/src/irx_imports.h index 6ecc8e5864..41a90a45f0 100644 --- a/backends/platform/ps2/iop/rpckbd/src/irx_imports.h +++ b/backends/platform/ps2/iop/rpckbd/src/irx_imports.h @@ -3,7 +3,7 @@ # ____| | ____| | | |____| # | ___| |____ ___| ____| | \ PS2DEV Open Source Project. #----------------------------------------------------------------------- -# Copyright (c) 2003 Marcus R. Brown <mrbrown@0xd6.org> +# Copyright (c) 2003 Marcus R. Brown <mrbrown@0xd6.org> # Licenced under Academic Free License version 2.0 # Review ps2sdk README & LICENSE files for further details. # diff --git a/backends/platform/ps2/iop/rpckbd/src/us_keymap.h b/backends/platform/ps2/iop/rpckbd/src/us_keymap.h index 57f0686cd3..6c41e794cb 100644 --- a/backends/platform/ps2/iop/rpckbd/src/us_keymap.h +++ b/backends/platform/ps2/iop/rpckbd/src/us_keymap.h @@ -16,8 +16,8 @@ /* Default US keymap */ -u8 us_keymap[PS2KBD_KEYMAP_SIZE] = - { +u8 us_keymap[PS2KBD_KEYMAP_SIZE] = + { 0, 0, 0, @@ -83,7 +83,7 @@ u8 us_keymap[PS2KBD_KEYMAP_SIZE] = 0, // F5 0, // F6 0, // F7 - 0, // F8 + 0, // F8 0, // F9 0, // F10 0, // F11 @@ -92,7 +92,7 @@ u8 us_keymap[PS2KBD_KEYMAP_SIZE] = 0, // Scroll Lock 0, // Pause 0, // Insert - 0, // Home + 0, // Home 0, // Pg Up 0, // Delete 0, // End @@ -102,7 +102,7 @@ u8 us_keymap[PS2KBD_KEYMAP_SIZE] = 0, // Down 0, // Up 0, // Numlock - '/', // Keypad + '/', // Keypad '*', '-', '+', @@ -276,7 +276,7 @@ u8 us_keymap[PS2KBD_KEYMAP_SIZE] = 0 }; -u8 us_shiftkeymap[PS2KBD_KEYMAP_SIZE] = +u8 us_shiftkeymap[PS2KBD_KEYMAP_SIZE] = { 0, 0, @@ -343,7 +343,7 @@ u8 us_shiftkeymap[PS2KBD_KEYMAP_SIZE] = 0, // F5 0, // F6 0, // F7 - 0, // F8 + 0, // F8 0, // F9 0, // F10 0, // F11 @@ -352,7 +352,7 @@ u8 us_shiftkeymap[PS2KBD_KEYMAP_SIZE] = 0, // Scroll Lock 0, // Pause 0, // Insert - 0, // Home + 0, // Home 0, // Pg Up 0, // Delete 0, // End @@ -362,7 +362,7 @@ u8 us_shiftkeymap[PS2KBD_KEYMAP_SIZE] = 0, // Down 0, // Up 0, // Numlock - '/', // Keypad + '/', // Keypad '*', '-', '+', @@ -536,7 +536,7 @@ u8 us_shiftkeymap[PS2KBD_KEYMAP_SIZE] = 0 }; -u8 us_keycap[PS2KBD_KEYMAP_SIZE] = +u8 us_keycap[PS2KBD_KEYMAP_SIZE] = { 0, 0, @@ -603,7 +603,7 @@ u8 us_keycap[PS2KBD_KEYMAP_SIZE] = 0, // F5 0, // F6 0, // F7 - 0, // F8 + 0, // F8 0, // F9 0, // F10 0, // F11 @@ -612,7 +612,7 @@ u8 us_keycap[PS2KBD_KEYMAP_SIZE] = 0, // Scroll Lock 0, // Pause 0, // Insert - 0, // Home + 0, // Home 0, // Pg Up 0, // Delete 0, // End @@ -622,7 +622,7 @@ u8 us_keycap[PS2KBD_KEYMAP_SIZE] = 0, // Down 0, // Up 0, // Numlock - 0, // Keypad + 0, // Keypad 0, 0, 0, @@ -796,7 +796,7 @@ u8 us_keycap[PS2KBD_KEYMAP_SIZE] = 0 }; -u8 us_special_keys[PS2KBD_KEYMAP_SIZE] = { +u8 us_special_keys[PS2KBD_KEYMAP_SIZE] = { 0, 0, @@ -863,7 +863,7 @@ u8 us_special_keys[PS2KBD_KEYMAP_SIZE] = { 5, // F5 6, // F6 7, // F7 - 8, // F8 + 8, // F8 9, // F9 10, // F10 11, // F11 @@ -872,7 +872,7 @@ u8 us_special_keys[PS2KBD_KEYMAP_SIZE] = { 33, // Scroll Lock 34, // Pause 35, // Insert - 36, // Home + 36, // Home 37, // Pg Up 38, // Delete 39, // End @@ -882,7 +882,7 @@ u8 us_special_keys[PS2KBD_KEYMAP_SIZE] = { 43, // Down 44, // Up 0, // Numlock - 0, // Keypad / + 0, // Keypad / 0, // Keypad * 0, // Keypad - 0, // Keypad + @@ -1056,7 +1056,7 @@ u8 us_special_keys[PS2KBD_KEYMAP_SIZE] = { 0 }; -u8 us_control_map[PS2KBD_KEYMAP_SIZE] = { +u8 us_control_map[PS2KBD_KEYMAP_SIZE] = { 0, 0, @@ -1123,7 +1123,7 @@ u8 us_control_map[PS2KBD_KEYMAP_SIZE] = { 0, // F5 0, // F6 0, // F7 - 0, // F8 + 0, // F8 0, // F9 0, // F10 0, // F11 @@ -1132,7 +1132,7 @@ u8 us_control_map[PS2KBD_KEYMAP_SIZE] = { 0, // Scroll Lock 0, // Pause 0, // Insert - 0, // Home + 0, // Home 0, // Pg Up 0, // Delete 0, // End @@ -1142,7 +1142,7 @@ u8 us_control_map[PS2KBD_KEYMAP_SIZE] = { 0, // Down 0, // Up 0, // Numlock - 0, // Keypad + 0, // Keypad 0, 0, 0, @@ -1316,7 +1316,7 @@ u8 us_control_map[PS2KBD_KEYMAP_SIZE] = { 0 }; -u8 us_alt_map[PS2KBD_KEYMAP_SIZE] = { +u8 us_alt_map[PS2KBD_KEYMAP_SIZE] = { 0, 0, @@ -1383,7 +1383,7 @@ u8 us_alt_map[PS2KBD_KEYMAP_SIZE] = { 0, // F5 0, // F6 0, // F7 - 0, // F8 + 0, // F8 0, // F9 0, // F10 0, // F11 @@ -1392,7 +1392,7 @@ u8 us_alt_map[PS2KBD_KEYMAP_SIZE] = { 0, // Scroll Lock 0, // Pause 0, // Insert - 0, // Home + 0, // Home 0, // Pg Up 0, // Delete 0, // End @@ -1402,7 +1402,7 @@ u8 us_alt_map[PS2KBD_KEYMAP_SIZE] = { 0, // Down 0, // Up 0, // Numlock - 0, // Keypad + 0, // Keypad 0, 0, 0, diff --git a/backends/platform/ps2/irxboot.cpp b/backends/platform/ps2/irxboot.cpp index 65d1e243eb..91c45294c6 100644 --- a/backends/platform/ps2/irxboot.cpp +++ b/backends/platform/ps2/irxboot.cpp @@ -74,7 +74,7 @@ BootDevice detectBootPath(const char *elfPath, char *bootPath) { device = OTHER; sioprintf("elf path: %s, device %d\n", elfPath, device); - + strcpy(bootPath, elfPath); char *pathPos = bootPath; @@ -116,7 +116,7 @@ BootDevice detectBootPath(const char *elfPath, char *bootPath) { return device; } -int loadIrxModules(int device, const char *irxPath, IrxReference **modules) { +int loadIrxModules(int device, const char *irxPath, IrxReference **modules) { IrxReference *resModules = (IrxReference *)malloc(numIrxFiles * sizeof(IrxReference)); IrxReference *curModule = resModules; diff --git a/backends/platform/ps2/savefilemgr.cpp b/backends/platform/ps2/savefilemgr.cpp index 8fbd98e78a..3e93b954c7 100644 --- a/backends/platform/ps2/savefilemgr.cpp +++ b/backends/platform/ps2/savefilemgr.cpp @@ -193,7 +193,7 @@ Ps2SaveFileManager::Ps2SaveFileManager(OSystem_PS2 *system, Gs2dScreen *screen) saveThread.initial_priority = thisThread.current_priority + 1; saveThread.stack_size = 8 * 1024; - _autoSaveStack = malloc(saveThread.stack_size); + _autoSaveStack = malloc(saveThread.stack_size); saveThread.stack = _autoSaveStack; saveThread.func = (void *)runSaveThread; saveThread.gp_reg = &_gp; @@ -409,7 +409,7 @@ Common::StringList Ps2SaveFileManager::listSavefiles(const char *regex) { _mcNeedsUpdate = true; mcTable *mcEntries = (mcTable*)memalign(64, sizeof(mcTable) * MAX_MC_ENTRIES); - + char temp[256], mcSearchStr[256], *dir, *ext; strcpy(temp, regex); dir = strdup(strtok(temp, ".")); @@ -451,7 +451,7 @@ bool Ps2SaveFileManager::removeSavefile(const char *filename) { char dir[64], name[64], fullPath[128]; - splitPath(filename, dir, name); + splitPath(filename, dir, name); sprintf(fullPath, "/ScummVM-%s/%s", dir, name); int res = _mc->remove(fullPath); diff --git a/backends/platform/ps2/savefilemgr.h b/backends/platform/ps2/savefilemgr.h index 0164d4551b..794c2aeb9c 100644 --- a/backends/platform/ps2/savefilemgr.h +++ b/backends/platform/ps2/savefilemgr.h @@ -43,7 +43,7 @@ public: int read(int fd, void *buf, int size); int write(int fd, const void *buf, int size); int mkDir(const char *name); - int getDir(const char *name, unsigned int mode, int max, void *dest); + int getDir(const char *name, unsigned int mode, int max, void *dest); int getInfo(int *type, int *free, int *format); int remove(const char *name); diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index aac399ee23..adf519cee3 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -197,7 +197,7 @@ void OSystem_PS2::startIrxModules(int numModules, IrxReference *modules) { } } else sioprintf("Module \"%s\" wasn't found: %d\n", modules[i].path, modules[i].errorCode); - + if ((modules[i].errorCode < 0) || (res < 0) || (rv < 0)) { if (!(modules[i].fileRef->flags & OPTIONAL)) { if (modules[i].errorCode < 0) @@ -208,7 +208,7 @@ void OSystem_PS2::startIrxModules(int numModules, IrxReference *modules) { quit(); } } - + if (modules[i].buffer) free(modules[i].buffer); } else { @@ -283,7 +283,7 @@ OSystem_PS2::OSystem_PS2(const char *elfPath) { hddPreparePoweroff(); //poweroffInit(); - dbg_printf("romeo : hddPreparePoweroff done\n"); + dbg_printf("romeo : hddPreparePoweroff done\n"); hddSetUserPoweroffCallback(gluePowerOffCallback, this); //poweroffSetCallback(gluePowerOffCallback, this); @@ -464,7 +464,7 @@ bool OSystem_PS2::hddPresent(void) { } bool OSystem_PS2::usbMassPresent(void) { - + if (_usbMassLoaded) { int testFd = fio.dopen("mass:/"); if (testFd >= 0) @@ -670,7 +670,7 @@ void OSystem_PS2::msgPrintf(int millis, char *format, ...) { while ((*lnEnd) && (*lnEnd != '\n')) lnEnd++; *lnEnd = '\0'; - + Common::String str(lnSta); int width = Graphics::g_sysfont.getStringWidth(str); if (width > maxWidth) |