diff options
| author | Perry Hung <iperry@gmail.com> | 2011-03-09 23:25:03 -0500 |
|---|---|---|
| committer | Perry Hung <iperry@gmail.com> | 2011-03-09 23:25:03 -0500 |
| commit | 4651227fa9f7dece1dd24d2170db16c2e35dc04e (patch) | |
| tree | 7e05d637bdca69811f04d6d55b8cc24b8c9e8cc5 /wirish | |
| parent | 07536e9a1a92af2b1bad8f32b1b0f6b868957d26 (diff) | |
| download | librambutan-4651227fa9f7dece1dd24d2170db16c2e35dc04e.tar.gz librambutan-4651227fa9f7dece1dd24d2170db16c2e35dc04e.zip | |
Merge refactor into i2c-wip:
Squashed commit of the following:
commit 4d6662dadfda7f2fd55107535165dc98a0638a3c
Merge: 174d9ab 7ddc844
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date: Fri Mar 4 23:18:29 2011 -0500
Merge remote branch 'origin/refactor' into refactor
commit 174d9ab73cc3387a3812e6f3d3e97519bf5b2150
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date: Fri Mar 4 23:16:53 2011 -0500
USBSerial docs fix.
commit f217acb73d94f0a88bf33a42684e6e988dcb3685
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date: Fri Mar 4 20:25:26 2011 -0500
Brought examples/ up to date; PIN_MAP bugfix for D24.
commit c4ba3ba05fc39ef260cd80d91759966952df74ae
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date: Fri Mar 4 19:16:42 2011 -0500
Cosmetic/documentation changes to adc.c
commit e7747b4eb831621951deef6d31629f55cb5c3500
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date: Fri Mar 4 19:16:07 2011 -0500
Cosmetic changes to wirish/main.cxx
commit e2f9d4116e59d8487c936989384228ea084a3501
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date: Fri Mar 4 19:15:24 2011 -0500
Untabifying docs/source/conf.py
commit 7ddc84481b4eebe337065a0219e3d8dc000791e5
Author: Perry Hung <iperry@gmail.com>
Date: Wed Mar 2 00:30:19 2011 -0500
cscope: Find .S instead of .s files
commit 62cb09ed6357eae58b0234fbc074c44e9c0aa5e5
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date: Wed Mar 2 00:07:10 2011 -0500
Fixing typo in main.cpp.example.
Diffstat (limited to 'wirish')
| -rw-r--r-- | wirish/boards.h | 2 | ||||
| -rw-r--r-- | wirish/main.cxx | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/wirish/boards.h b/wirish/boards.h index 989eea1..ee93c5a 100644 --- a/wirish/boards.h +++ b/wirish/boards.h @@ -133,7 +133,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, TIMER_INVALID, TIMER_INVALID}, + {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 */ diff --git a/wirish/main.cxx b/wirish/main.cxx index f0158f8..dd5e296 100644 --- a/wirish/main.cxx +++ b/wirish/main.cxx @@ -1,4 +1,4 @@ -/* *****************************************************************************
+/******************************************************************************
* The MIT License
*
* Copyright (c) 2010 LeafLabs LLC.
@@ -20,16 +20,15 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
- * ****************************************************************************/
+ *****************************************************************************/
// Force init to be called *first*, i.e. before static object allocation.
-// Otherwise, statically allocated object that need libmaple may fail.
+// Otherwise, statically allocated objects that need libmaple may fail.
__attribute__(( constructor )) void premain() {
init();
}
-int main(void)
-{
+int main(void) {
setup();
while (1) {
|