Merge pull request #8 from mbedmicro/master

Synd with master (27 April 2015)

Author: PrzemekWirkus

.travis.yml

@@ -1,8 +1,9 @@
---- 
-python: 
+---
+python:
   - "2.7"
 script: "python workspace_tools/build_travis.py"
 install:
   - "sudo $TRAVIS_BUILD_DIR/travis/install_dependencies.sh > /dev/null"
   - sudo pip install colorama
-  - sudo pip install prettytable
+  - sudo pip install prettytable
+  - sudo pip install jinja2

CONTRIBUTING.md

@@ -10,6 +10,8 @@ You can for example read more in our ```docs``` section in [mbedmicro/mbed/doc](
 # How to contribute
 We really appreciate your contributions! We are Open Source project and we need your help. We want to keep it as easy as possible to contribute changes that get things working in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
 
+Before a pull request will be merged, the [mbed Contributor Agreement](http://developer.mbed.org/contributor_agreement/) must be signed.
+
 You can pick up existing [mbed GitHub Issue](https://github.com/mbedmicro/mbed/issues) and solve it or implement new feature you find important, attractive or just necessary. We will review your proposal via pull request mechanism, give you comments and merge your changes if we decide your contribution satisfy criteria such as quality.
 
 # Enhancements vs Bugs

libraries/USBDevice/USBAudio/USBAudio.cpp

@@ -119,7 +119,7 @@ float USBAudio::getVolume() {
 }
 
 
-bool USBAudio::EP3_OUT_callback() {
+bool USBAudio::EPISO_OUT_callback() {
     uint32_t size = 0;
     interruptOUT = true;
     if (buf_stream_in != NULL) {
@@ -132,7 +132,7 @@ bool USBAudio::EP3_OUT_callback() {
 }
 
 
-bool USBAudio::EP3_IN_callback() {
+bool USBAudio::EPISO_IN_callback() {
     interruptIN = true;
     writeIN = true;
     return true;

libraries/USBDevice/USBAudio/USBAudio.h

@@ -216,12 +216,12 @@ class USBAudio: public USBDevice {
     /*
     * Callback called when a packet is received
     */
-    virtual bool EP3_OUT_callback();
+    virtual bool EPISO_OUT_callback();
 
     /*
     * Callback called when a packet has been sent
     */
-    virtual bool EP3_IN_callback();
+    virtual bool EPISO_IN_callback();
 
 private:
 

libraries/USBDevice/USBDevice/TARGET_RENESAS/TARGET_RZ_A1H/inc/devdrv_usb_function_api.h

@@ -36,9 +36,7 @@ Includes   <System Includes> , "Project Includes"
 #include <MBRZA1H.h>
 #include "r_typedefs.h"
 #include "usb0_function_api.h"
-#if 0
 #include "usb1_function_api.h"
-#endif
 
 
 #ifdef __cplusplus