From 551ecb19156e69ab7d5131d800c3a3eba579372e Mon Sep 17 00:00:00 2001
From: David Voswinkel <david@optixx.org>
Date: Tue, 2 Jun 2009 22:16:05 +0200
Subject: [PATCH] remove conflicts

---
 snes/fatfstest/debug.c   |  1 +
 snes/fatfstest/diskio.c  |  3 ---
 snes/fatfstest/integer.h | 15 ++++++++-------
 snes/fatfstest/main.c    | 14 +++++++-------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/snes/fatfstest/debug.c b/snes/fatfstest/debug.c
index d6cddf6..b5be78d 100644
--- a/snes/fatfstest/debug.c
+++ b/snes/fatfstest/debug.c
@@ -37,6 +37,7 @@ void _print_screen(word y, char *buffer){
     char l;
     l = strlen(buffer);
     waitForVBlank();
+	
 	for(i=0; i<32; i++) {
         if (buffer[i] == '\n' ) {
           y++;
diff --git a/snes/fatfstest/diskio.c b/snes/fatfstest/diskio.c
index 4803ea0..cf7b1c9 100644
--- a/snes/fatfstest/diskio.c
+++ b/snes/fatfstest/diskio.c
@@ -32,9 +32,6 @@ return      1 byte
 
 #include <string.h>
 
-#define IMAGE_NAME "disk00.vfat"
-
-BYTE  *image_addr;
 
 DSTATUS disk_initialize (BYTE drv) {
     
diff --git a/snes/fatfstest/integer.h b/snes/fatfstest/integer.h
index e8f435d..782aab3 100644
--- a/snes/fatfstest/integer.h
+++ b/snes/fatfstest/integer.h
@@ -4,9 +4,6 @@
 
 #ifndef _INTEGER
 
-#if 0
-#include <windows.h>
-#else
 
 /* These types must be 16-bit, 32-bit or larger integer */
 typedef int				INT;
@@ -29,10 +26,14 @@ typedef unsigned long	ULONG;
 typedef unsigned long	DWORD;
 
 /* Boolean type */
-typedef enum { 
-    FALSE = 0, 
-    TRUE  = 1
-} BOOL;
+typedef enum { FALSE = 0, TRUE } BOOL;
+
+/*
+#define FALSE 0
+#define TRUE 1
+
+typedef int			BOOL;
+*/
 
 #endif
 
diff --git a/snes/fatfstest/main.c b/snes/fatfstest/main.c
index ed0031f..0f1f5bf 100644
--- a/snes/fatfstest/main.c
+++ b/snes/fatfstest/main.c
@@ -20,7 +20,7 @@ DWORD acc_size;                 /* Work register for fs command */
 WORD acc_files, acc_dirs;
 
 FILINFO finfo;
-FATFS fatfs[2];                 /* File system object for each logical drive */
+FATFS fatfs[1];                 /* File system object for each logical drive */
 BYTE Buff[512];                 /* Working buffer */
 
 DWORD p1, p2, p3;
@@ -118,15 +118,15 @@ void main(void) {
     printfs(0,"FATFS ");
 
     printfc("Try to init disk\n");
-    put_rc(f_mount(0, &fatfs[p1]));
+    put_rc(f_mount(0, &fatfs[0]));
 
     res = f_getfree("/", &p2, &fs);
     if (res)
         put_rc(res);
 
-    printfs(0,"FAT type = %u\nBytes/Cluster = %lu\nNumber of FATs = %u\n"
-            "Root DIR entries = %u\nSectors/FAT = %lu\nNumber of clusters = %lu\n"
-            "FAT start (lba) = %lu\nDIR start (lba,clustor) = %lu\nData start (lba) = %lu\n",
+    printfs(0,"FAT TYPE = %u\nBYTES/CLUSTER = %lu\nNUMBER OF FATS = %u\n"
+            "ROOT DIR ENTRIES = %u\nSECTORS/FAT = %lu\nNUMBER OF CLUSTERS = %lu\n"
+            "FAT START = %lu\nDIR START LBA,CLUSTER = %lu\nDATA START LBA = %lu\n",
             (WORD)fs->fs_type, (DWORD)fs->csize * 512, (WORD)fs->n_fats,
             fs->n_rootdir, (DWORD)fs->sects_fat, (DWORD)fs->max_clust - 2,
             fs->fatbase, fs->dirbase, fs->database);
@@ -136,8 +136,8 @@ void main(void) {
     if (res)
         put_rc(res);
     
-    printfc("%u files, %lu bytes.\n%u folders.\n"
-           "%lu KB total disk space.\n%lu KB available.\n",
+    printfc("%u FILES, %lu BYTES\n%u FOLDERS\n"
+           "%lu KB TOTAK DISK SPACE\n%lu KB AVAILABLE\n",
            acc_files, acc_size, acc_dirs,
            (fs->max_clust - 2) * (fs->csize / 2), p2 * (fs->csize / 2));