[Cbed-svn-commit] SF.net SVN: cbed:[5] trunk/cbed

[<st...@us...>]

Revision: 5
          http://cbed.svn.sourceforge.net/cbed/?rev=5&view=rev
Author:   stl-ajk
Date:     2011-03-19 20:22:11 +0000 (Sat, 19 Mar 2011)

Log Message:
-----------
Fixed some typos

Modified Paths:
--------------
    trunk/cbed/.cproject
    trunk/cbed/.project
    trunk/cbed/src/uart0.c
    trunk/cbed/src/uartx.h

Modified: trunk/cbed/.cproject
===================================================================
--- trunk/cbed/.cproject	2011-03-19 19:35:58 UTC (rev 4)
+++ trunk/cbed/.cproject	2011-03-19 20:22:11 UTC (rev 5)
@@ -36,7 +36,7 @@
 <listOptionValue builtIn="false" value="__CODE_RED"/>
 </option>
 <option id="gnu.c.compiler.option.misc.other.834748474" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
-<option id="gnu.c.compiler.option.include.paths.837228785" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+<option id="gnu.c.compiler.option.include.paths.837228785" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 <listOptionValue builtIn="false" value="../inc"/>
 </option>
 <inputType id="com.crt.advproject.compiler.input.1007998830" superClass="com.crt.advproject.compiler.input"/>
@@ -170,6 +170,7 @@
 </profile>
 </storageModule>
 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 </cconfiguration>
 <cconfiguration id="com.crt.advproject.config.lib.release.447398816">
 <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.lib.release.447398816" moduleId="org.eclipse.cdt.core.settings" name="Release">
@@ -205,7 +206,7 @@
 </option>
 <option id="gnu.c.compiler.option.misc.other.1921869647" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>
 <option id="gnu.c.compiler.option.optimization.flags.232568468" name="Other optimization flags" superClass="gnu.c.compiler.option.optimization.flags" value="-Os" valueType="string"/>
-<option id="gnu.c.compiler.option.include.paths.1031404249" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+<option id="gnu.c.compiler.option.include.paths.1031404249" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
 <listOptionValue builtIn="false" value="../inc"/>
 </option>
 <inputType id="com.crt.advproject.compiler.input.1774429324" superClass="com.crt.advproject.compiler.input"/>
@@ -339,6 +340,7 @@
 </profile>
 </storageModule>
 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
 </cconfiguration>
 </storageModule>
 <storageModule moduleId="cdtBuildSystem" version="4.0.0">

Modified: trunk/cbed/.project
===================================================================
--- trunk/cbed/.project	2011-03-19 19:35:58 UTC (rev 4)
+++ trunk/cbed/.project	2011-03-19 20:22:11 UTC (rev 5)
@@ -3,6 +3,7 @@
 	<name>cbed</name>
 	<comment></comment>
 	<projects>
+		<project>CMSISv1p30_LPC17xx</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

Modified: trunk/cbed/src/uart0.c
===================================================================
--- trunk/cbed/src/uart0.c	2011-03-19 19:35:58 UTC (rev 4)
+++ trunk/cbed/src/uart0.c	2011-03-19 20:22:11 UTC (rev 5)
@@ -54,7 +54,7 @@
 #define UARTX_callback_rx           cbed_uart0_callback_rx
 #define UARTX_callback_rx_overflow  cbed_uart0_callback_rx_overflow
 
-#define UARTX_isr cbed_uart0_isr
+#define UARTX_IRQHandler UART0_IRQHandlr
 #define UARTX_isr_tx cbed_uart0_isr_tx
 #define UARTX_isr_rx cbed_uart0_isr_rx
 #define UARTX__getc uart0__get

Modified: trunk/cbed/src/uartx.h
===================================================================
--- trunk/cbed/src/uartx.h	2011-03-19 19:35:58 UTC (rev 4)
+++ trunk/cbed/src/uartx.h	2011-03-19 20:22:11 UTC (rev 5)
@@ -34,7 +34,6 @@
 #include <math.h>
 #include <time.h>
 #include <stdint.h>
-#include "cmsis_nvic.h"
 #include "LPC17xx.h"
 
 #ifdef __cplusplus
@@ -129,7 +128,7 @@
         UARTX_IER |= 2;
     }
     #else
-    while(!(UARTX_LSR & (1UL << 5));
+    while(!(UARTX_LSR & (1UL << 5)));
     UARTX_THR = (uint32_t)c;    
     #endif
     return 0;
@@ -154,11 +153,11 @@
     return c;
     #else
     if (block) {
-        while (!(UARTX_LSR & (1UL << 0)) ;
+        while (!(UARTX_LSR & (1UL << 0))) ;
         return (int)(UARTX_RBR & 0xFF);
     }
     else {
-        if (!(UARTX_LSR & (1UL << 0)) return -1;
+        if (!(UARTX_LSR & (1UL << 0))) return -1;
         return (int)(UARTX_RBR & 0xFF);
     }
     #endif
@@ -168,7 +167,7 @@
     return UARTX__getc(true);
 }
 
-extern "C" void UARTX_isr(void) __irq
+void UARTX_IRQHandler(void)
 {
     volatile uint32_t iir, lsr;
     
@@ -238,4 +237,4 @@
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.