Revision 19:610a71236b6e, committed 2012-12-23

Comitter:

TickTock

Date:

Sun Dec 23 22:57:52 2012 +0000

Parent:

18:a4cf0547bfc2

Child:

20:153800633e28

Commit message:

works;

Changed in this revision

--- a/FatFileSystem/FATDirHandle.h	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/* Copyright 2008 ARM Limited. All rights reserved. */
-
-#ifndef MBED_FATDIRHANDLE_H
-#define MBED_FATDIRHANDLE_H
-
-#include "DirHandle.h"
-#include "ff.h"
-
-namespace mbed {
-
-class FATDirHandle : public DirHandle {
-
- public:
-    FATDirHandle(const FATFS_DIR &the_dir);
-    virtual int closedir();
-    virtual struct dirent *readdir();
-    virtual void rewinddir();
-    virtual off_t telldir();
-    virtual void seekdir(off_t location);
-
- private:
-    FATFS_DIR dir;
-    struct dirent cur_entry;
-
-};
-
-}
-
-#endif

--- a/FatFileSystem/FATFileHandle.h	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/* mbed Microcontroller Library - FATFileHandle
- * Copyright (c) 2008, sford
- */
-
-#ifndef MBED_FATFILEHANDLE_H
-#define MBED_FATFILEHANDLE_H
-
-#include "FileHandle.h"
-#include "ff.h"
-
-namespace mbed {
-
-class FATFileHandle : public FileHandle {
-public:
-
-    FATFileHandle(FIL fh);
-    virtual int close();
-    virtual ssize_t write(const void* buffer, size_t length);
-    virtual ssize_t read(void* buffer, size_t length);
-    virtual int isatty();
-    virtual off_t lseek(off_t position, int whence);
-    virtual int fsync();
-    virtual off_t flen();
-
-protected:
-
-    FIL _fh;
-
-};
-
-}
-
-#endif

--- a/FatFileSystem/FATFileSystem.h	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/* mbed Microcontroller Library - FATFileSystem
- * Copyright (c) 2008, sford
- */
-
-/* Library: FATFileSystem.h
- * A library of stuff to make a fat filesystem on top of a block device
- */
-
-#ifndef MBED_FATFILESYSTEM_H
-#define MBED_FATFILESYSTEM_H
-
-#ifndef FFSDEBUG_ENABLED
-#define FFSDEBUG_ENABLED 0
-#endif
-
-#if FFSDEBUG_ENABLED
-#define FFSDEBUG(FMT, ...) printf(FMT, ##__VA_ARGS__)
-#else
-#define FFSDEBUG(FMT, ...)
-#endif
-
-#include "FileSystemLike.h"
-#include "FileHandle.h"
-#include "ff.h"
-#include "diskio.h"
-
-namespace mbed {
-/* Class: FATFileSystem
- * The class itself
- */
-class FATFileSystem : public FileSystemLike {
-public:
-
-    FATFileSystem(const char* n);
-    virtual ~FATFileSystem();
-    
-    /* Function: open
-       * open a file on the filesystem. never called directly
-       */
-    virtual FileHandle *open(const char* name, int flags);
-    virtual int remove(const char *filename);
-    virtual int format();
-        virtual DirHandle *opendir(const char *name);
-        virtual int mkdir(const char *name, mode_t mode);
-    
-    FATFS _fs;                                // Work area (file system object) for logical drive    
-    static FATFileSystem *_ffs[_DRIVES];    // FATFileSystem objects, as parallel to FatFs drives array
-    int _fsid;
-    
-    virtual int disk_initialize() { return 0; }
-    virtual int disk_status() { return 0; }
-    virtual int disk_read(char *buffer, int sector) = 0;
-    virtual int disk_write(const char *buffer, int sector) = 0;
-    virtual int disk_sync() { return 0; }
-    virtual int disk_sectors() = 0;
-     
-};
-    
-}
-
-#endif

Binary file FatFileSystem/LPC1768/FATFileSystem.ar has changed

Binary file FatFileSystem/LPC2368/FATFileSystem.ar has changed

--- a/FatFileSystem/diskio.h	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*-----------------------------------------------------------------------
-/  Low level disk interface modlue include file  R0.06   (C)ChaN, 2007
-/-----------------------------------------------------------------------*/
-
-#ifndef _DISKIO
-
-#define _READONLY    0    /* 1: Read-only mode */
-#define _USE_IOCTL    1
-
-#include "integer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Status of Disk Functions */
-typedef BYTE    DSTATUS;
-
-/* Results of Disk Functions */
-typedef enum {
-    RES_OK = 0,        /* 0: Successful */
-    RES_ERROR,        /* 1: R/W Error */
-    RES_WRPRT,        /* 2: Write Protected */
-    RES_NOTRDY,        /* 3: Not Ready */
-    RES_PARERR        /* 4: Invalid Parameter */
-} DRESULT;
-
-
-/*---------------------------------------*/
-/* Prototypes for disk control functions */
-
-DSTATUS disk_initialize (BYTE);
-DSTATUS disk_status (BYTE);
-DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);
-#if    _READONLY == 0
-DRESULT disk_write (BYTE, const BYTE*, DWORD, BYTE);
-#endif
-DRESULT disk_ioctl (BYTE, BYTE, void*);
-void    disk_timerproc (void);
-
-#ifdef __cplusplus
-};
-#endif
-
-
-/* Disk Status Bits (DSTATUS) */
-
-#define STA_NOINIT        0x01    /* Drive not initialized */
-#define STA_NODISK        0x02    /* No medium in the drive */
-#define STA_PROTECT        0x04    /* Write protected */
-
-
-/* Command code for disk_ioctrl() */
-
-/* Generic command */
-#define CTRL_SYNC            0    /* Mandatory for read/write configuration */
-#define GET_SECTOR_COUNT    1    /* Mandatory for only f_mkfs() */
-#define GET_SECTOR_SIZE        2
-#define GET_BLOCK_SIZE        3    /* Mandatory for only f_mkfs() */
-#define CTRL_POWER            4
-#define CTRL_LOCK            5
-#define CTRL_EJECT            6
-/* MMC/SDC command */
-#define MMC_GET_TYPE        10
-#define MMC_GET_CSD            11
-#define MMC_GET_CID            12
-#define MMC_GET_OCR            13
-#define MMC_GET_SDSTAT        14
-/* ATA/CF command */
-#define ATA_GET_REV            20
-#define ATA_GET_MODEL        21
-#define ATA_GET_SN            22
-
-
-#define _DISKIO
-#endif

