A few cleanups

.gitignore

@@ -0,0 +1,2 @@
+*.o
+*.a

arcgrackle/Makefile

@@ -1,5 +1,9 @@
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Set DEVKITPPC in your environment.")
+ifneq ($(strip $(DEVKITPPC)),)
+PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
+endif
+
+ifeq ($(strip $(PREFIX)),)
+$(error "Set DEVKITPPC or PREFIX in your environment.")
 endif
 
 PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
@@ -48,7 +52,7 @@ $(TARGET): $(OBJS)
 	@echo "  LINK      $@"
 	@$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 	@cp $(TARGET) $(TARGET:%.elf=%_unstripped.elf)
-	@strip $(TARGET)
+	@$(STRIP) $(TARGET)
 
 ifneq ($(LDSCRIPT),)
 $(TARGET): $(LDSCRIPT)

arcgrackle/source/arcfs.c

@@ -2295,7 +2295,7 @@ static FS_METADATA s_Metadata[FILE_TABLE_SIZE] = { 0 };
 
 DSTATUS disk_initialize(void) { return RES_OK; }
 
-DRESULT disk_readp(ULONG DeviceId, BYTE* buff, DWORD sector, UINT offset, UINT count) {
+DRESULT disk_readp(UINT DeviceId, BYTE* buff, DWORD sector, UINT offset, UINT count) {
 	if (DeviceId >= FILE_TABLE_SIZE) return RES_PARERR;
 	PFS_METADATA Meta = &s_Metadata[DeviceId];
 	if (Meta->Type != FS_FAT) return RES_PARERR;
@@ -2333,7 +2333,7 @@ DRESULT disk_readp(ULONG DeviceId, BYTE* buff, DWORD sector, UINT offset, UINT c
 	return RES_OK;
 }
 
-DRESULT disk_writep(ULONG DeviceId, const BYTE* buff, DWORD sc) {
+DRESULT disk_writep(UINT DeviceId, const BYTE* buff, DWORD sc) {
 	if (DeviceId >= FILE_TABLE_SIZE) return RES_PARERR;
 	PFS_METADATA Meta = &s_Metadata[DeviceId];
 	if (Meta->Type != FS_FAT) return RES_PARERR;

arcgrackle/source/arctime.c

@@ -8,6 +8,7 @@
 #include "arc.h"
 #include "arctime.h"
 #include "timer.h"
+#include "pxi.h"
 
 enum {
 	RTC_TO_UNIX_DIFF = 2082844800,
@@ -73,4 +74,4 @@ void ArcTimeInit(void) {
 	PVENDOR_VECTOR_TABLE Api = ARC_VENDOR_VECTORS();
 	Api->GetTimeRoutine = ArcGetTime;
 	Api->GetRelativeTimeRoutine = ArcGetRelativeTime;
-}
+}

arcgrackle/source/ide.c

@@ -21,6 +21,7 @@
 
 #include "ide.h"
 #include "hdreg.h"
+#include "timer.h"
 
 #define __be32_to_cpu(x) ((PU32BE)(ULONG)&(x))->v
 
@@ -1558,4 +1559,4 @@ int macio_ide_init(uint32_t addr, int nb_channels)
 	}
 
 	return 0;
-}
+}

arcgrackle/source/main.c

@@ -18,6 +18,7 @@
 #include "getstr.h"
 //#include "ppchook.h"
 #include "hwdesc.h"
+#include "timer.h"
 
 #include "pxi.h"
 #include "usbheap.h"
@@ -808,5 +809,4 @@ void ARC_NORETURN FwMain(PHW_DESCRIPTION Desc) {
 	ArcMain();
 	// should never reach here
 	while (1) {}
-	return 0;
 }

arcgrackle/source/usbhub.c

@@ -29,6 +29,8 @@
 
 #include "usb.h"
 
+void fatal(const char* ptr);
+
 // assume that host_to_device is overwritten if necessary
 #define DR_PORT gen_bmRequestType(host_to_device, class_type, other_recp)
 #define PORT_RESET 0x4

arcgrackle/source/usbmsc.c

@@ -34,6 +34,8 @@
 
 #include "pxi.h"
 
+void fatal(const char* ptr);
+
 #define htonl(x) __builtin_bswap32(x)
 #define ntohl(x) __builtin_bswap32(x)
 #define htonw(x) __builtin_bswap16(x)

arcgrackle/source/usbohci.c

@@ -49,21 +49,21 @@ static u32 _phys_to_virt(u32 phys) {
 	// return uncached address if possible
 	if (phys >= 0xf0000000) return phys;
 	if (phys < 0x10000000) return 0x90000000 + phys;
-	if (phys < 0x80000000) return NULL;
-	if (phys >= 0x90000000) return NULL;
+	if (phys < 0x80000000) return 0;
+	if (phys >= 0x90000000) return 0;
 	return phys + (0xC0000000 - 0x80000000);
 }
 
 static PVOID phys_to_virt(u32 phys) { return (PVOID)_phys_to_virt(phys); }
 
 static u32 virt_to_phys(PVOID _virt) {
 	u32 virt = (u32)_virt;
-	if (virt < 0x80000000) return NULL;
+	if (virt < 0x80000000) return 0;
 	if (virt < 0x90000000) return (virt - 0x80000000);
 	if (virt < 0xA0000000) return (virt - 0x90000000);
-	if (virt < 0xC0000000) return NULL;
+	if (virt < 0xC0000000) return 0;
 	if (virt < 0xD0000000) return (virt - 0xC0000000 + 0x80000000);
-	if (virt < 0xF0000000) return NULL;
+	if (virt < 0xF0000000) return 0;
 	return virt;
 }
 
@@ -238,7 +238,7 @@ ohci_init (void *bar)
 	init_device_entry (controller, 0);
 	OHCI_INST (controller)->roothub = controller->devices[0];
 
-	controller->reg_base = (u32)virt_to_phys((u32)bar);
+	controller->reg_base = (u32)virt_to_phys(bar);
 	OHCI_INST(controller)->opreg = (opreg_t*)bar;
 	usb_debug("OHCI Version %x.%x\n",
 		  (READ_OPREG(OHCI_INST(controller), HcRevision) >> 4) & 0xf,

arcloader_grackle/Makefile

@@ -1,8 +1,10 @@
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Set DEVKITPPC in your environment.")
+ifneq ($(strip $(DEVKITPPC)),)
+PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
 endif
 
-PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
+ifeq ($(strip $(PREFIX)),)
+$(error "Set DEVKITPPC or PREFIX in your environment.")
+endif
 
 CFLAGS = -mcpu=750 -m32 -mhard-float -mno-eabi -mno-sdata
 CFLAGS += -ffreestanding -ffunction-sections -fdata-sections
@@ -50,7 +52,7 @@ $(TARGET): $(OBJS)
 	@echo "  LINK      $@"
 	@$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 	@cp $(TARGET) $(TARGET:%.elf=%_unstripped.elf)
-	@strip $(TARGET)
+	@$(STRIP) $(TARGET)
 
 ifneq ($(LDSCRIPT),)
 $(TARGET): $(LDSCRIPT)

arcloader_grackle/source/main.c

@@ -919,7 +919,7 @@ static bool FbSetDepthNv(OFHANDLE Screen) {
 	NV_PRMCIO_CRTC[1] = 0x03;
 	__asm__ volatile ("eieio");
 	// Set PRAMDAC_GENERAL_CONTROL
-	volatile U32LE* NV_PRAMDAC_GENERAL_CONTROL = (volatile ULONG*)(PCRTC + 0x80600);
+	volatile U32LE* NV_PRAMDAC_GENERAL_CONTROL = (volatile U32LE*)(PCRTC + 0x80600);
 	NV_PRAMDAC_GENERAL_CONTROL->v = 0x101130; // PIXMIX_ON | VGA_STATE_SEL | ALT_MODE_SEL | BPC_8BITS
 	__asm__ volatile ("eieio");
 	// NV_CIO_CR_OFFSET = stride / 8

arcloader_unin/Makefile

@@ -1,8 +1,10 @@
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Set DEVKITPPC in your environment.")
+ifneq ($(strip $(DEVKITPPC)),)
+PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
 endif
 
-PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
+ifeq ($(strip $(PREFIX)),)
+$(error "Set DEVKITPPC or PREFIX in your environment.")
+endif
 
 CFLAGS = -mcpu=750 -m32 -mhard-float -mno-eabi -mno-sdata
 CFLAGS += -ffreestanding -ffunction-sections -fdata-sections
@@ -50,7 +52,7 @@ $(TARGET): $(OBJS)
 	@echo "  LINK      $@"
 	@$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 	@cp $(TARGET) $(TARGET:%.elf=%_unstripped.elf)
-	@strip $(TARGET)
+	@$(STRIP) $(TARGET)
 
 ifneq ($(LDSCRIPT),)
 $(TARGET): $(LDSCRIPT)

arcloader_unin/source/main.c

@@ -944,7 +944,7 @@ static bool FbSetDepthNv(OFHANDLE Screen) {
 	NV_PRMCIO_CRTC[1] = 0x03 | PixelDepth7;
 	__asm__ volatile ("eieio");
 	// Set PRAMDAC_GENERAL_CONTROL
-	volatile U32LE* NV_PRAMDAC_GENERAL_CONTROL = (volatile ULONG*)(PCRTC + 0x80600);
+	volatile U32LE* NV_PRAMDAC_GENERAL_CONTROL = (volatile U32LE*)(PCRTC + 0x80600);
 	NV_PRAMDAC_GENERAL_CONTROL->v = 0x101130; // PIXMIX_ON | VGA_STATE_SEL | ALT_MODE_SEL | BPC_8BITS
 	__asm__ volatile ("eieio");
 	// NV_CIO_CR_OFFSET = stride / 8

arcunin/Makefile

@@ -1,8 +1,10 @@
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Set DEVKITPPC in your environment.")
+ifneq ($(strip $(DEVKITPPC)),)
+PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
 endif
 
-PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
+ifeq ($(strip $(PREFIX)),)
+$(error "Set DEVKITPPC or PREFIX in your environment.")
+endif
 
 CFLAGS = -mcpu=750 -m32 -mlittle -mhard-float -mno-eabi -mno-sdata
 CFLAGS += -ffreestanding -ffunction-sections -fdata-sections
@@ -48,7 +50,7 @@ $(TARGET): $(OBJS)
 	@echo "  LINK      $@"
 	@$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
 	@cp $(TARGET) $(TARGET:%.elf=%_unstripped.elf)
-	@strip $(TARGET)
+	@$(STRIP) $(TARGET)
 
 ifneq ($(LDSCRIPT),)
 $(TARGET): $(LDSCRIPT)

arcunin/baselibc/Makefile

@@ -1,6 +1,9 @@
+ifneq ($(strip $(DEVKITPPC)),)
+PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
+endif
 
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
+ifeq ($(strip $(PREFIX)),)
+$(error "Set DEVKITPPC or PREFIX in your environment.")
 endif
 
 # You can override the CFLAGS and C compiler externally,
@@ -21,8 +24,8 @@ ifeq ($(PLATFORM),mipsel)
   CFLAGS += -G0 -mno-gpopt -march=r4000 -Os -mel -mgp32 -mfp32 -mabi=32
 endif
 ifeq ($(PLATFORM),ppc)
-  CC	  = $(DEVKITPPC)/bin/powerpc-eabi-gcc
-  AR      = $(DEVKITPPC)/bin/powerpc-eabi-gcc-ar
+  CC	  = $(PREFIX)gcc
+  AR      = $(PREFIX)ar
   CFLAGS += -mcpu=750 -m32 -mhard-float -mno-eabi -mno-sdata -mlittle
 endif
 

arcunin/source/arcfs.c

@@ -1924,7 +1924,7 @@ static FS_METADATA s_Metadata[FILE_TABLE_SIZE] = { 0 };
 
 DSTATUS disk_initialize(void) { return RES_OK; }
 
-DRESULT disk_readp(ULONG DeviceId, BYTE* buff, DWORD sector, UINT offset, UINT count) {
+DRESULT disk_readp(UINT DeviceId, BYTE* buff, DWORD sector, UINT offset, UINT count) {
 	if (DeviceId >= FILE_TABLE_SIZE) return RES_PARERR;
 	PFS_METADATA Meta = &s_Metadata[DeviceId];
 	if (Meta->Type != FS_FAT) return RES_PARERR;
@@ -1962,7 +1962,7 @@ DRESULT disk_readp(ULONG DeviceId, BYTE* buff, DWORD sector, UINT offset, UINT c
 	return RES_OK;
 }
 
-DRESULT disk_writep(ULONG DeviceId, const BYTE* buff, DWORD sc) {
+DRESULT disk_writep(UINT DeviceId, const BYTE* buff, DWORD sc) {
 	if (DeviceId >= FILE_TABLE_SIZE) return RES_PARERR;
 	PFS_METADATA Meta = &s_Metadata[DeviceId];
 	if (Meta->Type != FS_FAT) return RES_PARERR;

arcunin/source/arctime.c

@@ -8,6 +8,7 @@
 #include "arc.h"
 #include "arctime.h"
 #include "timer.h"
+#include "pxi.h"
 
 enum {
 	RTC_TO_UNIX_DIFF = 2082844800,

arcunin/source/ide.c

@@ -21,6 +21,7 @@
 
 #include "ide.h"
 #include "hdreg.h"
+#include "timer.h"
 
 #define __be32_to_cpu(x) ((PU32BE)(ULONG)&(x))->v
 

arcunin/source/main.c

@@ -18,6 +18,7 @@
 #include "getstr.h"
 //#include "ppchook.h"
 #include "hwdesc.h"
+#include "timer.h"
 
 #include "pxi.h"
 #include "usbheap.h"
@@ -832,5 +833,4 @@ void ARC_NORETURN FwMain(PHW_DESCRIPTION Desc) {
 	ArcMain();
 	// should never reach here
 	while (1) {}
-	return 0;
 }

arcunin/source/usbhub.c

@@ -29,6 +29,8 @@
 
 #include "usb.h"
 
+void fatal(const char* ptr);
+
 // assume that host_to_device is overwritten if necessary
 #define DR_PORT gen_bmRequestType(host_to_device, class_type, other_recp)
 #define PORT_RESET 0x4

arcunin/source/usbmsc.c

@@ -34,6 +34,8 @@
 
 #include "pxi.h"
 
+void fatal(const char* ptr);
+
 #define htonl(x) __builtin_bswap32(x)
 #define ntohl(x) __builtin_bswap32(x)
 #define htonw(x) __builtin_bswap16(x)

arcunin/source/usbohci.c

@@ -58,7 +58,7 @@ static void endian_swap64(void* buf, ULONG len) {
 static u32 _phys_to_virt(u32 phys) {
 	// return uncached address if possible
 	if (phys < 0x10000000) return 0x70000000 + phys;
-	if (phys < 0x80000000) return NULL;
+	if (phys < 0x80000000) return 0;
 	if (phys >= 0x90000000) return phys;
 	return phys - (0x80000000 - 0x60000000);
 }
@@ -67,7 +67,7 @@ static PVOID phys_to_virt(u32 phys) { return (PVOID)_phys_to_virt(phys); }
 
 static u32 virt_to_phys(PVOID _virt) {
 	u32 virt = (u32)_virt;
-	if (virt < 0x60000000) return NULL;
+	if (virt < 0x60000000) return 0;
 	if (virt < 0x70000000) return (virt - 0x60000000 + 0x80000000);
 	if (virt < 0x80000000) return (virt - 0x70000000);
 	if (virt < 0x90000000) return (virt - 0x80000000);
@@ -245,7 +245,7 @@ ohci_init (void *bar)
 	init_device_entry (controller, 0);
 	OHCI_INST (controller)->roothub = controller->devices[0];
 
-	controller->reg_base = (u32)virt_to_phys((u32)bar);
+	controller->reg_base = (u32)virt_to_phys(bar);
 	OHCI_INST(controller)->opreg = (opreg_t*)bar;
 	usb_debug("OHCI Version %x.%x\n",
 		  (READ_OPREG(OHCI_INST(controller), HcRevision) >> 4) & 0xf,

baselibc/Makefile

@@ -1,6 +1,9 @@
+ifneq ($(strip $(DEVKITPPC)),)
+PREFIX = $(DEVKITPPC)/bin/powerpc-eabi-
+endif
 
-ifeq ($(strip $(DEVKITPPC)),)
-$(error "Please set DEVKITPPC in your environment. export DEVKITPPC=<path to>devkitPPC")
+ifeq ($(strip $(PREFIX)),)
+$(error "Set DEVKITPPC or PREFIX in your environment.")
 endif
 
 # You can override the CFLAGS and C compiler externally,
@@ -21,8 +24,8 @@ ifeq ($(PLATFORM),mipsel)
   CFLAGS += -G0 -mno-gpopt -march=r4000 -Os -mel -mgp32 -mfp32 -mabi=32
 endif
 ifeq ($(PLATFORM),ppc)
-  CC	  = $(DEVKITPPC)/bin/powerpc-eabi-gcc
-  AR      = $(DEVKITPPC)/bin/powerpc-eabi-gcc-ar
+  CC	  = $(PREFIX)gcc
+  AR      = $(PREFIX)ar
   CFLAGS += -mcpu=750 -m32 -mhard-float -mno-eabi -mno-sdata -mbig
 endif