Merge pull request #3 from mbedmicro/master

Update my fork with original

Author: modtronix-com

README.md

@@ -30,6 +30,7 @@ NXP:
 * [mbed LPC11U24](http://developer.mbed.org/platforms/mbed-LPC11U24/) (Cortex-M0)
 * [EA LPC11U35](http://developer.mbed.org/platforms/EA-LPC11U35/) (Cortex-M0)
 * mbed LPC2368 (ARM7TDMI-S)
+* LPC2460 (ARM7TDMI-S)
 * LPC810 (Cortex-M0+)
 * [LPC812](http://developer.mbed.org/platforms/NXP-LPC800-MAX/) (Cortex-M0+)
 * [EA LPC4088](http://developer.mbed.org/platforms/EA-LPC4088/) (Cortex-M4F)

libraries/USBDevice/USBDevice/USBEndpoints.h

@@ -37,7 +37,7 @@ typedef enum {
 } EP_STATUS;
 
 /* Include configuration for specific target */
-#if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC4088_DM)
+#if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC4088) || defined(TARGET_LPC2460) || defined(TARGET_LPC4088_DM)
 #include "USBEndpoints_LPC17_LPC23.h"
 #elif defined(TARGET_LPC11UXX) || defined(TARGET_LPC1347) || defined (TARGET_LPC11U6X) || defined (TARGET_LPC1549)
 #include "USBEndpoints_LPC11U.h"

libraries/USBDevice/USBDevice/USBEndpoints_Maxim.h

@@ -85,6 +85,10 @@
 #define EPINT_IN    (EP4IN)
 #define EPINT_OUT_callback    EP3_OUT_callback
 #define EPINT_IN_callback     EP4_IN_callback
+/* Isochronous endpoints */
+/* NOT SUPPORTED - use invalid endpoint number to prevent built errors */
+#define EPISO_OUT   (EP0OUT)
+#define EPISO_IN    (EP0IN)
 
 #define MAX_PACKET_SIZE_EPBULK  (64)
 #define MAX_PACKET_SIZE_EPINT   (64)

libraries/USBDevice/USBDevice/USBHAL_LPC17.cpp

@@ -16,7 +16,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#if defined(TARGET_LPC1768) || defined(TARGET_LPC2368)
+#if defined(TARGET_LPC1768) || defined(TARGET_LPC2368) || defined(TARGET_LPC2460)
 
 #include "USBHAL.h"
 

libraries/USBDevice/USBSerial/CircBuffer.h

@@ -57,7 +57,7 @@ class CircBuffer {
     volatile uint16_t write;
     volatile uint16_t read;
     static const int size = Size+1;  //a modern optimizer should be able to remove this so it uses no ram.
-    T buf[Size];
+    T buf[Size+1];
 };
 
 #endif

libraries/USBHost/USBHost/USBHALHost_LPC17.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#if defined(TARGET_LPC1768)
+#if defined(TARGET_LPC1768) || defined(TARGET_LPC2460)
 
 #include "mbed.h"
 #include "USBHALHost.h"

libraries/mbed/api/CircularBuffer.h

@@ -88,9 +88,9 @@ class CircularBuffer {
 
 private:
     T _pool[BufferSize];
-    CounterType _head;
-    CounterType _tail;
-    bool _full;
+    volatile CounterType _head;
+    volatile CounterType _tail;
+    volatile bool _full;
 };
 
 }

libraries/mbed/api/SPI.h

@@ -45,10 +45,21 @@ namespace mbed {
  *
  * #include "mbed.h"
  *
+ * // hardware ssel (where applicable)
+ * //SPI device(p5, p6, p7, p8); // mosi, miso, sclk, ssel
+ *
+ * // software ssel
  * SPI device(p5, p6, p7); // mosi, miso, sclk
+ * DigitalOut cs(p8); // ssel
  *
  * int main() {
+ *     // hardware ssel (where applicable)
+ *     //int response = device.write(0xFF);
+ *
+ *     // software ssel
+ *     cs = 0;
  *     int response = device.write(0xFF);
+ *     cs = 1;
  * }
  * @endcode
  */
@@ -57,17 +68,15 @@ class SPI {
 public:
 
     /** Create a SPI master connected to the specified pins
-     *
-     * Pin Options:
-     *  (5, 6, 7) or (11, 12, 13)
      *
      *  mosi or miso can be specfied as NC if not used
      *
      *  @param mosi SPI Master Out, Slave In pin
      *  @param miso SPI Master In, Slave Out pin
      *  @param sclk SPI Clock pin
+     *  @param ssel SPI chip select pin
      */
-    SPI(PinName mosi, PinName miso, PinName sclk, PinName _unused=NC);
+    SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel=NC);
 
     /** Configure the data transmission format
      *

libraries/mbed/api/SPISlave.h

@@ -53,17 +53,13 @@ class SPISlave {
 public:
 
     /** Create a SPI slave connected to the specified pins
-     *
-     * Pin Options:
-     *  (5, 6, 7i, 8) or (11, 12, 13, 14)
      *
      *  mosi or miso can be specfied as NC if not used
      *
      *  @param mosi SPI Master Out, Slave In pin
      *  @param miso SPI Master In, Slave Out pin
      *  @param sclk SPI Clock pin
      *  @param ssel SPI chip select pin
-     *  @param name (optional) A string to identify the object
      */
     SPISlave(PinName mosi, PinName miso, PinName sclk, PinName ssel);
 

libraries/mbed/api/Ticker.h

@@ -60,7 +60,7 @@ class Ticker : public TimerEvent {
     Ticker() : TimerEvent() {
     }
 
-    Ticker(const ticker_data_t *const data) : TimerEvent(data) {
+    Ticker(const ticker_data_t *data) : TimerEvent(data) {
     }
 
     /** Attach a function to be called by the Ticker, specifiying the interval in seconds

libraries/mbed/api/Timer.h

@@ -46,7 +46,7 @@ class Timer {
 
 public:
     Timer();
-    Timer(const ticker_data_t *const data);
+    Timer(const ticker_data_t *data);
 
     /** Start the timer
      */
@@ -83,7 +83,7 @@ class Timer {
     int _running;          // whether the timer is running
     unsigned int _start;   // the start time of the latest slice
     int _time;             // any accumulated time from previous slices
-    const ticker_data_t *const _ticker_data;
+    const ticker_data_t *_ticker_data;
 };
 
 } // namespace mbed

libraries/mbed/api/TimerEvent.h

@@ -47,7 +47,7 @@ class TimerEvent {
 
     ticker_event_t event;
 
-    const ticker_data_t *const _ticker_data;
+    const ticker_data_t *_ticker_data;
 };
 
 } // namespace mbed

libraries/mbed/api/mbed.h

@@ -16,7 +16,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 99
+#define MBED_LIBRARY_VERSION 100
 
 #include "platform.h"
 

libraries/mbed/common/SPI.cpp

@@ -23,7 +23,7 @@ namespace mbed {
 CircularBuffer<Transaction<SPI>, TRANSACTION_QUEUE_SIZE_SPI> SPI::_transaction_buffer;
 #endif
 
-SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName _unused) :
+SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel) :
         _spi(),
 #if DEVICE_SPI_ASYNCH
         _irq(this),
@@ -32,7 +32,7 @@ SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName _unused) :
         _bits(8),
         _mode(0),
         _hz(1000000) {
-    spi_init(&_spi, mosi, miso, sclk, NC);
+    spi_init(&_spi, mosi, miso, sclk, ssel);
     spi_format(&_spi, _bits, _mode, 0);
     spi_frequency(&_spi, _hz);
 }

libraries/mbed/common/Timer.cpp

@@ -23,7 +23,7 @@ Timer::Timer() : _running(), _start(), _time(), _ticker_data(get_us_ticker_data(
     reset();
 }
 
-Timer::Timer(const ticker_data_t *const data) : _running(), _start(), _time(), _ticker_data(data) {
+Timer::Timer(const ticker_data_t *data) : _running(), _start(), _time(), _ticker_data(data) {
     reset();
 }