--- a/FatFileSystem/ff.h	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,344 +0,0 @@
-/*--------------------------------------------------------------------------/
-/  FatFs - FAT file system module include file  R0.06        (C)ChaN, 2008
-/---------------------------------------------------------------------------/
-/ FatFs module is an experimenal project to implement FAT file system to
-/ cheap microcontrollers. This is a free software and is opened for education,
-/ research and development under license policy of following trems.
-/
-/  Copyright (C) 2008, ChaN, all right reserved.
-/
-/ * The FatFs module is a free software and there is no warranty.
-/ * You can use, modify and/or redistribute it for personal, non-profit or
-/   commercial use without any restriction under your responsibility.
-/ * Redistributions of source code must retain the above copyright notice.
-/
-/---------------------------------------------------------------------------*/
-
-#ifndef _FATFS
-
-#define _MCU_ENDIAN        2
-/* The _MCU_ENDIAN defines which access method is used to the FAT structure.
-/  1: Enable word access.
-/  2: Disable word access and use byte-by-byte access instead.
-/  When the architectural byte order of the MCU is big-endian and/or address
-/  miss-aligned access results incorrect behavior, the _MCU_ENDIAN must be set to 2.
-/  If it is not the case, it can also be set to 1 for good code efficiency. */
-
-#define _FS_READONLY    0
-/* Setting _FS_READONLY to 1 defines read only configuration. This removes
-/  writing functions, f_write, f_sync, f_unlink, f_mkdir, f_chmod, f_rename,
-/  f_truncate and useless f_getfree. */
-
-#define _FS_MINIMIZE    0
-/* The _FS_MINIMIZE option defines minimization level to remove some functions.
-/  0: Full function.
-/  1: f_stat, f_getfree, f_unlink, f_mkdir, f_chmod, f_truncate and f_rename are removed.
-/  2: f_opendir and f_readdir are removed in addition to level 1.
-/  3: f_lseek is removed in addition to level 2. */
-
-#define    _USE_STRFUNC    0
-/* To enable string functions, set _USE_STRFUNC to 1 or 2. */
-
-#define    _USE_MKFS    1
-/* When _USE_MKFS is set to 1 and _FS_READONLY is set to 0, f_mkfs function is
-/  enabled. */
-
-#define _DRIVES        4
-/* Number of logical drives to be used. This affects the size of internal table. */
-
-#define    _MULTI_PARTITION    0
-/* When _MULTI_PARTITION is set to 0, each logical drive is bound to same
-/  physical drive number and can mount only 1st primaly partition. When it is
-/  set to 1, each logical drive can mount a partition listed in Drives[]. */
-
-#define _USE_FSINFO    0
-/* To enable FSInfo support on FAT32 volume, set _USE_FSINFO to 1. */
-
-#define    _USE_SJIS    1
-/* When _USE_SJIS is set to 1, Shift-JIS code transparency is enabled, otherwise
-/  only US-ASCII(7bit) code can be accepted as file/directory name. */
-
-#define    _USE_NTFLAG    1
-/* When _USE_NTFLAG is set to 1, upper/lower case of the file name is preserved.
-/  Note that the files are always accessed in case insensitive. */
-
-
-#include "integer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Definitions corresponds to multiple sector size (not tested) */
-#define    S_MAX_SIZ    512U            /* Do not change */
-#if S_MAX_SIZ > 512U
-#define    SS(fs)    ((fs)->s_size)
-#else
-#define    SS(fs)    512U
-#endif
-
-
-/* File system object structure */
-typedef struct _FATFS {
-    WORD    id;                /* File system mount ID */
-    WORD    n_rootdir;        /* Number of root directory entries */
-    DWORD    winsect;        /* Current sector appearing in the win[] */
-    DWORD    sects_fat;        /* Sectors per fat */
-    DWORD    max_clust;        /* Maximum cluster# + 1 */
-    DWORD    fatbase;        /* FAT start sector */
-    DWORD    dirbase;        /* Root directory start sector (cluster# for FAT32) */
-    DWORD    database;        /* Data start sector */
-#if !_FS_READONLY
-    DWORD    last_clust;        /* Last allocated cluster */
-    DWORD    free_clust;        /* Number of free clusters */
-#if _USE_FSINFO
-    DWORD    fsi_sector;        /* fsinfo sector */
-    BYTE    fsi_flag;        /* fsinfo dirty flag (1:must be written back) */
-    BYTE    pad2;
-#endif
-#endif
-    BYTE    fs_type;        /* FAT sub type */
-    BYTE    csize;            /* Number of sectors per cluster */
-#if S_MAX_SIZ > 512U
-    WORD    s_size;            /* Sector size */
-#endif
-    BYTE    n_fats;            /* Number of FAT copies */
-    BYTE    drive;            /* Physical drive number */
-    BYTE    winflag;        /* win[] dirty flag (1:must be written back) */
-    BYTE    pad1;
-    BYTE    win[S_MAX_SIZ];    /* Disk access window for Directory/FAT */
-} FATFS;
-
-
-/* Directory object structure */
-typedef struct _DIR {
-    WORD    id;            /* Owner file system mount ID */
-    WORD    index;        /* Current index */
-    FATFS*    fs;            /* Pointer to the owner file system object */
-    DWORD    sclust;        /* Start cluster */
-    DWORD    clust;        /* Current cluster */
-    DWORD    sect;        /* Current sector */
-} FATFS_DIR;
-
-
-/* File object structure */
-typedef struct _FIL {
-    WORD    id;                /* Owner file system mount ID */
-    BYTE    flag;            /* File status flags */
-    BYTE    csect;            /* Sector address in the cluster */
-    FATFS*    fs;                /* Pointer to the owner file system object */
-    DWORD    fptr;            /* File R/W pointer */
-    DWORD    fsize;            /* File size */
-    DWORD    org_clust;        /* File start cluster */
-    DWORD    curr_clust;        /* Current cluster */
-    DWORD    curr_sect;        /* Current sector */
-#if _FS_READONLY == 0
-    DWORD    dir_sect;        /* Sector containing the directory entry */
-    BYTE*    dir_ptr;        /* Ponter to the directory entry in the window */
-#endif
-    BYTE    buffer[S_MAX_SIZ];    /* File R/W buffer */
-} FIL;
-
-
-/* File status structure */
-typedef struct _FILINFO {
-    DWORD fsize;            /* Size */
-    WORD fdate;                /* Date */
-    WORD ftime;                /* Time */
-    BYTE fattrib;            /* Attribute */
-    char fname[8+1+3+1];    /* Name (8.3 format) */
-} FILINFO;
-
-
-
-/* Definitions corresponds to multi partition */
-
-#if _MULTI_PARTITION != 0    /* Multiple partition cfg */
-
-typedef struct _PARTITION {
-    BYTE pd;    /* Physical drive # (0-255) */
-    BYTE pt;    /* Partition # (0-3) */
-} PARTITION;
-extern
-const PARTITION Drives[];            /* Logical drive# to physical location conversion table */
-#define LD2PD(drv) (Drives[drv].pd)    /* Get physical drive# */
-#define LD2PT(drv) (Drives[drv].pt)    /* Get partition# */
-
-#else                        /* Single partition cfg */
-
-#define LD2PD(drv) (drv)        /* Physical drive# is equal to logical drive# */
-#define LD2PT(drv) 0            /* Always mounts the 1st partition */
-
-#endif
-
-
-/* File function return code (FRESULT) */
-
-typedef enum {
-    FR_OK = 0,            /* 0 */
-    FR_NOT_READY,        /* 1 */
-    FR_NO_FILE,            /* 2 */
-    FR_NO_PATH,            /* 3 */
-    FR_INVALID_NAME,    /* 4 */
-    FR_INVALID_DRIVE,    /* 5 */
-    FR_DENIED,            /* 6 */
-    FR_EXIST,            /* 7 */
-    FR_RW_ERROR,        /* 8 */
-    FR_WRITE_PROTECTED,    /* 9 */
-    FR_NOT_ENABLED,        /* 10 */
-    FR_NO_FILESYSTEM,    /* 11 */
-    FR_INVALID_OBJECT,    /* 12 */
-    FR_MKFS_ABORTED        /* 13 */
-} FRESULT;
-
-
-
-/*-----------------------------------------------------*/
-/* FatFs module application interface                  */
-
-FRESULT f_mount (BYTE, FATFS*);                        /* Mount/Unmount a logical drive */
-FRESULT f_open (FIL*, const char*, BYTE);            /* Open or create a file */
-FRESULT f_read (FIL*, void*, UINT, UINT*);            /* Read data from a file */
-FRESULT f_write (FIL*, const void*, UINT, UINT*);    /* Write data to a file */
-FRESULT f_lseek (FIL*, DWORD);                        /* Move file pointer of a file object */
-FRESULT f_close (FIL*);                                /* Close an open file object */
-FRESULT f_opendir (FATFS_DIR*, const char*);                /* Open an existing directory */
-FRESULT f_readdir (FATFS_DIR*, FILINFO*);                    /* Read a directory item */
-FRESULT f_stat (const char*, FILINFO*);                /* Get file status */
-FRESULT f_getfree (const char*, DWORD*, FATFS**);    /* Get number of free clusters on the drive */
-FRESULT f_truncate (FIL*);                            /* Truncate file */
-FRESULT f_sync (FIL*);                                /* Flush cached data of a writing file */
-FRESULT f_unlink (const char*);                        /* Delete an existing file or directory */
-FRESULT    f_mkdir (const char*);                        /* Create a new directory */
-FRESULT f_chmod (const char*, BYTE, BYTE);            /* Change file/dir attriburte */
-FRESULT f_utime (const char*, const FILINFO*);        /* Change file/dir timestamp */
-FRESULT f_rename (const char*, const char*);        /* Rename/Move a file or directory */
-FRESULT f_mkfs (BYTE, BYTE, WORD);                    /* Create a file system on the drive */
-#if _USE_STRFUNC
-#define feof(fp) ((fp)->fptr == (fp)->fsize)
-#define EOF -1
-int fputc (int, FIL*);                                /* Put a character to the file */
-int fputs (const char*, FIL*);                        /* Put a string to the file */
-int fprintf (FIL*, const char*, ...);                /* Put a formatted string to the file */
-char* fgets (char*, int, FIL*);                        /* Get a string from the file */
-#endif
-
-/* User defined function to give a current time to fatfs module */
-
-DWORD get_fattime (void);    /* 31-25: Year(0-127 org.1980), 24-21: Month(1-12), 20-16: Day(1-31) */
-                            /* 15-11: Hour(0-23), 10-5: Minute(0-59), 4-0: Second(0-29 *2) */
-
-
-
-/* File access control and file status flags (FIL.flag) */
-
-#define    FA_READ                0x01
-#define    FA_OPEN_EXISTING    0x00
-#if _FS_READONLY == 0
-#define    FA_WRITE            0x02
-#define    FA_CREATE_NEW        0x04
-#define    FA_CREATE_ALWAYS    0x08
-#define    FA_OPEN_ALWAYS        0x10
-#define FA__WRITTEN            0x20
-#define FA__DIRTY            0x40
-#endif
-#define FA__ERROR            0x80
-
-
-/* FAT sub type (FATFS.fs_type) */
-
-#define FS_FAT12    1
-#define FS_FAT16    2
-#define FS_FAT32    3
-
-
-/* File attribute bits for directory entry */
-
-#define    AM_RDO    0x01    /* Read only */
-#define    AM_HID    0x02    /* Hidden */
-#define    AM_SYS    0x04    /* System */
-#define    AM_VOL    0x08    /* Volume label */
-#define AM_LFN    0x0F    /* LFN entry */
-#define AM_DIR    0x10    /* Directory */
-#define AM_ARC    0x20    /* Archive */
-
-
-
-/* Offset of FAT structure members */
-
-#define BS_jmpBoot            0
-#define BS_OEMName            3
-#define BPB_BytsPerSec        11
-#define BPB_SecPerClus        13
-#define BPB_RsvdSecCnt        14
-#define BPB_NumFATs            16
-#define BPB_RootEntCnt        17
-#define BPB_TotSec16        19
-#define BPB_Media            21
-#define BPB_FATSz16            22
-#define BPB_SecPerTrk        24
-#define BPB_NumHeads        26
-#define BPB_HiddSec            28
-#define BPB_TotSec32        32
-#define BS_55AA                510
-
-#define BS_DrvNum            36
-#define BS_BootSig            38
-#define BS_VolID            39
-#define BS_VolLab            43
-#define BS_FilSysType        54
-
-#define BPB_FATSz32            36
-#define BPB_ExtFlags        40
-#define BPB_FSVer            42
-#define BPB_RootClus        44
-#define BPB_FSInfo            48
-#define BPB_BkBootSec        50
-#define BS_DrvNum32            64
-#define BS_BootSig32        66
-#define BS_VolID32            67
-#define BS_VolLab32            71
-#define BS_FilSysType32        82
-
-#define    FSI_LeadSig            0
-#define    FSI_StrucSig        484
-#define    FSI_Free_Count        488
-#define    FSI_Nxt_Free        492
-
-#define MBR_Table            446
-
-#define    DIR_Name            0
-#define    DIR_Attr            11
-#define    DIR_NTres            12
-#define    DIR_CrtTime            14
-#define    DIR_CrtDate            16
-#define    DIR_FstClusHI        20
-#define    DIR_WrtTime            22
-#define    DIR_WrtDate            24
-#define    DIR_FstClusLO        26
-#define    DIR_FileSize        28
-
-
-
-/* Multi-byte word access macros  */
-
-#if _MCU_ENDIAN == 1    /* Use word access */
-#define    LD_WORD(ptr)        (WORD)(*(WORD*)(BYTE*)(ptr))
-#define    LD_DWORD(ptr)        (DWORD)(*(DWORD*)(BYTE*)(ptr))
-#define    ST_WORD(ptr,val)    *(WORD*)(BYTE*)(ptr)=(WORD)(val)
-#define    ST_DWORD(ptr,val)    *(DWORD*)(BYTE*)(ptr)=(DWORD)(val)
-#elif _MCU_ENDIAN == 2    /* Use byte-by-byte access */
-#define    LD_WORD(ptr)        (WORD)(((WORD)*(volatile BYTE*)((ptr)+1)<<8)|(WORD)*(volatile BYTE*)(ptr))
-#define    LD_DWORD(ptr)        (DWORD)(((DWORD)*(volatile BYTE*)((ptr)+3)<<24)|((DWORD)*(volatile BYTE*)((ptr)+2)<<16)|((WORD)*(volatile BYTE*)((ptr)+1)<<8)|*(volatile BYTE*)(ptr))
-#define    ST_WORD(ptr,val)    *(volatile BYTE*)(ptr)=(BYTE)(val); *(volatile BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8)
-#define    ST_DWORD(ptr,val)    *(volatile BYTE*)(ptr)=(BYTE)(val); *(volatile BYTE*)((ptr)+1)=(BYTE)((WORD)(val)>>8); *(volatile BYTE*)((ptr)+2)=(BYTE)((DWORD)(val)>>16); *(volatile BYTE*)((ptr)+3)=(BYTE)((DWORD)(val)>>24)
-#else
-#error Do not forget to set _MCU_ENDIAN properly!
-#endif
-
-#ifdef __cplusplus
-};
-#endif
-
-#define _FATFS
-#endif /* _FATFS */

