diff options
Diffstat (limited to 'backends/platform/ds')
| -rw-r--r-- | backends/platform/ds/arm7/source/main.cpp | 18 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/blitters.cpp | 10 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 6 | 
3 files changed, 17 insertions, 17 deletions
| diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp index 2e9cacc669..6e714b22fa 100644 --- a/backends/platform/ds/arm7/source/main.cpp +++ b/backends/platform/ds/arm7/source/main.cpp @@ -46,10 +46,10 @@  #include "cartreset_nolibfat.h" -#define TOUCH_CAL_X1 (*(vs16*)0x027FFCD8) -#define TOUCH_CAL_Y1 (*(vs16*)0x027FFCDA) -#define TOUCH_CAL_X2 (*(vs16*)0x027FFCDE) -#define TOUCH_CAL_Y2 (*(vs16*)0x027FFCE0) +#define TOUCH_CAL_X1 (*(vs16 *)0x027FFCD8) +#define TOUCH_CAL_Y1 (*(vs16 *)0x027FFCDA) +#define TOUCH_CAL_X2 (*(vs16 *)0x027FFCDE) +#define TOUCH_CAL_Y2 (*(vs16 *)0x027FFCE0)  #define SCREEN_WIDTH    256  #define SCREEN_HEIGHT   192  s32 TOUCH_WIDTH  = TOUCH_CAL_X2 - TOUCH_CAL_X1; @@ -71,10 +71,10 @@ int temp;  int adpcmBufferNum = 0;  // those are pixel positions of the two points you click when calibrating -#define TOUCH_CNTRL_X1   (*(vu8*)0x027FFCDC) -#define TOUCH_CNTRL_Y1   (*(vu8*)0x027FFCDD) -#define TOUCH_CNTRL_X2   (*(vu8*)0x027FFCE2) -#define TOUCH_CNTRL_Y2   (*(vu8*)0x027FFCE3) +#define TOUCH_CNTRL_X1   (*(vu8 *)0x027FFCDC) +#define TOUCH_CNTRL_Y1   (*(vu8 *)0x027FFCDD) +#define TOUCH_CNTRL_X2   (*(vu8 *)0x027FFCE2) +#define TOUCH_CNTRL_Y2   (*(vu8 *)0x027FFCE3)  ////////////////////////////////////////////////////////////////////// @@ -330,7 +330,7 @@ void performSleep() {  //  int saveInts = REG_IE;  //  REG_IE = (1 << 22) | IRQ_VBLANK;		// Lid open -//  *((u32*) (0x0380FFF8)) = *((u32*) (0x0380FFF8)) | (REG_IE & REG_IF); +//  *((u32 *) (0x0380FFF8)) = *((u32 *) (0x0380FFF8)) | (REG_IE & REG_IF);  //  VBLANK_INTR_WAIT_FLAGS = IRQ_VBLANK; diff --git a/backends/platform/ds/arm9/source/blitters.cpp b/backends/platform/ds/arm9/source/blitters.cpp index 0076b302fd..1e8d56615d 100644 --- a/backends/platform/ds/arm9/source/blitters.cpp +++ b/backends/platform/ds/arm9/source/blitters.cpp @@ -222,8 +222,8 @@ static inline void RescaleBlock_5x1555_To_4x1555( u16 s0, u16 s1, u16 s2, u16 s3      u32 d10 = 0x80008000 | (rd1 << 26) | (gd1 << 21) | (bd1 << 16) | (rd0 << 10) | (gd0 << 5) | bd0;      u32 d32 = 0x80008000 | (rd3 << 26) | (gd3 << 21) | (bd3 << 16) | (rd2 << 10) | (gd2 << 5) | bd2; -    ((u32*)dest)[0] = d10; -    ((u32*)dest)[1] = d32; +    ((u32 *)dest)[0] = d10; +    ((u32 *)dest)[1] = d32;  }  #else  static inline void RescaleBlock_5x1555_To_4x1555( u16 s0, u16 s1, u16 s2, u16 s3, u16 s4, @@ -290,7 +290,7 @@ static inline void RescaleBlock_5x8888_To_4x1555( u32 s0, u32 s1, u32 s2, u32 s3  	gd0 = DIV_BY_5[gd0]; gd1 = DIV_BY_5[gd1];  	bd0 = DIV_BY_5[bd0]; bd1 = DIV_BY_5[bd1];      u32 d10 = 0x80008000 | (rd1 << 26) | (gd1 << 21) | (bd1 << 16) | (rd0 << 10) | (gd0 << 5) | bd0; -    ((u32*)dest)[0] = d10; +    ((u32 *)dest)[0] = d10;      u32 d2 = 2*s2 + 2*s3 +   s3;      u32 d3 =   s3 + 4*s4; @@ -307,7 +307,7 @@ static inline void RescaleBlock_5x8888_To_4x1555( u32 s0, u32 s1, u32 s2, u32 s3      bd2 = DIV_BY_5[bd2]; bd3 = DIV_BY_5[bd3];      u32 d32 = 0x80008000 | (rd3 << 26) | (gd3 << 21) | (bd3 << 16) | (rd2 << 10) | (gd2 << 5) | bd2; -    ((u32*)dest)[1] = d32; +    ((u32 *)dest)[1] = d32;  }  // Can't work in place @@ -377,7 +377,7 @@ void Rescale_320x256xPAL8_To_256x256x1555(u16 *dest, const u8 *src, int destStri  void Rescale_320x256xPAL8_To_256x256x1555(u16 *dest, const u8 *src, int destStride, int srcStride, const u16 *palette) {  	u16 fastRam[256];      for (size_t i = 0; i < 128; ++i) -        ((u32*)fastRam)[i] = ((const u32*)palette)[i]; +        ((u32 *)fastRam)[i] = ((const u32*)palette)[i];  	for (size_t i = 0; i < 200; ++i) {  		Rescale_320xPAL8Scanline_To_256x1555Scanline(dest + i*destStride, src + i *srcStride, fastRam); diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index dfd906d816..cedbdcb167 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -926,7 +926,7 @@ void displayMode16Bit() {  	SUB_BG0_Y0 = 0;  	consoleInit(NULL, 0, BgType_Text4bpp, BgSize_T_256x256, 4, 0, false, true); -//	consoleInitDefault((u16*)SCREEN_BASE_BLOCK_SUB(4), (u16*)CHAR_BASE_BLOCK_SUB(0), 16); +//	consoleInitDefault((u16 *)SCREEN_BASE_BLOCK_SUB(4), (u16 *)CHAR_BASE_BLOCK_SUB(0), 16);  	for (int r = 0; r < 32 * 32; r++) {  		((u16 *) SCREEN_BASE_BLOCK_SUB(4))[r] = buffer[r]; @@ -2414,7 +2414,7 @@ void initHardware() {  	BG_PALETTE[255] = RGB15(31,31,31);//by default font will be rendered with color 255  	//consoleInit() is a lot more flexible but this gets you up and running quick -//	consoleInitDefault((u16*)SCREEN_BASE_BLOCK(0), (u16*)CHAR_BASE_BLOCK(1), 16); +//	consoleInitDefault((u16 *)SCREEN_BASE_BLOCK(0), (u16 *)CHAR_BASE_BLOCK(1), 16);  	//consolePrintSet(0, 6);  	//irqs are nice @@ -2886,7 +2886,7 @@ void dsExceptionHandler() {  	setExceptionHandler(NULL);  	u32	currentMode = getCPSR() & 0x1f; -	u32 thumbState = ((*(u32*)0x027FFD90) & 0x20); +	u32 thumbState = ((*(u32 *)0x027FFD90) & 0x20);  	u32 codeAddress, exceptionAddress = 0; | 
