Reverting commits between `git merge-head master refactor` and master.

This is a combination of 11 revert commits, and allows for a clean
merge of the work done in the refactor branch.

The combined commit messages follow.

Revert "Committing basic ring_buffer test."

This reverts commit 987fa5f433e0cd41b1621dad8b4e331cf82d49f3.

Revert "qa-slave-shield.cpp and test-session.cpp fixes for Mini and RET6 Edition."

This reverts commit cdd367bdd264c9e19180032c119850fbba2115ba.

Revert "Brought examples/ up to date; PIN_MAP bugfix for D24."

This reverts commit b4c2d4514c6d52cac8a649c5d5c24b68a3c0a416.

Revert "Separated GPIO config to a separate FSMC routine."

This reverts commit 744848ad0fc33eed66acc44e41c3c9d646c5b100.

Revert "Slightly faster RAM writes (6.5MHz)."

This reverts commit 8ba0b6bb065acb4aff26bc9c838de5f37515caf1.

Revert "FSMC working but slow (~6 MHz)."

This reverts commit 0dc9490cf4f4f10a23b08fef1728773f10c1b76a.

Revert "Maple Mini ERROR_LED_PIN fix."

This reverts commit 07d437706840901db1e09ff0ab88229c67c1fa8a.

Revert "Fixing USBSerial::read(void*, uint32) return value (thanks, Crenn!)"

This reverts commit 3ba7196712a5bfe4fe1166b6c34d49c3d7254568.

Revert "Trivial gpio_init() bugfix"

This reverts commit f6ce003bb935f26eeefa54acf7c2ae6afaabd871.

Revert "Trivial changes to test-session.cpp"

This reverts commit a32a37b121ac7e62660d2a83fe67c857fe705122.

Revert ".gitignore: Ignore cscope* files"

This reverts commit d8c72c17bd6d7416a0846e69f4f5ae5cb229d58e.

2 files changed, 4 insertions, 106 deletions

