Merge branch 'master' of github.com:GadgetFactory/DesignLab_Examples

Author: alvieboy

libraries/ramFS/ramFS.cpp

@@ -0,0 +1,154 @@
+/*!
+ *  @file		ramFS.cpp
+ *  Project		RamFS Library
+ *	@brief		Allows SD or SmallFS files to be loaded into SDRAM.
+ *	Version		1.0
+ *  @author		Jack Gassett 
+ *	@date		11/10/12
+ *  License		GPL
+ */
+
+#include "ramFS.h"
+#include <string.h>
+#ifdef __linux__
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <endian.h>
+#include "zstdio.h"
+#include <new.h>
+
+#define BE32(x) be32toh(x)
+
+#else
+
+#include "WProgram.h"
+
+#define BE32(x) x
+
+#endif
+
+#undef RAMFSDEBUG
+
+File modSDfile;
+
+extern void*__end__;
+unsigned long *mbuf = (unsigned long*)&__end__+80000;
+
+RamFSFile::RamFSFile(){
+  
+}
+
+void *RamFSFile::zpuinomalloc(unsigned long size)
+{
+ void *ret = mbuf;
+ mbuf+=(size);
+ return ret;
+}
+
+void RamFSFile::setInit(boolean active)
+{
+//  initState = active;
+}
+void RamFSFile::init()
+{
+//  Serial.println("Running malloc.");
+//  moddata = (unsigned char *)zpuinomalloc(500000*sizeof(unsigned char));
+//  memset(moddata, 0, 500000*sizeof(unsigned char));    
+//  initState = true;
+}
+
+int RamFS_class::begin()
+{
+  return 0;
+}
+
+void RamFS_class::seek_if_needed(unsigned long address)
+{
+
+}
+
+unsigned RamFS_class::readByte(unsigned long address)
+{
+    return 0;
+
+}
+
+
+void RamFS_class::read(unsigned long address, void *target, unsigned long size)
+{
+
+}
+
+RamFSFile RamFS_class::open(SmallFSFile *file)
+{
+        //Serial.println("In RamFS.open");
+	return RamFSFile(file);
+}
+
+RamFSFile::RamFSFile(SmallFSFile *file)
+{
+        filesize = file->size();
+        file->seek(0x0, SEEK_SET);     
+        moddata = (unsigned char *)malloc(filesize*sizeof(unsigned char));
+        memset(moddata, 0, filesize*sizeof(unsigned char));
+        file->read(&moddata[0], filesize);   
+}
+
+RamFSFile RamFS_class::open(File *file)
+{
+	return RamFSFile(file);
+}
+
+RamFSFile::RamFSFile(File *file)
+{
+        unsigned long i = 0;
+        filesize = file->size();  
+        file->seek(0x0);         
+        moddata = (unsigned char *)malloc(filesize*sizeof(unsigned char));
+        memset(moddata, 0, filesize*sizeof(unsigned char));
+        //file->read(&moddata[0], filesize);   //TODO: Use this more efficient form when the SD library is fixed.      
+        while (file->available()) {
+          moddata[i] = file->read();
+          i++;
+        }        
+}
+
+int RamFSFile::read(void *buf, unsigned long s)
+{ 
+
+	if (seekpos==filesize)
+		return 0; /* EOF */
+
+	if (s + seekpos > filesize) {
+		s = filesize-seekpos;
+	}
+        memcpy(buf, moddata+seekpos, s);
+
+	seekpos+=s;
+	return s;  
+}
+
+
+void RamFSFile::seek(unsigned long pos, int whence)
+{
+	unsigned long newpos;
+
+	if (whence==SEEK_SET)
+		newpos = pos;
+	else if (whence==SEEK_CUR)
+		newpos = seekpos + pos;
+	else
+		newpos = filesize + pos;
+
+	if (newpos>filesize)
+		newpos=filesize;
+
+	if (newpos<0)
+		newpos=0;
+
+	seekpos=newpos;
+}
+
+RamFS_class RamFS;
+

libraries/ramFS/ramFS.h

@@ -0,0 +1,127 @@
+/*!
+ *  @file		ramFS.h
+ *  Project		RamFS Library
+ *	@brief		Allows SD or SmallFS files to be loaded into SDRAM.
+ *	Version		1.0
+ *  @author		Jack Gassett 
+ *	@date		11/10/12
+ *  License		GPL
+ */
+
+#ifndef __RAMFS_H__
+#define __RAMFS_H__
+
+#ifdef __linux__
+
+#else
+#include "zpuino.h"
+#endif
+
+#include <SD.h>
+#include "SmallFS.h"
+
+#ifndef SEEK_SET
+# define SEEK_SET   0
+# define SEEK_CUR  1
+# define SEEK_END  2
+#endif
+
+/**
+ * @brief RAMFS File Class
+ */
+class RamFSFile
+{
+public:
+        RamFSFile();
+	RamFSFile(File *file);
+        RamFSFile(SmallFSFile *file);
+        static void setInit(boolean active);
+	//RamFSFile(unsigned o,unsigned size): flashoffset(o),filesize(size),seekpos(0) {}
+	/**
+	 * @brief Check if file was successfuly opened.
+	 * @return true on success, false otherwise
+     */
+	//bool valid() { return flashoffset>=0;}//!=-1; }
+
+	/**
+	 * @brief Read a chunk of data from file.
+	 * @param buf The buffer where to store data
+	 * @param size The number of bytes to read from file.
+	 * @return The number of bytes read, 0 for EOF.
+	 */
+	int read(void *buf, unsigned long size);
+	/**
+	 * @brief Seek current file position
+	 * @param pos The required position
+	 * @param whence Where to perform seek. Either SEEK_SET, SEEK_CUR or SEEK_END
+	 */
+	void seek(unsigned long pos, int whence);
+	/**
+	 * @brief Get the file size.
+	 * @return The file size.
+     */
+	inline unsigned long size() const { return filesize; }
+	/**
+	 * @brief Read a chunk of data from file, using a callback function.
+	 * The function will be called for every byte read.
+	 * @param size The number of bytes to read from file.
+	 * @param callback The callback function to call
+	 * @param data The data parameter to pass to callback function.
+	 * @return The number of bytes read, 0 for EOF.
+	 */
+	
+	//int readCallback(int size, void (*callback)(unsigned char, void*), void *data);
+
+	/**
+	 * @brief Read a single byte
+	 */
+	unsigned readByte();
+        static void *zpuinomalloc(unsigned long size);
+
+private:
+        void init();
+	int flashoffset;
+	unsigned long filesize;
+	unsigned long seekpos;
+        unsigned char *moddata;
+        static boolean initState;
+};
+
+/**
+ * @brief Main filesystem class
+ */
+class RamFS_class {
+    friend class RamFSFile;
+public:
+	/**
+	 * @brief Initialize the RamFS filesystem
+	 * @return 0 on success, -1 otherwise
+	 */
+	int begin();
+
+protected:
+
+
+protected:
+	void read(unsigned long address, void *target, unsigned long size);
+	void seek(unsigned long address) { seek_if_needed(address); }
+	unsigned readByte(unsigned long address);
+public:
+	/**
+	 * @brief Open a file on the filesystem.
+	 * @param name The file name
+	 * @return A new RamFSFile object. You should call valid() to check
+	 * if file was successfully open.
+	 */
+	RamFSFile open(File *file);
+        RamFSFile open(SmallFSFile *file);
+
+private:
+	void seek_if_needed(unsigned long address);
+
+};
+
+extern RamFS_class RamFS;
+
+#endif
+