--- a/FatFileSystem/integer.h	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*-------------------------------------------*/
-/* Integer type definitions for FatFs module */
-/*-------------------------------------------*/
-
-#ifndef _INTEGER
-
-/* These types must be 16-bit, 32-bit or larger integer */
-typedef int                INT;
-typedef unsigned int    UINT;
-
-/* These types must be 8-bit integer */
-typedef signed char        CHAR;
-typedef unsigned char    UCHAR;
-typedef unsigned char    BYTE;
-
-/* These types must be 16-bit integer */
-typedef short            SHORT;
-typedef unsigned short    USHORT;
-typedef unsigned short    WORD;
-
-/* These types must be 32-bit integer */
-typedef long            LONG;
-typedef unsigned long    ULONG;
-typedef unsigned long    DWORD;
-
-/* Boolean type */
-typedef enum { FALSE = 0, TRUE } BOOL;
-
-#define _INTEGER
-#endif

--- a/PowerControl/EthernetPowerControl.cpp	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-#include "EthernetPowerControl.h"
-
-static void write_PHY (unsigned int PhyReg, unsigned short Value) {
-   /* Write a data 'Value' to PHY register 'PhyReg'. */
-   unsigned int tout;
-   /* Hardware MII Management for LPC176x devices. */
-   LPC_EMAC->MADR = DP83848C_DEF_ADR | PhyReg;
-   LPC_EMAC->MWTD = Value;
-
-   /* Wait utill operation completed */
-   for (tout = 0; tout < MII_WR_TOUT; tout++) {
-      if ((LPC_EMAC->MIND & MIND_BUSY) == 0) {
-         break;
-      }
-   }
-}
-
-static unsigned short read_PHY (unsigned int PhyReg) {
-   /* Read a PHY register 'PhyReg'. */
-   unsigned int tout, val;
-
-   LPC_EMAC->MADR = DP83848C_DEF_ADR | PhyReg;
-   LPC_EMAC->MCMD = MCMD_READ;
-
-   /* Wait until operation completed */
-   for (tout = 0; tout < MII_RD_TOUT; tout++) {
-      if ((LPC_EMAC->MIND & MIND_BUSY) == 0) {
-         break;
-      }
-   }
-   LPC_EMAC->MCMD = 0;
-   val = LPC_EMAC->MRDD;
-   
-   return (val);
-}
-
-void EMAC_Init()
-{
-  unsigned int tout,regv;
-  /* Power Up the EMAC controller. */
-  Peripheral_PowerUp(LPC1768_PCONP_PCENET);
-  
-  LPC_PINCON->PINSEL2 = 0x50150105;
-  LPC_PINCON->PINSEL3 &= ~0x0000000F;
-  LPC_PINCON->PINSEL3 |= 0x00000005;
-
-  /* Reset all EMAC internal modules. */
-  LPC_EMAC->MAC1 = MAC1_RES_TX | MAC1_RES_MCS_TX | MAC1_RES_RX | MAC1_RES_MCS_RX |
-             MAC1_SIM_RES | MAC1_SOFT_RES;
-  LPC_EMAC->Command = CR_REG_RES | CR_TX_RES | CR_RX_RES;
-
-  /* A short delay after reset. */
-  for (tout = 100; tout; tout--);
-
-  /* Initialize MAC control registers. */
-  LPC_EMAC->MAC1 = MAC1_PASS_ALL;
-  LPC_EMAC->MAC2 = MAC2_CRC_EN | MAC2_PAD_EN;
-  LPC_EMAC->MAXF = ETH_MAX_FLEN;
-  LPC_EMAC->CLRT = CLRT_DEF;
-  LPC_EMAC->IPGR = IPGR_DEF;
-
-  /* Enable Reduced MII interface. */
-  LPC_EMAC->Command = CR_RMII | CR_PASS_RUNT_FRM;
-
-  /* Reset Reduced MII Logic. */
-  LPC_EMAC->SUPP = SUPP_RES_RMII;
-  for (tout = 100; tout; tout--);
-  LPC_EMAC->SUPP = 0;
-
-  /* Put the DP83848C in reset mode */
-  write_PHY (PHY_REG_BMCR, 0x8000);
-
-  /* Wait for hardware reset to end. */
-  for (tout = 0; tout < 0x100000; tout++) {
-    regv = read_PHY (PHY_REG_BMCR);
-    if (!(regv & 0x8000)) {
-      /* Reset complete */
-      break;
-    }
-  }
-}
-
-
-void PHY_PowerDown()
-{
-    if (!Peripheral_GetStatus(LPC1768_PCONP_PCENET))
-        EMAC_Init(); //init EMAC if it is not already init'd
-    
-    unsigned int regv;
-    regv = read_PHY(PHY_REG_BMCR);
-    write_PHY(PHY_REG_BMCR, regv | (1 << PHY_REG_BMCR_POWERDOWN));
-    regv = read_PHY(PHY_REG_BMCR);
-    
-    //shouldn't need the EMAC now.
-    Peripheral_PowerDown(LPC1768_PCONP_PCENET);
-    
-    //and turn off the PHY OSC
-     LPC_GPIO1->FIODIR |= 0x8000000;
-     LPC_GPIO1->FIOCLR = 0x8000000;
-}
-
-void PHY_PowerUp()
-{   
-    if (!Peripheral_GetStatus(LPC1768_PCONP_PCENET))
-        EMAC_Init(); //init EMAC if it is not already init'd
-        
-    LPC_GPIO1->FIODIR |= 0x8000000;
-    LPC_GPIO1->FIOSET = 0x8000000;
-    
-    //wait for osc to be stable
-    wait_ms(200);
-    
-    unsigned int regv;
-    regv = read_PHY(PHY_REG_BMCR);
-    write_PHY(PHY_REG_BMCR, regv & ~(1 << PHY_REG_BMCR_POWERDOWN));
-    regv = read_PHY(PHY_REG_BMCR);
-}
-
-void PHY_EnergyDetect_Enable()
-{
-    if (!Peripheral_GetStatus(LPC1768_PCONP_PCENET))
-        EMAC_Init(); //init EMAC if it is not already init'd
-        
-    unsigned int regv;
-    regv = read_PHY(PHY_REG_EDCR);
-    write_PHY(PHY_REG_BMCR, regv | (1 << PHY_REG_EDCR_ENABLE));
-    regv = read_PHY(PHY_REG_EDCR);   
-}
-
-void PHY_EnergyDetect_Disable()
-{
-    if (!Peripheral_GetStatus(LPC1768_PCONP_PCENET))
-        EMAC_Init(); //init EMAC if it is not already init'd
-    unsigned int regv;
-    regv = read_PHY(PHY_REG_EDCR);
-    write_PHY(PHY_REG_BMCR, regv & ~(1 << PHY_REG_EDCR_ENABLE));
-    regv = read_PHY(PHY_REG_EDCR);   
-}
\ No newline at end of file

