Revision 12:f63353af7be8, committed 2009-09-03

Comitter:

rolf.meyer@arm.com

Date:

Thu Sep 03 18:03:51 2009 +0000

Parent:

11:1c1ebd0324fa

Child:

13:a0336ede94ce

Commit message:

Some missing changes ;-)

Changed in this revision

--- a/CAN.h	Fri Aug 28 12:10:11 2009 +0000
+++ b/CAN.h	Thu Sep 03 18:03:51 2009 +0000
@@ -111,7 +111,6 @@
      *
      * Example:
      * > #include "mbed.h"
-     * > #include "CAN.h"
      * > 
      * > Ticker ticker;
      * > DigitalOut led1(LED1);

--- a/I2C.h	Fri Aug 28 12:10:11 2009 +0000
+++ b/I2C.h	Thu Sep 03 18:03:51 2009 +0000
@@ -24,10 +24,9 @@
  * > I2C i2c(p28, p27);
  * >
  * > int main() {
- * >     int address = 0x1234;
+ * >     int address = 0x62;
  * >     char data[2];
- * >     i2c.read(address,data,2);
- * >     // ...
+ * >     i2c.read(address, data, 2);
  * > }
  */
 class I2C : public Base {
@@ -54,22 +53,28 @@
     /* Function: read
      *  Read from an I2C slave
      *
+     * Performs a complete read transaction. The bottom bit of
+     * the address is forced to 1 to indicate a read.
+     *
      * Variables:
-     *  address - 7-bit I2C slave address (0-127)
+     *  address - 8-bit I2C slave address [ addr | 1 ]
      *  data - Pointer to the byte-array to read data in to 
      *  length - Number of bytes to read
-     *  returns - 0 on success (ack), or 1 on failure (nack)
+     *  returns - 0 on success (ack), or non-0 on failure (nack)
      */ 
     int read(int address, char *data, int length); 
 
     /* Function: write
      *  Write to an I2C slave
      *
+     * Performs a complete write transaction. The bottom bit of
+     * the address is forced to 0 to indicate a write.
+     *
      * Variables:
-     *  address - 7-bit I2C slave address (0-127)
+     *  address - 8-bit I2C slave address [ addr | 0 ]
      *  data - Pointer to the byte-array data to send 
      *  length - Number of bytes to send
-     *  returns - 0 on success (ack), or 1 on failure (nack)
+     *  returns - 0 on success (ack), or non-0 on failure (nack)
      */ 
     int write(int address, const char *data, int length);
     

--- a/LPC1768/LPC1768.sct	Fri Aug 28 12:10:11 2009 +0000
+++ b/LPC1768/LPC1768.sct	Thu Sep 03 18:03:51 2009 +0000
@@ -5,8 +5,17 @@
    *(InRoot$$Sections)
    .ANY (+RO)
   }
-  RW_IRAM1 0x10000000 0x8000  {  ; RW data
+  RW_IRAM1 0x10000000 0x8000  {  ; RW data, Application data
    .ANY (+RW +ZI)
   }
+  RW_IRAM2 0x2007C000 0x4000  {  ; RW data, USB RAM
+   .ANY (AHBSRAM0)
+  }
+  RW_IRAM3 0x20080000 0x4000  {  ; RW data, ETH RAM
+   .ANY (AHBSRAM1)
+  }
+  RW_IRAM4 0x40038000 0x0800  {  ; RW data, CAN RAM
+   .ANY (CANRAM)
+  }
 }
 

Binary file LPC1768/core_cm3.o has changed

Binary file LPC1768/mbed.ar has changed

Binary file LPC1768/mbed_capi.ar has changed

Binary file LPC1768/stackheap.o has changed

Binary file LPC1768/system_LPC17xx.o has changed

--- a/LPC2368/LPC2368.sct	Fri Aug 28 12:10:11 2009 +0000
+++ b/LPC2368/LPC2368.sct	Thu Sep 03 18:03:51 2009 +0000
@@ -8,5 +8,17 @@
   RW_IRAM1 0x40000120 0x7EE0  {  ; RW data, inc space for realmonitor
    .ANY (+RW +ZI)
   }
+  RW_IRAM2 0x7FD00000 0x2000  {  ; RW data, USB RAM
+   .ANY (AHBSRAM0)
+  }
+  RW_IRAM3 0x7FE00000 0x4000  {  ; RW data, ETH RAM
+   .ANY (AHBSRAM1)
+  }
+  RW_IRAM4 0xE0038000 0x0800  {  ; RW data, CAN RAM
+   .ANY (CANRAM)
+  }
+  RW_IRAM5 0xE0084000 0x0800  {  ; RW data, RTC RAM
+   .ANY (RTCRAM)
+  }
 }
 

Binary file LPC2368/core_arm7.o has changed

Binary file LPC2368/mbed.ar has changed

Binary file LPC2368/mbed_capi.ar has changed

Binary file LPC2368/stackheap.o has changed

Binary file LPC2368/system_LPC23xx.o has changed

Binary file LPC2368/vector_realmonitor.o has changed

--- a/mbed.h	Fri Aug 28 12:10:11 2009 +0000
+++ b/mbed.h	Thu Sep 03 18:03:51 2009 +0000
@@ -6,7 +6,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 12
+#define MBED_LIBRARY_VERSION 13
  
 // Useful C libraries
 #include <stdio.h>
@@ -19,6 +19,7 @@
 // mbed Debug libraries
 //#include "Debug.h"
 //#include "stackheap.h"
+#include "error.h"
 
 // mbed Peripheral components
 #include "DigitalIn.h"
@@ -35,7 +36,6 @@
 //#include "SPI3.h"
 #include "I2C.h"
 #include "Ethernet.h"
-#include "CAN.h"
 
 // mbed Internal components
 #include "Timer.h"