godzil/quickdev16
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove conflicts

Browse Source
This commit is contained in:
David Voswinkel 2009-06-02 22:16:05 +02:00
parent ae0f35d746
commit 551ecb1915
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
snes/fatfstest/debug.c
View File

@ -37,6 +37,7 @@ void _print_screen(word y, char *buffer){
char l; char l;
l = strlen(buffer); l = strlen(buffer);
waitForVBlank(); waitForVBlank();
for(i=0; i<32; i++) { for(i=0; i<32; i++) {
if (buffer[i] == '\n' ) { if (buffer[i] == '\n' ) {
y++; y++;

3
snes/fatfstest/diskio.c
View File

@ -32,9 +32,6 @@ return 1 byte
#include <string.h> #include <string.h>
#define IMAGE_NAME "disk00.vfat"
BYTE *image_addr;
DSTATUS disk_initialize (BYTE drv) { DSTATUS disk_initialize (BYTE drv) {

15
snes/fatfstest/integer.h
View File

@ -4,9 +4,6 @@
#ifndef _INTEGER #ifndef _INTEGER
#if 0
#include <windows.h>
#else
/* These types must be 16-bit, 32-bit or larger integer */ /* These types must be 16-bit, 32-bit or larger integer */
typedef int INT; typedef int INT;
@ -29,10 +26,14 @@ typedef unsigned long ULONG;
typedef unsigned long DWORD; typedef unsigned long DWORD;
/* Boolean type */ /* Boolean type */
typedef enum { typedef enum { FALSE = 0, TRUE } BOOL;
FALSE = 0,
TRUE = 1 /*
} BOOL; #define FALSE 0
#define TRUE 1
typedef int BOOL;
*/
#endif #endif

14
snes/fatfstest/main.c
View File

@ -20,7 +20,7 @@ DWORD acc_size; /* Work register for fs command */
WORD acc_files, acc_dirs; WORD acc_files, acc_dirs;
FILINFO finfo; 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 */ BYTE Buff[512]; /* Working buffer */
DWORD p1, p2, p3; DWORD p1, p2, p3;
@ -118,15 +118,15 @@ void main(void) {
printfs(0,"FATFS "); printfs(0,"FATFS ");
printfc("Try to init disk\n"); 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); res = f_getfree("/", &p2, &fs);
if (res) if (res)
put_rc(res); put_rc(res);
printfs(0,"FAT type = %u\nBytes/Cluster = %lu\nNumber of FATs = %u\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" "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", "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, (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->n_rootdir, (DWORD)fs->sects_fat, (DWORD)fs->max_clust - 2,
fs->fatbase, fs->dirbase, fs->database); fs->fatbase, fs->dirbase, fs->database);
@ -136,8 +136,8 @@ void main(void) {
if (res) if (res)
put_rc(res); put_rc(res);
printfc("%u files, %lu bytes.\n%u folders.\n" printfc("%u FILES, %lu BYTES\n%u FOLDERS\n"
"%lu KB total disk space.\n%lu KB available.\n", "%lu KB TOTAK DISK SPACE\n%lu KB AVAILABLE\n",
acc_files, acc_size, acc_dirs, acc_files, acc_size, acc_dirs,
(fs->max_clust - 2) * (fs->csize / 2), p2 * (fs->csize / 2)); (fs->max_clust - 2) * (fs->csize / 2), p2 * (fs->csize / 2));