From fab71406b1bbb6120228b72a40eb76bf646b7ee6 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Wed, 9 May 2012 16:42:33 +0100 Subject: [PATCH] use single fat.h in top folder --- gba/Makefile | 6 ++-- gba/include/fat.h | 81 ----------------------------------------- include/fat.h | 6 ++-- libogc/Makefile | 8 +++-- libogc/include/fat.h | 86 -------------------------------------------- nds/Makefile | 6 ++-- nds/include/fat.h | 86 -------------------------------------------- 7 files changed, 17 insertions(+), 262 deletions(-) delete mode 100644 gba/include/fat.h delete mode 100644 libogc/include/fat.h delete mode 100644 nds/include/fat.h diff --git a/gba/Makefile b/gba/Makefile index d9c6039..feee942 100644 --- a/gba/Makefile +++ b/gba/Makefile @@ -121,11 +121,13 @@ clean: all: $(GBABIN) dist-bin: + @mkdir -p include + @cp $(TOPDIR)/include/fat.h $(TOPDIR)/include/libfatversion.h include @tar --exclude=.svn --exclude=*CVS* -cvjf $(TOPDIR)/distribute/$(VERSTRING)/libfat-gba-$(VERSTRING).tar.bz2 include lib install: - cp lib/libfat.a $(DEVKITPRO)/libgba/lib - cp include/fat.h $(DEVKITPRO)/libgba/include + @cp lib/libfat.a $(DEVKITPRO)/libgba/lib + @cp $(TOPDIR)/include/fat.h $(TOPDIR)/include/libfatversion.h $(DEVKITPRO)/libgba/include #--------------------------------------------------------------------------------- else diff --git a/gba/include/fat.h b/gba/include/fat.h deleted file mode 100644 index b0a9b0d..0000000 --- a/gba/include/fat.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - fat.h - Simple functionality for startup, mounting and unmounting of FAT-based devices. - - Copyright (c) 2006 Michael "Chishm" Chisholm - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - - -#ifndef _LIBFAT_H -#define _LIBFAT_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include "disc_io.h" - -/* -Initialise any inserted block-devices. -Add the fat device driver to the devoptab, making it available for standard file functions. -cacheSize: The number of pages to allocate for each inserted block-device -setAsDefaultDevice: if true, make this the default device driver for file operations -*/ -extern bool fatInit (uint32_t cacheSize, bool setAsDefaultDevice); - -/* -Calls fatInit with setAsDefaultDevice = true and cacheSize optimised for the host system. -*/ -extern bool fatInitDefault (void); - -/* -Mount the device pointed to by interface, and set up a devoptab entry for it as "name:". -You can then access the filesystem using "name:/". -This will mount the active partition or the first valid partition on the disc, -and will use a cache size optimized for the host system. -*/ -extern bool fatMountSimple (const char* name, const DISC_INTERFACE* interface); - -/* -Mount the device pointed to by interface, and set up a devoptab entry for it as "name:". -You can then access the filesystem using "name:/". -If startSector = 0, it will mount the active partition of the first valid partition on -the disc. Otherwise it will try to mount the partition starting at startSector. -cacheSize specifies the number of pages to allocate for the cache. -This will not startup the disc, so you need to call interface->startup(); first. -*/ -extern bool fatMount (const char* name, const DISC_INTERFACE* interface, sec_t startSector, uint32_t cacheSize, uint32_t SectorsPerPage); - -/* -Unmount the partition specified by name. -If there are open files, it will attempt to synchronise them to disc. -*/ -extern void fatUnmount (const char* name); - -#ifdef __cplusplus -} -#endif - -#endif // _LIBFAT_H diff --git a/include/fat.h b/include/fat.h index b0ffc13..605f9ec 100644 --- a/include/fat.h +++ b/include/fat.h @@ -36,6 +36,8 @@ extern "C" { #endif +#include "libfatversion.h" + // When compiling for NDS, make sure NDS is defined #ifndef NDS #if defined ARM9 || defined ARM7 @@ -49,9 +51,9 @@ extern "C" { # include #else # ifdef NDS -# include "nds/disc_io.h" +# include # else -# include "disc_io.h" +# include # endif #endif diff --git a/libogc/Makefile b/libogc/Makefile index 50af584..1b16245 100644 --- a/libogc/Makefile +++ b/libogc/Makefile @@ -101,12 +101,14 @@ clean: all: $(CUBEBIN) dist-bin: + @mkdir -p include + @cp $(TOPDIR)/include/fat.h $(TOPDIR)/include/libfatversion.h include @tar --exclude=.svn --exclude=*CVS* -cvjf $(TOPDIR)/distribute/$(VERSTRING)/libfat-ogc-$(VERSTRING).tar.bz2 include lib install: - cp lib/wii/libfat.a $(DEVKITPRO)/libogc/lib/wii - cp lib/cube/libfat.a $(DEVKITPRO)/libogc/lib/cube - cp include/fat.h $(DEVKITPRO)/libogc/include + @cp lib/wii/libfat.a $(DEVKITPRO)/libogc/lib/wii + @cp lib/cube/libfat.a $(DEVKITPRO)/libogc/lib/cube + @cp $(TOPDIR)/include/fat.h $(TOPDIR)/include/libfatversion.h $(DEVKITPRO)/libogc/include #--------------------------------------------------------------------------------- else diff --git a/libogc/include/fat.h b/libogc/include/fat.h deleted file mode 100644 index 31efbe0..0000000 --- a/libogc/include/fat.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - fat.h - Simple functionality for startup, mounting and unmounting of FAT-based devices. - - Copyright (c) 2006 Michael "Chishm" Chisholm - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - - -#ifndef _LIBFAT_H -#define _LIBFAT_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -/* -Initialise any inserted block-devices. -Add the fat device driver to the devoptab, making it available for standard file functions. -cacheSize: The number of pages to allocate for each inserted block-device -setAsDefaultDevice: if true, make this the default device driver for file operations -*/ -extern bool fatInit (uint32_t cacheSize, bool setAsDefaultDevice); - -/* -Calls fatInit with setAsDefaultDevice = true and cacheSize optimised for the host system. -*/ -extern bool fatInitDefault (void); - -/* -Mount the device pointed to by interface, and set up a devoptab entry for it as "name:". -You can then access the filesystem using "name:/". -This will mount the active partition or the first valid partition on the disc, -and will use a cache size optimized for the host system. -*/ -extern bool fatMountSimple (const char* name, const DISC_INTERFACE* interface); - -/* -Mount the device pointed to by interface, and set up a devoptab entry for it as "name:". -You can then access the filesystem using "name:/". -If startSector = 0, it will mount the active partition of the first valid partition on -the disc. Otherwise it will try to mount the partition starting at startSector. -cacheSize specifies the number of pages to allocate for the cache. -This will not startup the disc, so you need to call interface->startup(); first. -*/ -extern bool fatMount (const char* name, const DISC_INTERFACE* interface, sec_t startSector, uint32_t cacheSize, uint32_t SectorsPerPage); - -/* -Unmount the partition specified by name. -If there are open files, it will attempt to synchronise them to disc. -*/ -extern void fatUnmount (const char* name); - -/* -Get Volume Label -*/ -extern void fatGetVolumeLabel (const char* name, char *label); - -#ifdef __cplusplus -} -#endif - -#endif // _LIBFAT_H diff --git a/nds/Makefile b/nds/Makefile index d9135c6..cbd3305 100644 --- a/nds/Makefile +++ b/nds/Makefile @@ -100,11 +100,13 @@ clean: all: $(ARM9BIN) dist-bin: + @mkdir -p include + @cp $(TOPDIR)/include/fat.h $(TOPDIR)/include/libfatversion.h include @tar --exclude=.svn --exclude=*CVS* -cvjf $(TOPDIR)/distribute/$(VERSTRING)/libfat-nds-$(VERSTRING).tar.bz2 include lib install: - cp lib/libfat.a $(DEVKITPRO)/libnds/lib - cp include/fat.h $(DEVKITPRO)/libnds/include + @cp lib/libfat.a $(DEVKITPRO)/libnds/lib + @cp $(TOPDIR)/include/fat.h $(TOPDIR)/include/libfatversion.h $(DEVKITPRO)/libnds/include #--------------------------------------------------------------------------------- else diff --git a/nds/include/fat.h b/nds/include/fat.h deleted file mode 100644 index 5272b80..0000000 --- a/nds/include/fat.h +++ /dev/null @@ -1,86 +0,0 @@ -/* - fat.h - Simple functionality for startup, mounting and unmounting of FAT-based devices. - - Copyright (c) 2006 Michael "Chishm" Chisholm - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - - -#ifndef _LIBFAT_H -#define _LIBFAT_H - -#ifdef __cplusplus -extern "C" { -#endif - -// When compiling for NDS, make sure NDS is defined -#ifndef NDS -#define NDS -#endif - -#include -#include "nds/disc_io.h" - -/* -Initialise any inserted block-devices. -Add the fat device driver to the devoptab, making it available for standard file functions. -cacheSize: The number of pages to allocate for each inserted block-device -setAsDefaultDevice: if true, make this the default device driver for file operations -*/ -extern bool fatInit (uint32_t cacheSize, bool setAsDefaultDevice); - -/* -Calls fatInit with setAsDefaultDevice = true and cacheSize optimised for the host system. -*/ -extern bool fatInitDefault (void); - -/* -Mount the device pointed to by interface, and set up a devoptab entry for it as "name:". -You can then access the filesystem using "name:/". -This will mount the active partition or the first valid partition on the disc, -and will use a cache size optimized for the host system. -*/ -extern bool fatMountSimple (const char* name, const DISC_INTERFACE* interface); - -/* -Mount the device pointed to by interface, and set up a devoptab entry for it as "name:". -You can then access the filesystem using "name:/". -If startSector = 0, it will mount the active partition of the first valid partition on -the disc. Otherwise it will try to mount the partition starting at startSector. -cacheSize specifies the number of pages to allocate for the cache. -This will not startup the disc, so you need to call interface->startup(); first. -*/ -extern bool fatMount (const char* name, const DISC_INTERFACE* interface, sec_t startSector, uint32_t cacheSize, uint32_t SectorsPerPage); - -/* -Unmount the partition specified by name. -If there are open files, it will attempt to synchronise them to disc. -*/ -extern void fatUnmount (const char* name); - -#ifdef __cplusplus -} -#endif - -#endif // _LIBFAT_H