Added licensing. Moved lots of header files around. Added HardwareSerial reads, writes. Tweaked some of the util and assert functions. Added various useful routines for printing stuff to the serial port. Continued moving out stm32lib. Slightly more consistent naming, this will come in another change.

git-svn-id: https://leaflabs.googlecode.com/svn/trunk/library@74 749a229e-a60e-11de-b98f-4500b42dc123

1 files changed, 46 insertions, 2 deletions

diff --git a/src/lib/gpio.c b/src/lib/gpio.c
index db511c4..1e42d4d 100644
--- a/src/lib/gpio.c
+++ b/src/lib/gpio.c
@@ -1,7 +1,35 @@
-#include "wiring.h"
+/* *****************************************************************************
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Created: 12/18/09 02:35:49
+ *  Copyright (c) 2009 Perry L. Hung. All rights reserved.
+ *
+ * ****************************************************************************/
+
+/**
+ *  @file gpio.c
+ *
+ *  @brief GPIO initialization routine
+ */
+
+#ifndef _GPIO_H_
+#define _GPIO_H_
+
+#endif
+#include "libmaple.h"
 #include "stm32f10x_rcc.h"
 #include "gpio.h"
-#include "util.h"
 
 void gpio_init(void) {
    /* Turn on clocks for GPIO  */
@@ -12,3 +40,19 @@ void gpio_init(void) {
                           ENABLE);
 }
 
+void gpio_set_mode(GPIO_Port* port, uint8_t gpio_pin, uint8_t mode) {
+    uint32_t tmp;
+    uint32_t shift = POS(gpio_pin % 8);
+    GPIOReg CR;
+
+    ASSERT(port);
+    ASSERT(gpio_pin < 16);
+
+    CR = (gpio_pin < 8) ? &(port->CRL) : &(port->CRH);
+
+    tmp = *CR;
+    tmp &= POS_MASK(shift);
+    tmp |= mode << shift;
+
+    *CR = tmp;
+}