--- a/PowerControl/EthernetPowerControl.h	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,299 +0,0 @@
-/* mbed PowerControl Library
-  * Copyright (c) 2010 Michael Wei
-  */ 
-  
-#ifndef MBED_POWERCONTROL_ETH_H 
-#define MBED_POWERCONTROL_ETH_H 
-
-#include "mbed.h"
-#include "PowerControl.h"
-
-#define PHY_REG_BMCR_POWERDOWN    0xB
-#define PHY_REG_EDCR_ENABLE       0xF
-
-
-void EMAC_Init();
-static unsigned short read_PHY (unsigned int PhyReg);
-static void write_PHY (unsigned int PhyReg, unsigned short Value);
-
-void PHY_PowerDown(void);
-void PHY_PowerUp(void);
-void PHY_EnergyDetect_Enable(void);
-void PHY_EnergyDetect_Disable(void);
-
-//From NXP Sample Code .... Probably from KEIL sample code
-/* EMAC Memory Buffer configuration for 16K Ethernet RAM. */
-#define NUM_RX_FRAG         4           /* Num.of RX Fragments 4*1536= 6.0kB */
-#define NUM_TX_FRAG         3           /* Num.of TX Fragments 3*1536= 4.6kB */
-#define ETH_FRAG_SIZE       1536        /* Packet Fragment size 1536 Bytes   */
-
-#define ETH_MAX_FLEN        1536        /* Max. Ethernet Frame Size          */
-
-/* EMAC variables located in 16K Ethernet SRAM */
-#define RX_DESC_BASE        0x20080000
-#define RX_STAT_BASE        (RX_DESC_BASE + NUM_RX_FRAG*8)
-#define TX_DESC_BASE        (RX_STAT_BASE + NUM_RX_FRAG*8)
-#define TX_STAT_BASE        (TX_DESC_BASE + NUM_TX_FRAG*8)
-#define RX_BUF_BASE         (TX_STAT_BASE + NUM_TX_FRAG*4)
-#define TX_BUF_BASE         (RX_BUF_BASE  + NUM_RX_FRAG*ETH_FRAG_SIZE)
-
-/* RX and TX descriptor and status definitions. */
-#define RX_DESC_PACKET(i)   (*(unsigned int *)(RX_DESC_BASE   + 8*i))
-#define RX_DESC_CTRL(i)     (*(unsigned int *)(RX_DESC_BASE+4 + 8*i))
-#define RX_STAT_INFO(i)     (*(unsigned int *)(RX_STAT_BASE   + 8*i))
-#define RX_STAT_HASHCRC(i)  (*(unsigned int *)(RX_STAT_BASE+4 + 8*i))
-#define TX_DESC_PACKET(i)   (*(unsigned int *)(TX_DESC_BASE   + 8*i))
-#define TX_DESC_CTRL(i)     (*(unsigned int *)(TX_DESC_BASE+4 + 8*i))
-#define TX_STAT_INFO(i)     (*(unsigned int *)(TX_STAT_BASE   + 4*i))
-#define RX_BUF(i)           (RX_BUF_BASE + ETH_FRAG_SIZE*i)
-#define TX_BUF(i)           (TX_BUF_BASE + ETH_FRAG_SIZE*i)
-
-/* MAC Configuration Register 1 */
-#define MAC1_REC_EN         0x00000001  /* Receive Enable                    */
-#define MAC1_PASS_ALL       0x00000002  /* Pass All Receive Frames           */
-#define MAC1_RX_FLOWC       0x00000004  /* RX Flow Control                   */
-#define MAC1_TX_FLOWC       0x00000008  /* TX Flow Control                   */
-#define MAC1_LOOPB          0x00000010  /* Loop Back Mode                    */
-#define MAC1_RES_TX         0x00000100  /* Reset TX Logic                    */
-#define MAC1_RES_MCS_TX     0x00000200  /* Reset MAC TX Control Sublayer     */
-#define MAC1_RES_RX         0x00000400  /* Reset RX Logic                    */
-#define MAC1_RES_MCS_RX     0x00000800  /* Reset MAC RX Control Sublayer     */
-#define MAC1_SIM_RES        0x00004000  /* Simulation Reset                  */
-#define MAC1_SOFT_RES       0x00008000  /* Soft Reset MAC                    */
-
-/* MAC Configuration Register 2 */
-#define MAC2_FULL_DUP       0x00000001  /* Full Duplex Mode                  */
-#define MAC2_FRM_LEN_CHK    0x00000002  /* Frame Length Checking             */
-#define MAC2_HUGE_FRM_EN    0x00000004  /* Huge Frame Enable                 */
-#define MAC2_DLY_CRC        0x00000008  /* Delayed CRC Mode                  */
-#define MAC2_CRC_EN         0x00000010  /* Append CRC to every Frame         */
-#define MAC2_PAD_EN         0x00000020  /* Pad all Short Frames              */
-#define MAC2_VLAN_PAD_EN    0x00000040  /* VLAN Pad Enable                   */
-#define MAC2_ADET_PAD_EN    0x00000080  /* Auto Detect Pad Enable            */
-#define MAC2_PPREAM_ENF     0x00000100  /* Pure Preamble Enforcement         */
-#define MAC2_LPREAM_ENF     0x00000200  /* Long Preamble Enforcement         */
-#define MAC2_NO_BACKOFF     0x00001000  /* No Backoff Algorithm              */
-#define MAC2_BACK_PRESSURE  0x00002000  /* Backoff Presurre / No Backoff     */
-#define MAC2_EXCESS_DEF     0x00004000  /* Excess Defer                      */
-
-/* Back-to-Back Inter-Packet-Gap Register */
-#define IPGT_FULL_DUP       0x00000015  /* Recommended value for Full Duplex */
-#define IPGT_HALF_DUP       0x00000012  /* Recommended value for Half Duplex */
-
-/* Non Back-to-Back Inter-Packet-Gap Register */
-#define IPGR_DEF            0x00000012  /* Recommended value                 */
-
-/* Collision Window/Retry Register */
-#define CLRT_DEF            0x0000370F  /* Default value                     */
-
-/* PHY Support Register */
-#define SUPP_SPEED          0x00000100  /* Reduced MII Logic Current Speed   */
-#define SUPP_RES_RMII       0x00000800  /* Reset Reduced MII Logic           */
-
-/* Test Register */
-#define TEST_SHCUT_PQUANTA  0x00000001  /* Shortcut Pause Quanta             */
-#define TEST_TST_PAUSE      0x00000002  /* Test Pause                        */
-#define TEST_TST_BACKP      0x00000004  /* Test Back Pressure                */
-
-/* MII Management Configuration Register */
-#define MCFG_SCAN_INC       0x00000001  /* Scan Increment PHY Address        */
-#define MCFG_SUPP_PREAM     0x00000002  /* Suppress Preamble                 */
-#define MCFG_CLK_SEL        0x0000001C  /* Clock Select Mask                 */
-#define MCFG_RES_MII        0x00008000  /* Reset MII Management Hardware     */
-
-/* MII Management Command Register */
-#define MCMD_READ           0x00000001  /* MII Read                          */
-#define MCMD_SCAN           0x00000002  /* MII Scan continuously             */
-
-#define MII_WR_TOUT         0x00050000  /* MII Write timeout count           */
-#define MII_RD_TOUT         0x00050000  /* MII Read timeout count            */
-
-/* MII Management Address Register */
-#define MADR_REG_ADR        0x0000001F  /* MII Register Address Mask         */
-#define MADR_PHY_ADR        0x00001F00  /* PHY Address Mask                  */
-
-/* MII Management Indicators Register */
-#define MIND_BUSY           0x00000001  /* MII is Busy                       */
-#define MIND_SCAN           0x00000002  /* MII Scanning in Progress          */
-#define MIND_NOT_VAL        0x00000004  /* MII Read Data not valid           */
-#define MIND_MII_LINK_FAIL  0x00000008  /* MII Link Failed                   */
-
-/* Command Register */
-#define CR_RX_EN            0x00000001  /* Enable Receive                    */
-#define CR_TX_EN            0x00000002  /* Enable Transmit                   */
-#define CR_REG_RES          0x00000008  /* Reset Host Registers              */
-#define CR_TX_RES           0x00000010  /* Reset Transmit Datapath           */
-#define CR_RX_RES           0x00000020  /* Reset Receive Datapath            */
-#define CR_PASS_RUNT_FRM    0x00000040  /* Pass Runt Frames                  */
-#define CR_PASS_RX_FILT     0x00000080  /* Pass RX Filter                    */
-#define CR_TX_FLOW_CTRL     0x00000100  /* TX Flow Control                   */
-#define CR_RMII             0x00000200  /* Reduced MII Interface             */
-#define CR_FULL_DUP         0x00000400  /* Full Duplex                       */
-
-/* Status Register */
-#define SR_RX_EN            0x00000001  /* Enable Receive                    */
-#define SR_TX_EN            0x00000002  /* Enable Transmit                   */
-
-/* Transmit Status Vector 0 Register */
-#define TSV0_CRC_ERR        0x00000001  /* CRC error                         */
-#define TSV0_LEN_CHKERR     0x00000002  /* Length Check Error                */
-#define TSV0_LEN_OUTRNG     0x00000004  /* Length Out of Range               */
-#define TSV0_DONE           0x00000008  /* Tramsmission Completed            */
-#define TSV0_MCAST          0x00000010  /* Multicast Destination             */
-#define TSV0_BCAST          0x00000020  /* Broadcast Destination             */
-#define TSV0_PKT_DEFER      0x00000040  /* Packet Deferred                   */
-#define TSV0_EXC_DEFER      0x00000080  /* Excessive Packet Deferral         */
-#define TSV0_EXC_COLL       0x00000100  /* Excessive Collision               */
-#define TSV0_LATE_COLL      0x00000200  /* Late Collision Occured            */
-#define TSV0_GIANT          0x00000400  /* Giant Frame                       */
-#define TSV0_UNDERRUN       0x00000800  /* Buffer Underrun                   */
-#define TSV0_BYTES          0x0FFFF000  /* Total Bytes Transferred           */
-#define TSV0_CTRL_FRAME     0x10000000  /* Control Frame                     */
-#define TSV0_PAUSE          0x20000000  /* Pause Frame                       */
-#define TSV0_BACK_PRESS     0x40000000  /* Backpressure Method Applied       */
-#define TSV0_VLAN           0x80000000  /* VLAN Frame                        */
-
-/* Transmit Status Vector 1 Register */
-#define TSV1_BYTE_CNT       0x0000FFFF  /* Transmit Byte Count               */
-#define TSV1_COLL_CNT       0x000F0000  /* Transmit Collision Count          */
-
-/* Receive Status Vector Register */
-#define RSV_BYTE_CNT        0x0000FFFF  /* Receive Byte Count                */
-#define RSV_PKT_IGNORED     0x00010000  /* Packet Previously Ignored         */
-#define RSV_RXDV_SEEN       0x00020000  /* RXDV Event Previously Seen        */
-#define RSV_CARR_SEEN       0x00040000  /* Carrier Event Previously Seen     */
-#define RSV_REC_CODEV       0x00080000  /* Receive Code Violation            */
-#define RSV_CRC_ERR         0x00100000  /* CRC Error                         */
-#define RSV_LEN_CHKERR      0x00200000  /* Length Check Error                */
-#define RSV_LEN_OUTRNG      0x00400000  /* Length Out of Range               */
-#define RSV_REC_OK          0x00800000  /* Frame Received OK                 */
-#define RSV_MCAST           0x01000000  /* Multicast Frame                   */
-#define RSV_BCAST           0x02000000  /* Broadcast Frame                   */
-#define RSV_DRIB_NIBB       0x04000000  /* Dribble Nibble                    */
-#define RSV_CTRL_FRAME      0x08000000  /* Control Frame                     */
-#define RSV_PAUSE           0x10000000  /* Pause Frame                       */
-#define RSV_UNSUPP_OPC      0x20000000  /* Unsupported Opcode                */
-#define RSV_VLAN            0x40000000  /* VLAN Frame                        */
-
-/* Flow Control Counter Register */
-#define FCC_MIRR_CNT        0x0000FFFF  /* Mirror Counter                    */
-#define FCC_PAUSE_TIM       0xFFFF0000  /* Pause Timer                       */
-
-/* Flow Control Status Register */
-#define FCS_MIRR_CNT        0x0000FFFF  /* Mirror Counter Current            */
-
-/* Receive Filter Control Register */
-#define RFC_UCAST_EN        0x00000001  /* Accept Unicast Frames Enable      */
-#define RFC_BCAST_EN        0x00000002  /* Accept Broadcast Frames Enable    */
-#define RFC_MCAST_EN        0x00000004  /* Accept Multicast Frames Enable    */
-#define RFC_UCAST_HASH_EN   0x00000008  /* Accept Unicast Hash Filter Frames */
-#define RFC_MCAST_HASH_EN   0x00000010  /* Accept Multicast Hash Filter Fram.*/
-#define RFC_PERFECT_EN      0x00000020  /* Accept Perfect Match Enable       */
-#define RFC_MAGP_WOL_EN     0x00001000  /* Magic Packet Filter WoL Enable    */
-#define RFC_PFILT_WOL_EN    0x00002000  /* Perfect Filter WoL Enable         */
-
-/* Receive Filter WoL Status/Clear Registers */
-#define WOL_UCAST           0x00000001  /* Unicast Frame caused WoL          */
-#define WOL_BCAST           0x00000002  /* Broadcast Frame caused WoL        */
-#define WOL_MCAST           0x00000004  /* Multicast Frame caused WoL        */
-#define WOL_UCAST_HASH      0x00000008  /* Unicast Hash Filter Frame WoL     */
-#define WOL_MCAST_HASH      0x00000010  /* Multicast Hash Filter Frame WoL   */
-#define WOL_PERFECT         0x00000020  /* Perfect Filter WoL                */
-#define WOL_RX_FILTER       0x00000080  /* RX Filter caused WoL              */
-#define WOL_MAG_PACKET      0x00000100  /* Magic Packet Filter caused WoL    */
-
-/* Interrupt Status/Enable/Clear/Set Registers */
-#define INT_RX_OVERRUN      0x00000001  /* Overrun Error in RX Queue         */
-#define INT_RX_ERR          0x00000002  /* Receive Error                     */
-#define INT_RX_FIN          0x00000004  /* RX Finished Process Descriptors   */
-#define INT_RX_DONE         0x00000008  /* Receive Done                      */
-#define INT_TX_UNDERRUN     0x00000010  /* Transmit Underrun                 */
-#define INT_TX_ERR          0x00000020  /* Transmit Error                    */
-#define INT_TX_FIN          0x00000040  /* TX Finished Process Descriptors   */
-#define INT_TX_DONE         0x00000080  /* Transmit Done                     */
-#define INT_SOFT_INT        0x00001000  /* Software Triggered Interrupt      */
-#define INT_WAKEUP          0x00002000  /* Wakeup Event Interrupt            */
-
-/* Power Down Register */
-#define PD_POWER_DOWN       0x80000000  /* Power Down MAC                    */
-
-/* RX Descriptor Control Word */
-#define RCTRL_SIZE          0x000007FF  /* Buffer size mask                  */
-#define RCTRL_INT           0x80000000  /* Generate RxDone Interrupt         */
-
-/* RX Status Hash CRC Word */
-#define RHASH_SA            0x000001FF  /* Hash CRC for Source Address       */
-#define RHASH_DA            0x001FF000  /* Hash CRC for Destination Address  */
-
-/* RX Status Information Word */
-#define RINFO_SIZE          0x000007FF  /* Data size in bytes                */
-#define RINFO_CTRL_FRAME    0x00040000  /* Control Frame                     */
-#define RINFO_VLAN          0x00080000  /* VLAN Frame                        */
-#define RINFO_FAIL_FILT     0x00100000  /* RX Filter Failed                  */
-#define RINFO_MCAST         0x00200000  /* Multicast Frame                   */
-#define RINFO_BCAST         0x00400000  /* Broadcast Frame                   */
-#define RINFO_CRC_ERR       0x00800000  /* CRC Error in Frame                */
-#define RINFO_SYM_ERR       0x01000000  /* Symbol Error from PHY             */
-#define RINFO_LEN_ERR       0x02000000  /* Length Error                      */
-#define RINFO_RANGE_ERR     0x04000000  /* Range Error (exceeded max. size)  */
-#define RINFO_ALIGN_ERR     0x08000000  /* Alignment Error                   */
-#define RINFO_OVERRUN       0x10000000  /* Receive overrun                   */
-#define RINFO_NO_DESCR      0x20000000  /* No new Descriptor available       */
-#define RINFO_LAST_FLAG     0x40000000  /* Last Fragment in Frame            */
-#define RINFO_ERR           0x80000000  /* Error Occured (OR of all errors)  */
-
-#define RINFO_ERR_MASK     (RINFO_FAIL_FILT | RINFO_CRC_ERR   | RINFO_SYM_ERR | \
-                            RINFO_LEN_ERR   | RINFO_ALIGN_ERR | RINFO_OVERRUN)
-
-/* TX Descriptor Control Word */
-#define TCTRL_SIZE          0x000007FF  /* Size of data buffer in bytes      */
-#define TCTRL_OVERRIDE      0x04000000  /* Override Default MAC Registers    */
-#define TCTRL_HUGE          0x08000000  /* Enable Huge Frame                 */
-#define TCTRL_PAD           0x10000000  /* Pad short Frames to 64 bytes      */
-#define TCTRL_CRC           0x20000000  /* Append a hardware CRC to Frame    */
-#define TCTRL_LAST          0x40000000  /* Last Descriptor for TX Frame      */
-#define TCTRL_INT           0x80000000  /* Generate TxDone Interrupt         */
-
-/* TX Status Information Word */
-#define TINFO_COL_CNT       0x01E00000  /* Collision Count                   */
-#define TINFO_DEFER         0x02000000  /* Packet Deferred (not an error)    */
-#define TINFO_EXCESS_DEF    0x04000000  /* Excessive Deferral                */
-#define TINFO_EXCESS_COL    0x08000000  /* Excessive Collision               */
-#define TINFO_LATE_COL      0x10000000  /* Late Collision Occured            */
-#define TINFO_UNDERRUN      0x20000000  /* Transmit Underrun                 */
-#define TINFO_NO_DESCR      0x40000000  /* No new Descriptor available       */
-#define TINFO_ERR           0x80000000  /* Error Occured (OR of all errors)  */
-
-/* DP83848C PHY Registers */
-#define PHY_REG_BMCR        0x00        /* Basic Mode Control Register       */
-#define PHY_REG_BMSR        0x01        /* Basic Mode Status Register        */
-#define PHY_REG_IDR1        0x02        /* PHY Identifier 1                  */
-#define PHY_REG_IDR2        0x03        /* PHY Identifier 2                  */
-#define PHY_REG_ANAR        0x04        /* Auto-Negotiation Advertisement    */
-#define PHY_REG_ANLPAR      0x05        /* Auto-Neg. Link Partner Abitily    */
-#define PHY_REG_ANER        0x06        /* Auto-Neg. Expansion Register      */
-#define PHY_REG_ANNPTR      0x07        /* Auto-Neg. Next Page TX            */
-
-/* PHY Extended Registers */
-#define PHY_REG_STS         0x10        /* Status Register                   */
-#define PHY_REG_MICR        0x11        /* MII Interrupt Control Register    */
-#define PHY_REG_MISR        0x12        /* MII Interrupt Status Register     */
-#define PHY_REG_FCSCR       0x14        /* False Carrier Sense Counter       */
-#define PHY_REG_RECR        0x15        /* Receive Error Counter             */
-#define PHY_REG_PCSR        0x16        /* PCS Sublayer Config. and Status   */
-#define PHY_REG_RBR         0x17        /* RMII and Bypass Register          */
-#define PHY_REG_LEDCR       0x18        /* LED Direct Control Register       */
-#define PHY_REG_PHYCR       0x19        /* PHY Control Register              */
-#define PHY_REG_10BTSCR     0x1A        /* 10Base-T Status/Control Register  */
-#define PHY_REG_CDCTRL1     0x1B        /* CD Test Control and BIST Extens.  */
-#define PHY_REG_EDCR        0x1D        /* Energy Detect Control Register    */
-
-#define PHY_FULLD_100M      0x2100      /* Full Duplex 100Mbit               */
-#define PHY_HALFD_100M      0x2000      /* Half Duplex 100Mbit               */
-#define PHY_FULLD_10M       0x0100      /* Full Duplex 10Mbit                */
-#define PHY_HALFD_10M       0x0000      /* Half Duplex 10MBit                */
-#define PHY_AUTO_NEG        0x3000      /* Select Auto Negotiation           */
-
-#define DP83848C_DEF_ADR    0x0100      /* Default PHY device address        */
-#define DP83848C_ID         0x20005C90  /* PHY Identifier                    */
-#endif
\ No newline at end of file

