From da0622a5f1a2fc21d43c6a68b482ca18a4e20f19 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Tue, 18 Jun 2013 23:24:20 +0200 Subject: [PATCH] Uploaded newest testusbhostFAT code --- examples/testusbhostFAT/generic_storage | 2 +- examples/testusbhostFAT/testusbhostFAT.ino | 13 +++++-------- examples/testusbhostFAT/xmem2 | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) mode change 100644 => 100755 examples/testusbhostFAT/testusbhostFAT.ino diff --git a/examples/testusbhostFAT/generic_storage b/examples/testusbhostFAT/generic_storage index 071b65b9..e159c407 160000 --- a/examples/testusbhostFAT/generic_storage +++ b/examples/testusbhostFAT/generic_storage @@ -1 +1 @@ -Subproject commit 071b65b923b2656bb1e1b622de5272b4ed9a4996 +Subproject commit e159c407c60ca98d759db8bd6c388cb3f59b2fa8 diff --git a/examples/testusbhostFAT/testusbhostFAT.ino b/examples/testusbhostFAT/testusbhostFAT.ino old mode 100644 new mode 100755 index 1bcc1a7b..b7b792f9 --- a/examples/testusbhostFAT/testusbhostFAT.ino +++ b/examples/testusbhostFAT/testusbhostFAT.ino @@ -10,9 +10,7 @@ * */ -// Keep this at zero until enumeration is fixed. -// Set to 1 if you are fixing enumeration. -#define WANT_HUB_TEST 0 +#define WANT_HUB_TEST 1 #ifndef HAVE_XMEM // Set this to zero to disable xmem #define HAVE_XMEM 1 @@ -68,9 +66,9 @@ PCPartition *PT; static USBHub *Hubs[MAX_HUBS]; #endif -static PFAT *Fats[MAX_PARTS]; -static part_t parts[MAX_PARTS]; -static storage_t sto[MAX_PARTS]; +static PFAT *Fats[_VOLUMES]; +static part_t parts[_VOLUMES]; +static storage_t sto[_VOLUMES]; #define prescale1 ((1 << WGM12) | (1 << CS10)) #define prescale8 ((1 << WGM12) | (1 << CS11)) @@ -104,7 +102,7 @@ static int my_putc(char c, FILE *t) { } void setup() { - for (int i = 0; i < MAX_PARTS; i++) { + for (int i = 0; i < _VOLUMES; i++) { Fats[i] = NULL; } // Set this to higher values to enable more debug information @@ -400,7 +398,6 @@ void loop() { sto[i].private_data = &info[i]; info[i].lun = i; info[i].B = B; - info[i].volmap = 0; // TO-DO: keep track of > 1 sto[i].Read = *PRead; sto[i].Write = *PWrite; sto[i].Reads = *PReads; diff --git a/examples/testusbhostFAT/xmem2 b/examples/testusbhostFAT/xmem2 index 8bcf5f90..d4514528 160000 --- a/examples/testusbhostFAT/xmem2 +++ b/examples/testusbhostFAT/xmem2 @@ -1 +1 @@ -Subproject commit 8bcf5f90f8bd967378b6eeebd7fd943f125fbc18 +Subproject commit d4514528fa62ddbd4b583da9fdf9fb8191e4a52a