Use the bloated string formatting functions from newlib

fusee/fusee-secondary/Makefile

@@ -12,7 +12,7 @@ dir_source := src
 dir_build := build
 dir_out := out
 
-ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
+ARCH := -march=armv4t -mtune=arm7tdmi -marm
 
 ASFLAGS := -g $(ARCH)
 

fusee/fusee-secondary/src/lib/printk.c

@@ -2,9 +2,9 @@
  * Kernel print functions.
  */
 
+#include <stdio.h>
 #include "printk.h"
 
-#include "vsprintf.h"
 #include "../display/video_fb.h"
 
 /**

fusee/fusee-secondary/src/lib/vsprintf.h

@@ -1,28 +0,0 @@
-/*
- *  Copyright (C) 2011 Andrei Warkentin <andrey.warkentin@gmail.com>
- *
- * This program is free software ; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <stdarg.h>
-#include <stdlib.h>
-
-#ifndef VSPRINTF_H
-#define VSPRINTF_H
-
-struct va_format {
-        const char *fmt;
-        va_list *va;
-};
-
-unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base);
-
-int sprintf(char *buf, const char *fmt, ...);
-int scnprintf(char *buf, size_t size, const char *fmt, ...);
-int snprintf(char *buf, size_t size, const char *fmt, ...);
-int vsnprintf(char *buf, size_t size, const char *fmt, va_list args);
-int sscanf(const char *buf, const char *fmt, ...);
-
-#endif /* VSPRINTF_H */

fusee/fusee-secondary/src/loader.c

@@ -1,10 +1,10 @@
-#include "utils.h"
 #include <stdint.h>
+#include <stdio.h>
+#include "utils.h"
 #include "loader.h"
 #include "sd_utils.h"
 #include "stage2.h"
 #include "lib/printk.h"
-#include "lib/vsprintf.h"
 #include "lib/ini.h"
 
 const char *g_bct0 = NULL;

fusee/fusee-secondary/src/stratosphere.c

@@ -1,9 +1,9 @@
+#include <stdio.h>
 #include "utils.h"
 #include "package2.h"
 #include "stratosphere.h"
 #include "sd_utils.h"
 #include "lib/printk.h"
-#include "lib/vsprintf.h"
 
 unsigned char g_stratosphere_ini1[PACKAGE2_SIZE_MAX];
 static bool g_initialized_stratosphere_ini1 = false;
@@ -19,9 +19,9 @@ ini1_header_t *stratosphere_get_ini1(void) {
     ini1_header->size = sizeof(ini1_header_t);
     ini1_header->num_processes = 0;
     ini1_header->_0xC = 0;
-    
+
     /* TODO: When we have processes, copy them into ini1_header->kip_data here. */
-    
+
     g_initialized_stratosphere_ini1 = true;
     return ini1_header;
 }
@@ -36,18 +36,18 @@ size_t stratosphere_merge_inis(void *dst, ini1_header_t **inis, unsigned int num
             generic_panic();
         }
     }
-    
+
     uint64_t process_list[INI1_MAX_KIPS] = {0};
-    
+
     memset(g_ini1_buffer, 0, sizeof(g_ini1_buffer));
     ini1_header_t *merged = (ini1_header_t *)g_ini1_buffer;
     merged->magic = MAGIC_INI1;
     merged->num_processes = 0;
     merged->_0xC = 0;
     size_t remaining_size = PACKAGE2_SIZE_MAX - sizeof(ini1_header_t);
-    
+
     unsigned char *current_dst_kip = merged->kip_data;
-        
+
     /* Actually merge into the inis. */
     for (unsigned int i = 0; i < num_inis; i++) {
         uint64_t offset = 0;
@@ -57,8 +57,8 @@ size_t stratosphere_merge_inis(void *dst, ini1_header_t **inis, unsigned int num
                 printk("Error: INI1s[%d][%d] appears not to be a KIP1!\n", i, p);
                 generic_panic();
             }
-            
+
-            
+
             bool already_loaded = false;
             for (unsigned int j = 0; j < merged->num_processes; j++) {
                 if (process_list[j] == current_kip->title_id) {
@@ -69,10 +69,10 @@ size_t stratosphere_merge_inis(void *dst, ini1_header_t **inis, unsigned int num
             if (already_loaded) {
                 continue;
             }
-            
+
             /* TODO: What folder should these be read out of? */
             snprintf(sd_path, sizeof(sd_path), "atmosph\xe8re/titles/%016llx/%016llx.kip", current_kip->title_id, current_kip->title_id);
-            
+
             /* Try to load an override KIP from SD, if possible. */
             if (read_sd_file(current_dst_kip, remaining_size, sd_path)) {
                 kip1_header_t *sd_kip = (kip1_header_t *)(current_dst_kip);
@@ -96,14 +96,14 @@ size_t stratosphere_merge_inis(void *dst, ini1_header_t **inis, unsigned int num
                 remaining_size -= current_kip_size;
                 current_dst_kip += current_kip_size;
             }
-            
+
             process_list[merged->num_processes++] = current_kip->title_id;
         }
     }
     merged->size = sizeof(ini1_header_t) + (uint32_t)(current_dst_kip - merged->kip_data);
-    
+
     /* Copy merged INI1 to destination. */
     memcpy(dst, merged, merged->size);
-    
+
     return merged->size;
-}
+}