--- a/PowerControl/PowerControl.h	Mon Dec 17 02:57:31 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/* mbed PowerControl Library
-  * Copyright (c) 2010 Michael Wei
-  */ 
-  
-#ifndef MBED_POWERCONTROL_H 
-#define MBED_POWERCONTROL_H 
-
-//shouldn't have to include, but fixes weird problems with defines
-#include "LPC1768/LPC17xx.h"
-
-//System Control Register
-// bit 0: Reserved
-// bit 1: Sleep on Exit
-#define LPC1768_SCR_SLEEPONEXIT     0x2
-// bit 2: Deep Sleep
-#define LPC1768_SCR_SLEEPDEEP       0x4
-// bit 3: Resereved
-// bit 4: Send on Pending
-#define LPC1768_SCR_SEVONPEND        0x10
-// bit 5-31: Reserved
-
-//Power Control Register
-// bit 0: Power mode control bit 0 (power-down mode)
-#define LPC1768_PCON_PM0            0x1
-// bit 1: Power mode control bit 1 (deep power-down mode)
-#define LPC1768_PCON_PM1            0x2
-// bit 2: Brown-out reduced power mode
-#define LPC1768_PCON_BODRPM         0x4
-// bit 3: Brown-out global disable
-#define LPC1768_PCON_BOGD           0x8
-// bit 4: Brown-out reset disable
-#define LPC1768_PCON_BORD           0x10
-// bit 5-7 : Reserved
-// bit 8: Sleep Mode Entry Flag
-#define LPC1768_PCON_SMFLAG         0x100
-// bit 9: Deep Sleep Entry Flag
-#define LPC1768_PCON_DSFLAG         0x200
-// bit 10: Power Down Entry Flag
-#define LPC1768_PCON_PDFLAG         0x400
-// bit 11: Deep Power Down Entry Flag
-#define LPC1768_PCON_DPDFLAG        0x800
-// bit 12-31: Reserved
-
-//"Sleep Mode" (WFI).
-inline void Sleep(void)
-{
-    __WFI();
-}
-
-//"Deep Sleep" Mode
-inline void DeepSleep(void)
-{
-   SCB->SCR |= LPC1768_SCR_SLEEPDEEP;
-   __WFI();
-}
-
-//"Power-Down" Mode
-inline void PowerDown(void)
-{
-   SCB->SCR |= LPC1768_SCR_SLEEPDEEP;
-   LPC_SC->PCON &= ~LPC1768_PCON_PM1;
-   LPC_SC->PCON |= LPC1768_PCON_PM0;
-   __WFI();
-   //reset back to normal
-  LPC_SC->PCON &= ~(LPC1768_PCON_PM1 | LPC1768_PCON_PM0);
-}
-
-//"Deep Power-Down" Mode
-inline void DeepPowerDown(void)
-{
-   SCB->SCR |= LPC1768_SCR_SLEEPDEEP;
-   LPC_SC->PCON |= LPC1768_PCON_PM1 | LPC1768_PCON_PM0;
-   __WFI();
-   //reset back to normal
-  LPC_SC->PCON &= ~(LPC1768_PCON_PM1 | LPC1768_PCON_PM0);
-}
-
-//shut down BOD during power-down/deep sleep
-inline void BrownOut_ReducedPowerMode_Enable(void)
-{
-    LPC_SC->PCON |= LPC1768_PCON_BODRPM;
-}
-
-//turn on BOD during power-down/deep sleep
-inline void BrownOut_ReducedPowerMode_Disable(void)
-{
-    LPC_SC->PCON &= ~LPC1768_PCON_BODRPM;
-}
-
-//turn off brown out circutry
-inline void BrownOut_Global_Disable(void)
-{
-    LPC_SC->PCON |= LPC1768_PCON_BOGD;
-}
-
-//turn on brown out circutry
-inline void BrownOut_Global_Enable(void)
-{
-    LPC_SC->PCON &= !LPC1768_PCON_BOGD;
-}
-
-//turn off brown out reset circutry
-inline void BrownOut_Reset_Disable(void)
-{
-    LPC_SC->PCON |= LPC1768_PCON_BORD;
-}
-
-//turn on brown outreset  circutry
-inline void BrownOut_Reset_Enable(void)
-{
-    LPC_SC->PCON &= ~LPC1768_PCON_BORD;
-}
-//Peripheral Control Register
-// bit 0: Reserved
-// bit 1: PCTIM0: Timer/Counter 0 power/clock enable
-#define LPC1768_PCONP_PCTIM0        0x2
-// bit 2: PCTIM1: Timer/Counter 1 power/clock enable
-#define LPC1768_PCONP_PCTIM1        0x4
-// bit 3: PCUART0: UART 0 power/clock enable
-#define LPC1768_PCONP_PCUART0       0x8
-// bit 4: PCUART1: UART 1 power/clock enable
-#define LPC1768_PCONP_PCUART1       0x10
-// bit 5: Reserved
-// bit 6: PCPWM1: PWM 1 power/clock enable
-#define LPC1768_PCONP_PCPWM1        0x40
-// bit 7: PCI2C0: I2C interface 0 power/clock enable
-#define LPC1768_PCONP_PCI2C0        0x80
-// bit 8: PCSPI: SPI interface power/clock enable
-#define LPC1768_PCONP_PCSPI         0x100
-// bit 9: PCRTC: RTC power/clock enable
-#define LPC1768_PCONP_PCRTC         0x200
-// bit 10: PCSSP1: SSP interface 1 power/clock enable
-#define LPC1768_PCONP_PCSSP1        0x400
-// bit 11: Reserved
-// bit 12: PCADC: A/D converter power/clock enable
-#define LPC1768_PCONP_PCADC         0x1000
-// bit 13: PCCAN1: CAN controller 1 power/clock enable
-#define LPC1768_PCONP_PCCAN1        0x2000
-// bit 14: PCCAN2: CAN controller 2 power/clock enable
-#define LPC1768_PCONP_PCCAN2        0x4000
-// bit 15: PCGPIO: GPIOs power/clock enable
-#define LPC1768_PCONP_PCGPIO        0x8000
-// bit 16: PCRIT: Repetitive interrupt timer power/clock enable
-#define LPC1768_PCONP_PCRIT         0x10000
-// bit 17: PCMCPWM: Motor control PWM power/clock enable
-#define LPC1768_PCONP_PCMCPWM       0x20000
-// bit 18: PCQEI: Quadrature encoder interface power/clock enable
-#define LPC1768_PCONP_PCQEI         0x40000
-// bit 19: PCI2C1: I2C interface 1 power/clock enable
-#define LPC1768_PCONP_PCI2C1        0x80000
-// bit 20: Reserved
-// bit 21: PCSSP0: SSP interface 0 power/clock enable
-#define LPC1768_PCONP_PCSSP0        0x200000
-// bit 22: PCTIM2: Timer 2 power/clock enable
-#define LPC1768_PCONP_PCTIM2        0x400000
-// bit 23: PCTIM3: Timer 3 power/clock enable
-#define LPC1768_PCONP_PCQTIM3       0x800000
-// bit 24: PCUART2: UART 2 power/clock enable
-#define LPC1768_PCONP_PCUART2       0x1000000
-// bit 25: PCUART3: UART 3 power/clock enable
-#define LPC1768_PCONP_PCUART3       0x2000000
-// bit 26: PCI2C2: I2C interface 2 power/clock enable
-#define LPC1768_PCONP_PCI2C2        0x4000000
-// bit 27: PCI2S: I2S interface power/clock enable
-#define LPC1768_PCONP_PCI2S         0x8000000
-// bit 28: Reserved
-// bit 29: PCGPDMA: GP DMA function power/clock enable
-#define LPC1768_PCONP_PCGPDMA       0x20000000
-// bit 30: PCENET: Ethernet block power/clock enable
-#define LPC1768_PCONP_PCENET        0x40000000
-// bit 31: PCUSB: USB interface power/clock enable
-#define LPC1768_PCONP_PCUSB         0x80000000
-
-//Powers Up specified Peripheral(s)
-inline unsigned int Peripheral_PowerUp(unsigned int bitMask)
-{
-    return LPC_SC->PCONP |= bitMask;
-}   
-
-//Powers Down specified Peripheral(s) 
-inline unsigned int Peripheral_PowerDown(unsigned int bitMask)
-{
-    return LPC_SC->PCONP &= ~bitMask;
-}
-
-//returns if the peripheral is on or off
-inline bool Peripheral_GetStatus(unsigned int peripheral)
-{
-    return (LPC_SC->PCONP & peripheral) ? true : false;
-}
-
-#endif
\ No newline at end of file

