STM32 support enhancements, some other fixes.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4313 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 7 insertions, 7 deletions

diff --git a/testhal/LPC11xx/IRQ_STORM/main.c b/testhal/LPC11xx/IRQ_STORM/main.c
index 351b39039..5facfaf60 100644
--- a/testhal/LPC11xx/IRQ_STORM/main.c
+++ b/testhal/LPC11xx/IRQ_STORM/main.c
@@ -170,29 +170,29 @@ static const GPTConfig gpt2cfg = {
 static void print(char *p) {

 

   while (*p) {

-    chIOPut(&SD1, *p++);

+    chSequentialStreamPut(&SD1, *p++);

   }

 }

 

 static void println(char *p) {

 

   while (*p) {

-    chIOPut(&SD1, *p++);

+    chSequentialStreamPut(&SD1, *p++);

   }

-  chIOWriteTimeout(&SD1, (uint8_t *)"\r\n", 2, TIME_INFINITE);

+  chSequentialStreamWrite(&SD1, (uint8_t *)"\r\n", 2);

 }

 

 static void printn(uint32_t n) {

   char buf[16], *p;

 

   if (!n)

-    chIOPut(&SD1, '0');

+    chSequentialStreamPut(&SD1, '0');

   else {

     p = buf;

     while (n)

       *p++ = (n % 10) + '0', n /= 10;

     while (p > buf)

-      chIOPut(&SD1, *--p);

+      chSequentialStreamPut(&SD1, *--p);

   }

 }

 

diff --git a/testhal/LPC11xx/IRQ_STORM/mcuconf.h b/testhal/LPC11xx/IRQ_STORM/mcuconf.h
index 808307c1a..ffd32bd35 100644
--- a/testhal/LPC11xx/IRQ_STORM/mcuconf.h
+++ b/testhal/LPC11xx/IRQ_STORM/mcuconf.h
@@ -53,8 +53,8 @@
 #define LPC11xx_GPT_USE_CT16B1              TRUE

 #define LPC11xx_GPT_USE_CT32B0              TRUE

 #define LPC11xx_GPT_USE_CT32B1              TRUE

-#define LPC11xx_GPT_CT16B0_IRQ_PRIORITY     0

-#define LPC11xx_GPT_CT16B1_IRQ_PRIORITY     1

+#define LPC11xx_GPT_CT16B0_IRQ_PRIORITY     1

+#define LPC11xx_GPT_CT16B1_IRQ_PRIORITY     3

 #define LPC11xx_GPT_CT32B0_IRQ_PRIORITY     2

 #define LPC11xx_GPT_CT32B1_IRQ_PRIORITY     2