diff --git a/wirish/boards.h b/wirish/boards.h
index 98c58ef..f8505ab 100644
--- a/wirish/boards.h
+++ b/wirish/boards.h
@@ -134,7 +134,7 @@ typedef struct PinMapping {
         /* D23/PC15 */
         {GPIOC_BASE, 15, ADC_INVALID,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
         /* D24/PB9 */
-        {GPIOB_BASE,  9, ADC_INVALID, TIMER4_CH4_CCR,  EXTI_CONFIG_PORTB, TIMER4,                    4},
+        {GPIOB_BASE,  9, ADC_INVALID, TIMER4_CH4_CCR,  EXTI_CONFIG_PORTB, TIMER_INVALID, TIMER_INVALID},
         /* D25/PD2 */
         {GPIOD_BASE,  2, ADC_INVALID,              0,  EXTI_CONFIG_PORTD, TIMER_INVALID, TIMER_INVALID},
         /* D26/PC10 */
@@ -480,108 +480,6 @@ typedef struct PinMapping {
             *AFIO_MAPR = (*AFIO_MAPR | BIT(26)) & ~(BIT(25) | BIT(24)); \
         } while (0)
 
-#elif defined(BOARD_maple_RET6)
-
-    // Just like Maple, except PC6 -- PC9 have Timer 8 capture/compare
-    // channels 1 -- 4 hooked up (which makes PC9 an unfortunate
-    // choice for the button).
-
-    #define CYCLES_PER_MICROSECOND  72
-    #define SYSTICK_RELOAD_VAL      71999 /* takes a cycle to reload */
-
-    #define BOARD_BUTTON_PIN   38
-    #define BOARD_LED_PIN      13
-
-    static __attribute__ ((unused)) PinMapping PIN_MAP[NR_GPIO_PINS] = {
-        /* D0/PA3 */
-        {GPIOA_BASE,  3,        ADC3, TIMER2_CH4_CCR,  EXTI_CONFIG_PORTA, TIMER2, 4},
-        /* D1/PA2 */
-        {GPIOA_BASE,  2,        ADC2, TIMER2_CH3_CCR,  EXTI_CONFIG_PORTA, TIMER2, 3},
-        /* D2/PA0 */
-        {GPIOA_BASE,  0,        ADC0, TIMER2_CH1_CCR,  EXTI_CONFIG_PORTA, TIMER2, 1},
-        /* D3/PA1 */
-        {GPIOA_BASE,  1,        ADC1, TIMER2_CH2_CCR,  EXTI_CONFIG_PORTA, TIMER2, 2},
-        /* D4/PB5 */
-        {GPIOB_BASE,  5, ADC_INVALID,              0,  EXTI_CONFIG_PORTB, TIMER_INVALID, TIMER_INVALID},
-        /* D5/PB6 */
-        {GPIOB_BASE,  6, ADC_INVALID, TIMER4_CH1_CCR,  EXTI_CONFIG_PORTB, TIMER4, 1},
-        /* D6/PA8 */
-        {GPIOA_BASE,  8, ADC_INVALID, TIMER1_CH1_CCR,  EXTI_CONFIG_PORTA, TIMER1, 1},
-        /* D7/PA9 */
-        {GPIOA_BASE,  9, ADC_INVALID, TIMER1_CH2_CCR,  EXTI_CONFIG_PORTA, TIMER1, 2},
-        /* D8/PA10 */
-        {GPIOA_BASE, 10, ADC_INVALID, TIMER1_CH3_CCR,  EXTI_CONFIG_PORTA, TIMER1, 3},
-        /* D9/PB7 */
-        {GPIOB_BASE,  7, ADC_INVALID, TIMER4_CH2_CCR,  EXTI_CONFIG_PORTB, TIMER4, 2},
-        /* D10/PA4 */
-        {GPIOA_BASE,  4,        ADC4,              0,  EXTI_CONFIG_PORTA, TIMER_INVALID, TIMER_INVALID},
-        /* D11/PA7 */
-        {GPIOA_BASE,  7,        ADC7, TIMER3_CH2_CCR,  EXTI_CONFIG_PORTA, TIMER3, 2},
-        /* D12/PA6 */
-        {GPIOA_BASE,  6,        ADC6, TIMER3_CH1_CCR,  EXTI_CONFIG_PORTA, TIMER3, 1},
-        /* D13/PA5 */
-        {GPIOA_BASE,  5,        ADC5,              0,  EXTI_CONFIG_PORTA, TIMER_INVALID, TIMER_INVALID},
-        /* D14/PB8 */
-        {GPIOB_BASE,  8, ADC_INVALID, TIMER4_CH3_CCR,  EXTI_CONFIG_PORTB, TIMER4, 3},
-
-        /* Little header */
-
-        /* D15/PC0 */
-        {GPIOC_BASE,  0,       ADC10,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D16/PC1 */
-        {GPIOC_BASE,  1,       ADC11,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D17/PC2 */
-        {GPIOC_BASE,  2,       ADC12,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D18/PC3 */
-        {GPIOC_BASE,  3,       ADC13,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D19/PC4 */
-        {GPIOC_BASE,  4,       ADC14,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D20/PC5 */
-        {GPIOC_BASE,  5,       ADC15,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-
-        /* External header */
-
-        /* D21/PC13 */
-        {GPIOC_BASE, 13, ADC_INVALID,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D22/PC14 */
-        {GPIOC_BASE, 14, ADC_INVALID,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D23/PC15 */
-        {GPIOC_BASE, 15, ADC_INVALID,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D24/PB9 */
-        {GPIOB_BASE,  9, ADC_INVALID, TIMER4_CH4_CCR,  EXTI_CONFIG_PORTB, TIMER4,                    4},
-        /* D25/PD2 */
-        {GPIOD_BASE,  2, ADC_INVALID,              0,  EXTI_CONFIG_PORTD, TIMER_INVALID, TIMER_INVALID},
-        /* D26/PC10 */
-        {GPIOC_BASE, 10, ADC_INVALID,              0,  EXTI_CONFIG_PORTC, TIMER_INVALID, TIMER_INVALID},
-        /* D27/PB0 */
-        {GPIOB_BASE,  0,        ADC8, TIMER3_CH3_CCR,  EXTI_CONFIG_PORTB, TIMER3, 3},
-        /* D28/PB1 */
-        {GPIOB_BASE,  1,        ADC9, TIMER3_CH4_CCR,  EXTI_CONFIG_PORTB, TIMER3, 4},
-        /* D29/PB10 */
-        {GPIOB_BASE, 10, ADC_INVALID,              0,  EXTI_CONFIG_PORTB, TIMER_INVALID, TIMER_INVALID},
-        /* D30/PB11 */
-        {GPIOB_BASE, 11, ADC_INVALID,              0,  EXTI_CONFIG_PORTB, TIMER_INVALID, TIMER_INVALID},
-        /* D31/PB12 */
-        {GPIOB_BASE, 12, ADC_INVALID,              0,  EXTI_CONFIG_PORTB, TIMER_INVALID, TIMER_INVALID},
-        /* D32/PB13 */
-        {GPIOB_BASE, 13, ADC_INVALID,              0,  EXTI_CONFIG_PORTB, TIMER_INVALID, TIMER_INVALID},
-        /* D33/PB14 */
-        {GPIOB_BASE, 14, ADC_INVALID,              0,  EXTI_CONFIG_PORTB, TIMER_INVALID, TIMER_INVALID},
-        /* D34/PB15 */
-        {GPIOB_BASE, 15, ADC_INVALID,              0,  EXTI_CONFIG_PORTB, TIMER_INVALID, TIMER_INVALID},
-        /* D35/PC6 */
-        {GPIOC_BASE,  6, ADC_INVALID, TIMER8_CH1_CCR,  EXTI_CONFIG_PORTC,        TIMER8,             1},
-        /* D36/PC7 */
-        {GPIOC_BASE,  7, ADC_INVALID, TIMER8_CH2_CCR,  EXTI_CONFIG_PORTC,        TIMER8,             2},
-        /* D37/PC8 */
-        {GPIOC_BASE,  8, ADC_INVALID, TIMER8_CH3_CCR,  EXTI_CONFIG_PORTC,        TIMER8,             3},
-        /* D38/PC9 (BUT) */
-        {GPIOC_BASE,  9, ADC_INVALID, TIMER8_CH4_CCR,  EXTI_CONFIG_PORTC,        TIMER8,             4}
-    };
-
-    #define BOARD_INIT do {                           \
-        } while(0)
-
 #else
 
 #error "Board type has not been selected correctly."
diff --git a/wirish/usb_serial.cpp b/wirish/usb_serial.cpp
index e2751a2..e2cdee3 100644
--- a/wirish/usb_serial.cpp
+++ b/wirish/usb_serial.cpp
@@ -103,18 +103,18 @@ uint32 USBSerial::available(void) {
 
 /* blocks forever until len_bytes is received */
 uint32 USBSerial::read(void *buf, uint32 len) {
-    if (buf == 0) {
+    if (!buf) {
         return 0;
     }
 
     uint32 bytes_in = 0;
     while (len > 0) {
-        uint32 new_bytes = usbReceiveBytes((uint8*)buf + bytes_in, len);
+        uint32 new_bytes = usbReceiveBytes((uint8*)((uint8*)buf+bytes_in), len);
         len -= new_bytes;
         bytes_in += new_bytes;
     }
 
-    return bytes_in;
+    return len;
 }
 
 /* blocks forever until 1 byte is received */