--- a/SDHCFileSystem.lib	Mon Dec 17 02:57:31 2012 +0000
+++ b/SDHCFileSystem.lib	Sun Dec 23 22:57:52 2012 +0000
@@ -1,1 +1,1 @@
-SDHCFileSystem#1efbf75bd807
+SDHCFileSystem#243ee5f47c25

--- a/main.cpp	Mon Dec 17 02:57:31 2012 +0000
+++ b/main.cpp	Sun Dec 23 22:57:52 2012 +0000
@@ -81,13 +81,11 @@
 #include "mbed.h"
 #include "CAN.h"
 #include "SDHCFileSystem.h"
-#include "PowerControl/PowerControl.h"
-#include "PowerControl/EthernetPowerControl.h"
 
 #define upLine "\033[1A"
 #define maxBufLen 2048
 #define canTimeout 5
-#define maxFileNum 100
+#define maxFileNum 30
 
 void Log (char *message);
 void LogErr (char *message);
@@ -115,7 +113,7 @@
 char sTemp[35] ;
 volatile int writePointer = 0;
 volatile int secsIdle = canTimeout;
-volatile bool canIdle = true;
+volatile bool canIdle = false;
 Serial pc(USBTX, USBRX);
 
 extern "C" void RTC_IRQHandler() {
@@ -323,7 +321,9 @@
                     pc.printf("\nStarting Can Log %s\n",fileName);
                     // write full timestamp
                     logTS();
+                    //set_timestamp(file,2012,12,23,11,11,11);
                     fclose(file);
+                    wait(1);
                 }
             } // if (!logOpen)
             do {