summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Hohensohn <hohensoh@rockbox.org>2004-10-01 19:19:09 +0000
committerJörg Hohensohn <hohensoh@rockbox.org>2004-10-01 19:19:09 +0000
commitb2c2738f09e9f3385616830bdab623c1d59b83b2 (patch)
tree776c4ed18df24e298cc29f299a349e7fd96d7203
parent65bee608f6c429fffced7ad86e291bccb12580e5 (diff)
downloadrockbox-b2c2738f09e9f3385616830bdab623c1d59b83b2.zip
rockbox-b2c2738f09e9f3385616830bdab623c1d59b83b2.tar.gz
rockbox-b2c2738f09e9f3385616830bdab623c1d59b83b2.tar.bz2
rockbox-b2c2738f09e9f3385616830bdab623c1d59b83b2.tar.xz
test code portable now
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5145 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/test/fat/ata-sim.c2
-rw-r--r--firmware/test/fat/main.c13
2 files changed, 8 insertions, 7 deletions
diff --git a/firmware/test/fat/ata-sim.c b/firmware/test/fat/ata-sim.c
index aac7fba..cc3eb15 100644
--- a/firmware/test/fat/ata-sim.c
+++ b/firmware/test/fat/ata-sim.c
@@ -56,7 +56,7 @@ int ata_init(char* filename)
if (!filename)
filename = "disk.img";
/* check disk size */
- file=fopen(filename,"r+");
+ file=fopen(filename,"rb+");
if(!file) {
fprintf(stderr, "read_disk() - Could not find \"%s\"\n",filename);
return -1;
diff --git a/firmware/test/fat/main.c b/firmware/test/fat/main.c
index fd43558..5607414 100644
--- a/firmware/test/fat/main.c
+++ b/firmware/test/fat/main.c
@@ -3,7 +3,6 @@
#include <string.h>
#include <stdarg.h>
#include <time.h>
-#include <sys/time.h>
#include "fat.h"
#include "debug.h"
#include "disk.h"
@@ -266,7 +265,7 @@ int dbg_wrtest(char* name)
void dbg_type(char* name)
{
const int size = SECTOR_SIZE*5;
- unsigned char buf[size+1];
+ unsigned char buf[SECTOR_SIZE*5+1];
int fd,rc;
fd = open(name,O_RDONLY);
@@ -658,10 +657,8 @@ int main(int argc, char *argv[])
{
int rc,i;
struct partinfo* pinfo;
- struct timeval tv;
- gettimeofday(&tv, NULL);
- srand(tv.tv_usec);
+ srand(clock());
if(ata_init("disk.img")) {
DEBUGF("*** Warning! The disk is uninitialized\n");
@@ -674,7 +671,11 @@ int main(int argc, char *argv[])
}
for ( i=0; i<4; i++ ) {
- if ( pinfo[i].type == PARTITION_TYPE_FAT32 ) {
+ if ( pinfo[i].type == PARTITION_TYPE_FAT32
+#ifdef HAVE_FAT16SUPPORT
+ || pinfo[i].type == PARTITION_TYPE_FAT16
+#endif
+ ) {
DEBUGF("*** Mounting at block %ld\n",pinfo[i].start);
rc = fat_mount(pinfo[i].start);
if(rc) {