summaryrefslogtreecommitdiffstats
path: root/firmware/target/hosted/ypr0
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2012-01-19 07:59:28 +0100
committerThomas Martitz <kugel@rockbox.org>2012-01-21 18:39:19 +0100
commit5d13ecc4a809910a5ae763afea0048c29b3bee97 (patch)
treeb8dbe16c7fc876c62e919c547d82b60e3feddb6d /firmware/target/hosted/ypr0
parent954cd771fb2cca19ddf3f11f888931579470cc0c (diff)
downloadrockbox-5d13ecc4a809910a5ae763afea0048c29b3bee97.tar.gz
rockbox-5d13ecc4a809910a5ae763afea0048c29b3bee97.zip
android/ypr0: Merge fs-*.c to generic filesystem-unix.c.
Change-Id: I52e2c29346baf0d282243880477cd149311ce3d1
Diffstat (limited to 'firmware/target/hosted/ypr0')
-rw-r--r--firmware/target/hosted/ypr0/dir-target.h9
-rw-r--r--firmware/target/hosted/ypr0/fs-ypr0.c141
2 files changed, 1 insertions, 149 deletions
diff --git a/firmware/target/hosted/ypr0/dir-target.h b/firmware/target/hosted/ypr0/dir-target.h
index 48859526df..7df9554e92 100644
--- a/firmware/target/hosted/ypr0/dir-target.h
+++ b/firmware/target/hosted/ypr0/dir-target.h
@@ -35,16 +35,9 @@ extern int rmdir(const char* name);
#define mkdir_uncached _mkdir
#define rmdir_uncached rmdir
-#define dirent_ypr0 dirent
-#define DIR_ypr0 DIR
-#define opendir_ypr0 _opendir
-#define readdir_ypr0 _readdir
-#define closedir_ypr0 _closedir
-#define mkdir_ypr0 _mkdir
-#define rmdir_ypr0 rmdir
-
extern DIR* _opendir(const char* name);
extern int _mkdir(const char* name);
+extern int _rmdir(const char* name);
extern int _closedir(DIR* dir);
extern struct dirent *_readdir(DIR* dir);
extern void fat_size(unsigned long *size, unsigned long *free);
diff --git a/firmware/target/hosted/ypr0/fs-ypr0.c b/firmware/target/hosted/ypr0/fs-ypr0.c
deleted file mode 100644
index 7f49a5f91a..0000000000
--- a/firmware/target/hosted/ypr0/fs-ypr0.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2010 by Thomas Martitz
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#include <stdlib.h>
-#include <sys/stat.h> /* stat() */
-#include <stdio.h> /* snprintf */
-#include <string.h> /* size_t */
-#include <dirent.h>
-#include <time.h> /* localtime() */
-#include "system-target.h"
-#include "dir-target.h"
-#include "file.h"
-#include "dir.h"
-#include "rbpaths.h"
-
-
-long filesize(int fd)
-{
- struct stat buf;
-
- if (!fstat(fd, &buf))
- return buf.st_size;
- else
- return -1;
-}
-
-/* do we really need this in the app? */
-void fat_size(unsigned long* size, unsigned long* free)
-{
- *size = *free = 0;
-}
-
-#undef opendir
-#undef closedir
-#undef mkdir
-#undef readdir
-
-/* need to wrap around DIR* because we need to save the parent's
- * directory path in order to determine dirinfo */
-struct __dir {
- DIR *dir;
- char *path;
-};
-
-DIR* _opendir(const char *name)
-{
- char *buf = malloc(sizeof(struct __dir) + strlen(name)+1);
- if (!buf)
- return NULL;
-
- struct __dir *this = (struct __dir*)buf;
-
- this->path = buf+sizeof(struct __dir);
- /* definitely fits due to strlen() */
- strcpy(this->path, name);
-
- this->dir = opendir(name);
-
- if (!this->dir)
- {
- free(buf);
- return NULL;
- }
- return (DIR*)this;
-}
-
-int _mkdir(const char *name)
-{
- return mkdir(name, 0777);
-}
-
-int _closedir(DIR *dir)
-{
- struct __dir *this = (struct __dir*)dir;
- int ret = closedir(this->dir);
- free(this);
- return ret;
-}
-
-struct dirent* _readdir(DIR* dir)
-{
- struct __dir *d = (struct __dir*)dir;
- return readdir(d->dir);
-}
-
-struct dirinfo dir_get_info(DIR* _parent, struct dirent *dir)
-{
- struct __dir *parent = (struct __dir*)_parent;
- struct stat s;
- struct tm *tm = NULL;
- struct dirinfo ret;
- char path[MAX_PATH];
-
- snprintf(path, sizeof(path), "%s/%s", parent->path, dir->d_name);
- memset(&ret, 0, sizeof(ret));
-
- if (!stat(path, &s))
- {
- if (S_ISDIR(s.st_mode))
- {
- ret.attribute = ATTR_DIRECTORY;
- }
- ret.size = s.st_size;
- tm = localtime(&(s.st_mtime));
- }
-
- if (!lstat(path, &s) && S_ISLNK(s.st_mode))
- {
- ret.attribute |= ATTR_LINK;
- }
-
- if (tm)
- {
- ret.wrtdate = ((tm->tm_year - 80) << 9) |
- ((tm->tm_mon + 1) << 5) |
- tm->tm_mday;
- ret.wrttime = (tm->tm_hour << 11) |
- (tm->tm_min << 5) |
- (tm->tm_sec >> 1);
- }
-
- return ret;
-}