Paul Griffith
Test program for BoB3 breakout board. Refer to my Notebook page for further details and contact info.
Revision 0:788d8ebe64b5, committed 2010-04-06
- Comitter:
- paulg
- Date:
- Tue Apr 06 17:08:41 2010 +0000
- Commit message:
Changed in this revision
diff -r 000000000000 -r 788d8ebe64b5 FATFileSystem.lib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/FATFileSystem.lib Tue Apr 06 17:08:41 2010 +0000 @@ -0,0 +1,1 @@ +http://mbed.org/users/mbed_unsupported/code/fatfilesystem/ \ No newline at end of file
diff -r 000000000000 -r 788d8ebe64b5 SDFileSystem.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SDFileSystem.cpp Tue Apr 06 17:08:41 2010 +0000
@@ -0,0 +1,441 @@
+/* mbed Microcontroller Library - SDFileSystem
+ * Copyright (c) 2008-2009, sford
+ */
+
+// VERY DRAFT CODE! Needs serious rework/refactoring
+
+/* Introduction
+ * ------------
+ * SD and MMC cards support a number of interfaces, but common to them all
+ * is one based on SPI. This is the one I'm implmenting because it means
+ * it is much more portable even though not so performant, and we already
+ * have the mbed SPI Interface!
+ *
+ * The main reference I'm using is Chapter 7, "SPI Mode" of:
+ * http://www.sdcard.org/developers/tech/sdcard/pls/Simplified_Physical_Layer_Spec.pdf
+ *
+ * SPI Startup
+ * -----------
+ * The SD card powers up in SD mode. The SPI interface mode is selected by
+ * asserting CS low and sending the reset command (CMD0). The card will
+ * respond with a (R1) response.
+ *
+ * CMD8 is optionally sent to determine the voltage range supported, and
+ * indirectly determine whether it is a version 1.x SD/non-SD card or
+ * version 2.x. I'll just ignore this for now.
+ *
+ * ACMD41 is repeatedly issued to initialise the card, until "in idle"
+ * (bit 0) of the R1 response goes to '0', indicating it is initialised.
+ *
+ * You should also indicate whether the host supports High Capicity cards,
+ * and check whether the card is high capacity - i'll also ignore this
+ *
+ * SPI Protocol
+ * ------------
+ * The SD SPI protocol is based on transactions made up of 8-bit words, with
+ * the host starting every bus transaction by asserting the CS signal low. The
+ * card always responds to commands, data blocks and errors.
+ *
+ * The protocol supports a CRC, but by default it is off (except for the
+ * first reset CMD0, where the CRC can just be pre-calculated, and CMD8)
+ * I'll leave the CRC off I think!
+ *
+ * Standard capacity cards have variable data block sizes, whereas High
+ * Capacity cards fix the size of data block to 512 bytes. I'll therefore
+ * just always use the Standard Capacity cards with a block size of 512 bytes.
+ * This is set with CMD16.
+ *
+ * You can read and write single blocks (CMD17, CMD25) or multiple blocks
+ * (CMD18, CMD25). For simplicity, I'll just use single block accesses. When
+ * the card gets a read command, it responds with a response token, and then
+ * a data token or an error.
+ *
+ * SPI Command Format
+ * ------------------
+ * Commands are 6-bytes long, containing the command, 32-bit argument, and CRC.
+ *
+ * +---------------+------------+------------+-----------+----------+--------------+
+ * | 01 | cmd[5:0] | arg[31:24] | arg[23:16] | arg[15:8] | arg[7:0] | crc[6:0] | 1 |
+ * +---------------+------------+------------+-----------+----------+--------------+
+ *
+ * As I'm not using CRC, I can fix that byte to what is needed for CMD0 (0x95)
+ *
+ * All Application Specific commands shall be preceded with APP_CMD (CMD55).
+ *
+ * SPI Response Format
+ * -------------------
+ * The main response format (R1) is a status byte (normally zero). Key flags:
+ * idle - 1 if the card is in an idle state/initialising
+ * cmd - 1 if an illegal command code was detected
+ *
+ * +-------------------------------------------------+
+ * R1 | 0 | arg | addr | seq | crc | cmd | erase | idle |
+ * +-------------------------------------------------+
+ *
+ * R1b is the same, except it is followed by a busy signal (zeros) until
+ * the first non-zero byte when it is ready again.
+ *
+ * Data Response Token
+ * -------------------
+ * Every data block written to the card is acknowledged by a byte
+ * response token
+ *
+ * +----------------------+
+ * | xxx | 0 | status | 1 |
+ * +----------------------+
+ * 010 - OK!
+ * 101 - CRC Error
+ * 110 - Write Error
+ *
+ * Single Block Read and Write
+ * ---------------------------
+ *
+ * Block transfers have a byte header, followed by the data, followed
+ * by a 16-bit CRC. In our case, the data will always be 512 bytes.
+ *
+ * +------+---------+---------+- - - -+---------+-----------+----------+
+ * | 0xFE | data[0] | data[1] | | data[n] | crc[15:8] | crc[7:0] |
+ * +------+---------+---------+- - - -+---------+-----------+----------+
+ */
+
+#include "SDFileSystem.h"
+
+#define SD_COMMAND_TIMEOUT 5000
+
+SDFileSystem::SDFileSystem(PinName mosi, PinName miso, PinName sclk, PinName cs, const char* name) :
+ FATFileSystem(name), _spi(mosi, miso, sclk), _cs(cs) {
+ _cs = 1;
+}
+
+#define R1_IDLE_STATE (1 << 0)
+#define R1_ERASE_RESET (1 << 1)
+#define R1_ILLEGAL_COMMAND (1 << 2)
+#define R1_COM_CRC_ERROR (1 << 3)
+#define R1_ERASE_SEQUENCE_ERROR (1 << 4)
+#define R1_ADDRESS_ERROR (1 << 5)
+#define R1_PARAMETER_ERROR (1 << 6)
+
+// Types
+// - v1.x Standard Capacity
+// - v2.x Standard Capacity
+// - v2.x High Capacity
+// - Not recognised as an SD Card
+
+#define SDCARD_FAIL 0
+#define SDCARD_V1 1
+#define SDCARD_V2 2
+#define SDCARD_V2HC 3
+
+int SDFileSystem::initialise_card() {
+ // Set to 100kHz for initialisation, and clock card with cs = 1
+ _spi.frequency(100000);
+ _cs = 1;
+ for(int i=0; i<16; i++) {
+ _spi.write(0xFF);
+ }
+
+ // send CMD0, should return with all zeros except IDLE STATE set (bit 0)
+ if(_cmd(0, 0) != R1_IDLE_STATE) {
+ fprintf(stderr, "No disk, or could not put SD card in to SPI idle state\n");
+ return SDCARD_FAIL;
+ }
+
+ // send CMD8 to determine whther it is ver 2.x
+ int r = _cmd8();
+ if(r == R1_IDLE_STATE) {
+ return initialise_card_v2();
+ } else if(r == (R1_IDLE_STATE | R1_ILLEGAL_COMMAND)) {
+ return initialise_card_v1();
+ } else {
+ fprintf(stderr, "Not in idle state after sending CMD8 (not an SD card?)\n");
+ return SDCARD_FAIL;
+ }
+}
+
+int SDFileSystem::initialise_card_v1() {
+ for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
+ _cmd(55, 0);
+ if(_cmd(41, 0) == 0) {
+ return SDCARD_V1;
+ }
+ }
+
+ fprintf(stderr, "Timeout waiting for v1.x card\n");
+ return SDCARD_FAIL;
+}
+
+int SDFileSystem::initialise_card_v2() {
+
+ for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
+ _cmd(55, 0);
+ if(_cmd(41, 0) == 0) {
+ _cmd58();
+ return SDCARD_V2;
+ }
+ }
+
+ fprintf(stderr, "Timeout waiting for v2.x card\n");
+ return SDCARD_FAIL;
+}
+
+int SDFileSystem::disk_initialize() {
+
+ int i = initialise_card();
+// printf("init card = %d\n", i);
+// printf("OK\n");
+
+ _sectors = _sd_sectors();
+
+ // Set block length to 512 (CMD16)
+ if(_cmd(16, 512) != 0) {
+ fprintf(stderr, "Set 512-byte block timed out\n");
+ return 1;
+ }
+
+ _spi.frequency(1000000); // Set to 1MHz for data transfer
+ return 0;
+}
+
+int SDFileSystem::disk_write(const char *buffer, int block_number) {
+ // set write address for single block (CMD24)
+ if(_cmd(24, block_number * 512) != 0) {
+ return 1;
+ }
+
+ // send the data block
+ _write(buffer, 512);
+ return 0;
+}
+
+int SDFileSystem::disk_read(char *buffer, int block_number) {
+ // set read address for single block (CMD17)
+ if(_cmd(17, block_number * 512) != 0) {
+ return 1;
+ }
+
+ // receive the data
+ _read(buffer, 512);
+ return 0;
+}
+
+int SDFileSystem::disk_status() { return 0; }
+int SDFileSystem::disk_sync() { return 0; }
+int SDFileSystem::disk_sectors() { return _sectors; }
+
+// PRIVATE FUNCTIONS
+
+int SDFileSystem::_cmd(int cmd, int arg) {
+ _cs = 0;
+
+ // send a command
+ _spi.write(0x40 | cmd);
+ _spi.write(arg >> 24);
+ _spi.write(arg >> 16);
+ _spi.write(arg >> 8);
+ _spi.write(arg >> 0);
+ _spi.write(0x95);
+
+ // wait for the repsonse (response[7] == 0)
+ for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
+ int response = _spi.write(0xFF);
+ if(!(response & 0x80)) {
+ _cs = 1;
+ _spi.write(0xFF);
+ return response;
+ }
+ }
+ _cs = 1;
+ _spi.write(0xFF);
+ return -1; // timeout
+}
+int SDFileSystem::_cmdx(int cmd, int arg) {
+ _cs = 0;
+
+ // send a command
+ _spi.write(0x40 | cmd);
+ _spi.write(arg >> 24);
+ _spi.write(arg >> 16);
+ _spi.write(arg >> 8);
+ _spi.write(arg >> 0);
+ _spi.write(0x95);
+
+ // wait for the repsonse (response[7] == 0)
+ for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
+ int response = _spi.write(0xFF);
+ if(!(response & 0x80)) {
+ return response;
+ }
+ }
+ _cs = 1;
+ _spi.write(0xFF);
+ return -1; // timeout
+}
+
+
+int SDFileSystem::_cmd58() {
+ _cs = 0;
+ int arg = 0;
+
+ // send a command
+ _spi.write(0x40 | 58);
+ _spi.write(arg >> 24);
+ _spi.write(arg >> 16);
+ _spi.write(arg >> 8);
+ _spi.write(arg >> 0);
+ _spi.write(0x95);
+
+ // wait for the repsonse (response[7] == 0)
+ for(int i=0; i<SD_COMMAND_TIMEOUT; i++) {
+ int response = _spi.write(0xFF);
+ if(!(response & 0x80)) {
+ int ocr = _spi.write(0xFF) << 24;
+ ocr |= _spi.write(0xFF) << 16;
+ ocr |= _spi.write(0xFF) << 8;
+ ocr |= _spi.write(0xFF) << 0;
+// printf("OCR = 0x%08X\n", ocr);
+ _cs = 1;
+ _spi.write(0xFF);
+ return response;
+ }
+ }
+ _cs = 1;
+ _spi.write(0xFF);
+ return -1; // timeout
+}
+
+int SDFileSystem::_cmd8() {
+ _cs = 0;
+
+ // send a command
+ _spi.write(0x40 | 8); // CMD8
+ _spi.write(0x00); // reserved
+ _spi.write(0x00); // reserved
+ _spi.write(0x01); // 3.3v
+ _spi.write(0xAA); // check pattern
+ _spi.write(0x87); // crc
+
+ // wait for the repsonse (response[7] == 0)
+ for(int i=0; i<SD_COMMAND_TIMEOUT * 1000; i++) {
+ char response[5];
+ response[0] = _spi.write(0xFF);
+ if(!(response[0] & 0x80)) {
+ for(int j=1; j<5; j++) {
+ response[i] = _spi.write(0xFF);
+ }
+ _cs = 1;
+ _spi.write(0xFF);
+ return response[0];
+ }
+ }
+ _cs = 1;
+ _spi.write(0xFF);
+ return -1; // timeout
+}
+
+int SDFileSystem::_read(char *buffer, int length) {
+ _cs = 0;
+
+ // read until start byte (0xFF)
+ while(_spi.write(0xFF) != 0xFE);
+
+ // read data
+ for(int i=0; i<length; i++) {
+ buffer[i] = _spi.write(0xFF);
+ }
+ _spi.write(0xFF); // checksum
+ _spi.write(0xFF);
+
+ _cs = 1;
+ _spi.write(0xFF);
+ return 0;
+}
+
+int SDFileSystem::_write(const char *buffer, int length) {
+ _cs = 0;
+
+ // indicate start of block
+ _spi.write(0xFE);
+
+ // write the data
+ for(int i=0; i<length; i++) {
+ _spi.write(buffer[i]);
+ }
+
+ // write the checksum
+ _spi.write(0xFF);
+ _spi.write(0xFF);
+
+ // check the repsonse token
+ if((_spi.write(0xFF) & 0x1F) != 0x05) {
+ _cs = 1;
+ _spi.write(0xFF);
+ return 1;
+ }
+
+ // wait for write to finish
+ while(_spi.write(0xFF) == 0);
+
+ _cs = 1;
+ _spi.write(0xFF);
+ return 0;
+}
+
+static int ext_bits(char *data, int msb, int lsb) {
+ int bits = 0;
+ int size = 1 + msb - lsb;
+ for(int i=0; i<size; i++) {
+ int position = lsb + i;
+ int byte = 15 - (position >> 3);
+ int bit = position & 0x7;
+ int value = (data[byte] >> bit) & 1;
+ bits |= value << i;
+ }
+ return bits;
+}
+
+int SDFileSystem::_sd_sectors() {
+
+ // CMD9, Response R2 (R1 byte + 16-byte block read)
+ if(_cmdx(9, 0) != 0) {
+ fprintf(stderr, "Didn't get a response from the disk\n");
+ return 0;
+ }
+
+ char csd[16];
+ if(_read(csd, 16) != 0) {
+ fprintf(stderr, "Couldn't read csd response from disk\n");
+ return 0;
+ }
+
+ // csd_structure : csd[127:126]
+ // c_size : csd[73:62]
+ // c_size_mult : csd[49:47]
+ // read_bl_len : csd[83:80] - the *maximum* read block length
+
+ int csd_structure = ext_bits(csd, 127, 126);
+ int c_size = ext_bits(csd, 73, 62);
+ int c_size_mult = ext_bits(csd, 49, 47);
+ int read_bl_len = ext_bits(csd, 83, 80);
+
+// printf("CSD_STRUCT = %d\n", csd_structure);
+
+ if(csd_structure != 0) {
+ fprintf(stderr, "This disk tastes funny! I only know about type 0 CSD structures\n");
+ return 0;
+ }
+
+ // memory capacity = BLOCKNR * BLOCK_LEN
+ // where
+ // BLOCKNR = (C_SIZE+1) * MULT
+ // MULT = 2^(C_SIZE_MULT+2) (C_SIZE_MULT < 8)
+ // BLOCK_LEN = 2^READ_BL_LEN, (READ_BL_LEN < 12)
+
+ int block_len = 1 << read_bl_len;
+ int mult = 1 << (c_size_mult + 2);
+ int blocknr = (c_size + 1) * mult;
+ int capacity = blocknr * block_len;
+
+ int blocks = capacity / 512;
+
+ return blocks;
+}
diff -r 000000000000 -r 788d8ebe64b5 SDFileSystem.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SDFileSystem.h Tue Apr 06 17:08:41 2010 +0000
@@ -0,0 +1,66 @@
+/* mbed Microcontroller Library - SDFileSystem
+ * Copyright (c) 2008-2009, sford
+ */
+
+// VERY DRAFT CODE!!!
+
+#ifndef SDFILESYSTEM_H
+#define SDFILESYSTEM_H
+
+#include "mbed.h"
+#include "FATFileSystem.h"
+
+/* Class: SDFileSystem
+ * Access the filesystem on an SD Card using SPI
+ *
+ * Example:
+ * > SDFileSystem sd(p5, p6, p7, p12, "sd");
+ * >
+ * > int main() {
+ * > FILE *fp = fopen("/sd/myfile.txt", "w");
+ * > fprintf(fp, "Hello World!\n");
+ * > fclose(fp);
+ * > }
+ */
+class SDFileSystem : public FATFileSystem {
+public:
+
+ /* Constructor: SDFileSystem
+ * Create the File System for accessing an SD Card using SPI
+ *
+ * Variables:
+ * mosi - SPI mosi pin connected to SD Card
+ * miso - SPI miso pin conencted to SD Card
+ * sclk - SPI sclk pin connected to SD Card
+ * cs - DigitalOut pin used as SD Card chip select
+ * name - The name used to access the filesystem
+ */
+ SDFileSystem(PinName mosi, PinName miso, PinName sclk, PinName cs, const char* name);
+ virtual int disk_initialize();
+ virtual int disk_write(const char *buffer, int block_number);
+ virtual int disk_read(char *buffer, int block_number);
+ virtual int disk_status();
+ virtual int disk_sync();
+ virtual int disk_sectors();
+
+protected:
+
+ int _cmd(int cmd, int arg);
+ int _cmdx(int cmd, int arg);
+ int _cmd8();
+ int _cmd58();
+ int initialise_card();
+ int initialise_card_v1();
+ int initialise_card_v2();
+
+
+ int _read(char *buffer, int length);
+ int _write(const char *buffer, int length);
+ int _sd_sectors();
+ int _sectors;
+
+ SPI _spi;
+ DigitalOut _cs;
+};
+
+#endif
diff -r 000000000000 -r 788d8ebe64b5 lwip.lib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lwip.lib Tue Apr 06 17:08:41 2010 +0000 @@ -0,0 +1,1 @@ +http://mbed.org/users/mbed_unsupported/code/lwip/ \ No newline at end of file
diff -r 000000000000 -r 788d8ebe64b5 main.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/main.cpp Tue Apr 06 17:08:41 2010 +0000
@@ -0,0 +1,444 @@
+/* Test program for BoB3 breakout board
+ * Paul Griffith
+ * Last edit: 29 Jan 2010
+ */
+
+#include "mbed.h"
+#include "SDFileSystem.h"
+#include "lwip/opt.h"
+#include "lwip/stats.h"
+#include "lwip/sys.h"
+#include "lwip/pbuf.h"
+#include "lwip/udp.h"
+#include "lwip/tcp.h"
+#include "lwip/dns.h"
+#include "lwip/dhcp.h"
+#include "lwip/init.h"
+#include "lwip/netif.h"
+#include "netif/etharp.h"
+#include "netif/loopif.h"
+#include "device.h"
+
+
+void printhelps(void);
+void listdir(void);
+void printfile(char *);
+void bad_args(void);
+int exist(char *);
+int eth_test(void);
+
+
+Serial pc(USBTX, USBRX);
+SDFileSystem sd(p5, p6, p7, p8, "sd");
+DigitalOut led1(p25), led2(p26), led3(p27), led4(p28), led5(p29), led6(p30);
+
+int main() {
+ char buf[120], *cp;
+ char arg1[50], arg2[50], arg3[50], filename[20];
+ int argc, cnt = 0, i, j, k, l;
+ FILE *fp;
+ time_t seconds;
+ struct tm t;
+
+
+ printf("BoB3 test program\n");
+ printf("Type ? for help\n");
+
+ while (1) {
+ printf("> ");
+ cp = buf;
+ while ( (*cp++ = putchar(getchar())) != '\r') ; //get a line of input
+ *cp = '\0'; //terminate buffer
+ printf("\n");
+ argc = sscanf(buf, "%s%s%s", arg1, arg2, arg3); //extract command and arguments
+ if (argc < 1)
+ continue;
+ switch (arg1[0]) {
+
+ case 'c': //create file on uSD card
+ if (argc != 2) {
+ bad_args();
+ break;
+ }
+ sprintf(filename, "/sd/%s", arg2);
+ if (exist(filename) == 1) {
+ printf("File already exists\n");
+ break;
+ }
+ fp = fopen(filename, "w");
+ if (fp == 0) {
+ printf("Unable to create file\n");
+ } else {
+ printf("File created\n");
+ seconds = time(NULL);
+ fprintf(fp, "Hello world, the time is %s\n", ctime(&seconds));
+ fclose(fp);
+ }
+ break;
+
+ case 'd': //delete file on uSD card
+ if (argc != 2) {
+ bad_args();
+ break;
+ }
+ sprintf(filename, "/sd/%s", arg2);
+ if (exist(filename) == 0)
+ printf("File does not exist\n");
+ else {
+ remove(filename);
+ printf("File deleted\n");
+ }
+ break;
+
+ case 'e': //test Ethernet status LEDS
+ if (argc == 1)
+ i = 0;
+ else
+ sscanf(arg2, "%d", &i);
+ switch (i) {
+ case 0:
+ led1 = 1;
+ wait(1.0);
+ led1 = 0;
+ wait(1.0);
+ led2 = 1;
+ wait(1.0);
+ led2 = 0;
+ break;
+
+ case 1:
+ led3 = 1;
+ wait(1.0);
+ led3 = 0;
+ wait(1.0);
+ led4 = 1;
+ wait(1.0);
+ led4 = 0;
+ break;
+
+ case 2:
+ led5 = 1;
+ wait(1.0);
+ led5 = 0;
+ wait(1.0);
+ led6 = 1;
+ wait(1.0);
+ led6 = 0;
+ break;
+ }
+ break;
+
+ case 'E': //run Ethernet test
+ printf("Reset mbed to exit Ethernet test\n");
+ i = eth_test();
+ printf("Ethernet test returned %d\n", i);
+ break;
+
+ case 'l': //list uSD card directory
+ listdir();
+ break;
+
+ case 'p': //print uSD card file
+ if (argc != 2) {
+ bad_args();
+ break;
+ }
+ sprintf(filename, "/sd/%s", arg2);
+ if (exist(filename) == 0)
+ printf("File does not exist\n");
+ else
+ printfile(filename);
+ break;
+
+ case 'q': //quit
+ exit(1);
+ break;
+
+ case 't': //print current time and date
+ seconds = time(NULL);
+ printf("Current time = %s\n", ctime(&seconds));
+ break;
+
+ case 'T': //set time and date
+ sscanf(buf, "%c %d %d %d %d %d", &i, &t.tm_hour, &t.tm_min, &t.tm_mday,
+ &t.tm_mon, &t.tm_year);
+ // adjust for tm structure required values
+ t.tm_year = t.tm_year - 1900;
+ t.tm_mon = t.tm_mon - 1;
+ t.tm_sec = 0;
+// printf("tm = %d %d %d %d %d %d %d\n", t.tm_hour, t.tm_min, t.tm_sec, t.tm_mday, t.tm_mon, t.tm_year);
+ // set the time
+ set_time(mktime(&t));
+ break;
+
+ case 'U': //run USB test
+ printf("Any ideas folks?\n");
+ break;
+
+ case '?': //print help
+ printhelps();
+ break;
+
+ default:
+ printf("?? Unknown command\n");
+ break;
+ }
+ }
+}
+
+//Command functions
+
+void printhelps(void) {
+ printf("Command summary:\n");
+ printf("c filename create a file on uSD card\n");
+ printf("d filename delete a file on uSD card\n");
+ printf("e pins test Ethernet status LEDs (pins = 0-2)\n");
+ printf("E run Ethernet test (reset mbed to exit)\n");
+ printf("l list directory of uSD card\n");
+ printf("p filename print file on uSD card to stdout\n");
+ printf("q quit\n");
+ printf("t print current time and date\n");
+ printf("T h m d m y set RTC time and date\n");
+ printf("U run USB device test\n");
+ printf("? print help\n");
+}
+
+void listdir(void) {
+ DIR *d;
+ struct dirent *p;
+
+ d = opendir("/sd");
+ if (d != NULL) {
+ while ((p = readdir(d)) != NULL) {
+ printf(" - %s\n", p->d_name);
+ }
+ } else {
+ printf("Could not open directory!\n");
+ }
+ closedir(d);
+}
+
+void printfile(char *name) {
+ char buf[80], *cp;
+ FILE *fp;
+
+ fp = fopen(name, "r");
+ while (1) {
+ cp = fgets(buf, sizeof(buf), fp);
+ if (cp == NULL)
+ break;
+ if ( (cp = strchr(buf, '\n')) )
+ *cp = '\0'; //trim trailing \n because
+ puts(buf); //puts will convert terminator to \n
+ }
+ fclose(fp);
+}
+
+//Support functions
+
+void bad_args(void) {
+ printf("?? Bad arguments\n");
+}
+
+int exist(char *name) {
+ FILE *fp;
+
+ fp = fopen(name, "r");
+ if (fp != NULL)
+ fclose(fp);
+ return ((fp == NULL) ? 0 : 1);
+}
+
+
+//Ethernet test stuff (based on Michael Wei's Ethernet Tester program)
+
+Ethernet ethernet;
+DigitalOut ledLink(p25);
+DigitalOut ledSpeed(p26);
+DigitalOut ledStage0(LED1);
+DigitalOut ledStage1(LED2);
+DigitalOut ledStage2(LED3);
+DigitalOut ledTCP80(LED4);
+
+DigitalIn phyLink(P1_25);
+DigitalIn phySpeed(P1_26);
+
+volatile char stage = 0;
+
+Ticker stage_blinker;
+
+struct netif netif_data;
+
+const char testPage[] = "HTTP/1.1 200 OK\r\n"
+ "Content-Type: text/html\r\n"
+ "Connection: Close\r\n\r\n"
+ "<html>"
+ "<head>"
+ "<title>mbed test page</title>"
+ "<style type='text/css'>"
+ "body{font-family:'Arial, sans-serif', sans-serif;font-size:.8em;background-color:#fff;}"
+ "</style>"
+ "</head>"
+ "<body>%s</body></html>\r\n\r\n";
+
+char buffer[1024];
+char temp[1024];
+
+err_t recv_callback(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) {
+ struct netif *netif = &netif_data;
+ ledTCP80 = true;
+ printf("TCP callback from %d.%d.%d.%d\r\n", ip4_addr1(&(pcb->remote_ip)),ip4_addr2(&(pcb->remote_ip)),ip4_addr3(&(pcb->remote_ip)),ip4_addr4(&(pcb->remote_ip)));
+ char *data;
+ /* Check if status is ok and data is arrived. */
+ if (err == ERR_OK && p != NULL) {
+ /* Inform TCP that we have taken the data. */
+ tcp_recved(pcb, p->tot_len);
+ data = static_cast<char *>(p->payload);
+ /* If the data is a GET request we can handle it. */
+ if (strncmp(data, "GET ", 4) == 0) {
+ printf("Handling GET request...\r\n");
+ printf("Request:\r\n%s\r\n", data);
+
+ //generate the test page
+ time_t seconds = time(NULL);
+ sprintf(temp, "<h1>Congratulations!</h1>If you can see this page, your mbed is working properly."
+ "<h2>mbed Configuration</h2>"
+ "mbed RTC time:%s<br/>"
+ "mbed HW address: %02x:%02x:%02x:%02x:%02x:%02x<br/>"
+ "mbed IP Address: %s<br/>",
+ ctime(&seconds),
+ (char*) netif->hwaddr[0],
+ (char*) netif->hwaddr[1],
+ (char*) netif->hwaddr[2],
+ (char*) netif->hwaddr[3],
+ (char*) netif->hwaddr[4],
+ (char*) netif->hwaddr[5],
+ inet_ntoa(*(struct in_addr*)&(netif->ip_addr))
+ );
+ sprintf(buffer, testPage, temp);
+ if (tcp_write(pcb, (void *)buffer, strlen(buffer), 1) == ERR_OK) {
+ tcp_output(pcb);
+ printf("Closing connection...\r\n");
+ tcp_close(pcb);
+ }
+ }
+ else
+ {
+ printf("Non GET request...\r\nRequest:\r\n%s\r\n", data);
+ }
+
+ pbuf_free(p);
+ }
+
+ else {
+ /* No data arrived */
+ /* That means the client closes the connection and sent us a packet with FIN flag set to 1. */
+ /* We have to cleanup and destroy out TCPConnection. */
+ printf("Connection closed by client.\r\n");
+ pbuf_free(p);
+ }
+ /* Don't panic! Everything is fine. */
+ ledTCP80 = false;
+ return ERR_OK;
+}
+/* Accept an incomming call on the registered port */
+err_t accept_callback(void *arg, struct tcp_pcb *npcb, err_t err) {
+ LWIP_UNUSED_ARG(arg);
+ /* Subscribe a receive callback function */
+ tcp_recv(npcb, &recv_callback);
+ /* Don't panic! Everything is fine. */
+ return ERR_OK;
+}
+
+void stageblinker()
+{
+ switch (stage)
+ {
+ case 0:
+ ledStage0 = !ledStage0;
+ ledStage1 = false;
+ ledStage2 = false;
+ break;
+ case 1:
+ ledStage0 = true;
+ ledStage1 = !ledStage1;
+ ledStage2 = false;
+ break;
+ case 2:
+ ledStage0 = true;
+ ledStage1 = true;
+ ledStage2 = true;
+ stage_blinker.detach();
+ break;
+ }
+}
+
+int eth_test() {
+ printf("mBed Ethernet Tester 1.0\r\nStarting Up...\r\n");
+ stage = 0;
+ struct netif *netif = &netif_data;
+ struct ip_addr ipaddr;
+ struct ip_addr netmask;
+ struct ip_addr gateway;
+ Ticker tickFast, tickSlow, tickARP, eth_tick, dns_tick, dhcp_coarse, dhcp_fine;
+ stage_blinker.attach_us(&stageblinker, 1000*500);
+
+ char *hostname = "my-mbed";
+
+ printf("Configuring device for DHCP...\r\n");
+ /* Start Network with DHCP */
+ IP4_ADDR(&netmask, 255,255,255,255);
+ IP4_ADDR(&gateway, 0,0,0,0);
+ IP4_ADDR(&ipaddr, 0,0,0,0);
+ /* Initialise after configuration */
+ lwip_init();
+ netif->hwaddr_len = ETHARP_HWADDR_LEN;
+ device_address((char *)netif->hwaddr);
+ netif = netif_add(netif, &ipaddr, &netmask, &gateway, NULL, device_init, ip_input);
+ netif->hostname = hostname;
+ netif_set_default(netif);
+ dhcp_start(netif); // <-- Use DHCP
+
+ /* Initialise all needed timers */
+ tickARP.attach_us( ðarp_tmr, ARP_TMR_INTERVAL * 1000);
+ tickFast.attach_us(&tcp_fasttmr, TCP_FAST_INTERVAL * 1000);
+ tickSlow.attach_us(&tcp_slowtmr, TCP_SLOW_INTERVAL * 1000);
+ dns_tick.attach_us(&dns_tmr, DNS_TMR_INTERVAL * 1000);
+ dhcp_coarse.attach_us(&dhcp_coarse_tmr, DHCP_COARSE_TIMER_MSECS * 1000);
+ dhcp_fine.attach_us(&dhcp_fine_tmr, DHCP_FINE_TIMER_MSECS * 1000);
+ stage = 1;
+ while (!netif_is_up(netif)) {
+ ledLink = ethernet.link();
+ ledSpeed = !phySpeed;
+ device_poll();
+ }
+
+/*
+ while (!(netif->dhcp->state == DHCP_BOUND || netif->dhcp->state == DHCP_PERMANENT))
+ {
+ ledLink = ethernet.link();
+ device_poll();
+ //printf("Waiting for DHCP response, state = %d\r\n", netif->dhcp->state);
+ //wait_ms(100);
+ }
+ */
+ stage = 2;
+ printf("Interface is up, local IP is %s\r\n",
+ inet_ntoa(*(struct in_addr*)&(netif->ip_addr)));
+
+ printf("Starting Web Server...\r\n");
+
+ /* Bind a function to a tcp port */
+ struct tcp_pcb *pcb = tcp_new();
+ if (tcp_bind(pcb, IP_ADDR_ANY, 80) == ERR_OK) {
+ pcb = tcp_listen(pcb);
+ tcp_accept(pcb, &accept_callback);
+ }
+
+ printf("Waiting for connection...\r\n");
+ while(1) {
+ device_poll();
+ ledLink = ethernet.link();
+ ledSpeed = !phySpeed;
+ }
+}
diff -r 000000000000 -r 788d8ebe64b5 mbed.bld --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mbed.bld Tue Apr 06 17:08:41 2010 +0000 @@ -0,0 +1,1 @@ +http://mbed.org/users/mbed_official/code/mbed/builds/49a220cc26e0