From 5df53a5274cb29fd66aecdbb06f49c1d0369476d Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Mon, 9 May 2011 16:35:13 -0400
Subject: 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.
---
 examples/test-ring-buffer-insertion.cpp | 114 --------------------------------
 1 file changed, 114 deletions(-)
 delete mode 100644 examples/test-ring-buffer-insertion.cpp

(limited to 'examples/test-ring-buffer-insertion.cpp')

diff --git a/examples/test-ring-buffer-insertion.cpp b/examples/test-ring-buffer-insertion.cpp
deleted file mode 100644
index 8372a96..0000000
--- a/examples/test-ring-buffer-insertion.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Simple ring_buffer test.
- *
- * Does a basic test of functionality on rb_full_count(), rb_reset(),
- * rb_push_insert(), and rb_safe_insert().
- *
- * To test (no external hardware required):
- *
- *     - Connect a serial monitor to SerialUSB
- *     - Press any key
- *
- * This file is released into the public domain.
- */
-
-#include "wirish.h"
-
-#include "ring_buffer.h"
-
-#define BUF_SIZE 64
-ring_buffer ring_buf;
-ring_buffer *rb;
-uint8 rb_buffer[BUF_SIZE];
-
-void test_rb_push_insert(int num_bytes_to_insert);
-void test_rb_safe_insert(int num_bytes_to_insert);
-void test_rb_insertion_function(int num_bytes_to_insert,
-                                int (*insertion_fn)(ring_buffer*, uint8),
-                                const char insertion_fn_name[]);
-void print_rb_contents(void);
-
-void setup() {
-    rb = &ring_buf;
-    rb_init(rb, BUF_SIZE, rb_buffer);
-
-    while (!SerialUSB.available())
-        ;
-
-    SerialUSB.println("Beginning test.");
-    SerialUSB.println();
-}
-
-void loop() {
-    test_rb_push_insert(63);
-    SerialUSB.println("------------------------------");
-    test_rb_push_insert(64);
-    SerialUSB.println("------------------------------");
-    test_rb_safe_insert(63);
-    SerialUSB.println("------------------------------");
-    test_rb_safe_insert(64);
-    SerialUSB.println("------------------------------");
-
-    SerialUSB.println();
-    SerialUSB.println("Test finished.");
-    while (true)
-        ;
-}
-
-void test_rb_push_insert(int num_bytes_to_insert) {
-    test_rb_insertion_function(num_bytes_to_insert,
-                               rb_push_insert,
-                               "rb_push_insert()");
-}
-
-void test_rb_safe_insert(int num_bytes_to_insert) {
-    test_rb_insertion_function(num_bytes_to_insert,
-                               rb_safe_insert,
-                               "rb_safe_insert()");
-}
-
-void test_rb_insertion_function(int num_bytes_to_insert,
-                                int (*insertion_fn)(ring_buffer *, uint8),
-                                const char insertion_fn_name[]) {
-    SerialUSB.println("resetting ring buffer.");
-    rb_reset(rb);
-    print_rb_contents();
-
-    SerialUSB.print(insertion_fn_name);
-    SerialUSB.print("-ing ");
-    SerialUSB.print(num_bytes_to_insert);
-    SerialUSB.println(" bytes.");
-    for (uint8 i = 1; i <= num_bytes_to_insert; i++)
-        insertion_fn(rb, i);
-
-    uint16 count = rb_full_count(rb);
-    SerialUSB.print("rb_full_count(rb) = ");
-    SerialUSB.println(count);
-
-    print_rb_contents();
-}
-
-void print_rb_contents() {
-    uint16 count = rb_full_count(rb);
-    SerialUSB.print("ring buffer contents: ");
-    for (uint16 i = 0; i < count; i++) {
-        SerialUSB.print((int)rb_remove(rb));
-        if (i < count - 1) SerialUSB.print(", ");
-    }
-    SerialUSB.println();
-}
-
-// Force init to be called *first*, i.e. before static object allocation.
-// Otherwise, statically allocated objects that need libmaple may fail.
-__attribute__((constructor)) void premain() {
-    init();
-}
-
-int main(void) {
-    setup();
-
-    while (true) {
-        loop();
-    }
-    return 0;
-}
-- 
cgit v1.2.3