8 files changed, 16 insertions, 16 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/board.c b/demos/ARM7-AT91SAM7X-GCC/board.c
index 18f548c92..ba64e335e 100644
--- a/demos/ARM7-AT91SAM7X-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-GCC/board.c
@@ -155,7 +155,7 @@ void hwinit1(void) {
   /*
    * Serial driver initialization, RTS/CTS pins enabled for USART0 only.
    */
-  sam7x_serial_init(AT91C_AIC_PRIOR_HIGHEST - 2, AT91C_AIC_PRIOR_HIGHEST - 2);
+  serial_init(AT91C_AIC_PRIOR_HIGHEST - 2, AT91C_AIC_PRIOR_HIGHEST - 2);
   AT91C_BASE_PIOA->PIO_PDR   = AT91C_PA3_RTS0 | AT91C_PA4_CTS0;
   AT91C_BASE_PIOA->PIO_ASR   = AT91C_PIO_PA3 | AT91C_PIO_PA4;
   AT91C_BASE_PIOA->PIO_PPUDR = AT91C_PIO_PA3 | AT91C_PIO_PA4;
diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/board.c b/demos/ARM7-AT91SAM7X-WEB-GCC/board.c
index b5e1ca70a..5f49016e0 100644
--- a/demos/ARM7-AT91SAM7X-WEB-GCC/board.c
+++ b/demos/ARM7-AT91SAM7X-WEB-GCC/board.c
@@ -156,7 +156,7 @@ void hwinit1(void) {
   /*
    * Serial driver initialization, RTS/CTS pins enabled for USART0 only.
    */
-  sam7x_serial_init(AT91C_AIC_PRIOR_HIGHEST - 2, AT91C_AIC_PRIOR_HIGHEST - 2);
+  serial_init(AT91C_AIC_PRIOR_HIGHEST - 2, AT91C_AIC_PRIOR_HIGHEST - 2);
   AT91C_BASE_PIOA->PIO_PDR   = AT91C_PA3_RTS0 | AT91C_PA4_CTS0;
   AT91C_BASE_PIOA->PIO_ASR   = AT91C_PIO_PA3 | AT91C_PIO_PA4;
   AT91C_BASE_PIOA->PIO_PPUDR = AT91C_PIO_PA3 | AT91C_PIO_PA4;
@@ -164,7 +164,7 @@ void hwinit1(void) {
   /*
    * EMAC driver initialization.
    */
-  sam7x_emac_init(AT91C_AIC_PRIOR_HIGHEST - 3);
+  emac_init(AT91C_AIC_PRIOR_HIGHEST - 3);
 
   /*
    * ChibiOS/RT initialization.
diff --git a/demos/ARM7-LPC214x-G++/board.c b/demos/ARM7-LPC214x-G++/board.c
index 93227e0ed..0e54eeb71 100644
--- a/demos/ARM7-LPC214x-G++/board.c
+++ b/demos/ARM7-LPC214x-G++/board.c
@@ -119,7 +119,7 @@ void hwinit1(void) {
   /*
    * Interrupt vectors assignment.
    */
-  lpc214x_vic_init();
+  vic_init();
   VICDefVectAddr = (IOREG32)IrqHandler;
 
   /*
@@ -137,8 +137,8 @@ void hwinit1(void) {
   /*
    * Other subsystems.
    */
-  lpc2148x_serial_init(1, 2);
-//  lpc214x_ssp_init();
+  serial_init(1, 2);
+//  ssp_init();
 //  InitMMC();
 //  InitBuzzer();
 
diff --git a/demos/ARM7-LPC214x-GCC-minimal/board.c b/demos/ARM7-LPC214x-GCC-minimal/board.c
index 76e4c7eb8..e34bb3c55 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/board.c
+++ b/demos/ARM7-LPC214x-GCC-minimal/board.c
@@ -119,7 +119,7 @@ void hwinit1(void) {
   /*
    * Interrupt vectors assignment.
    */
-  lpc214x_vic_init();
+  vic_init();
   VICDefVectAddr = (IOREG32)IrqHandler;
 
   /*
@@ -137,8 +137,8 @@ void hwinit1(void) {
   /*
    * Other subsystems.
    */
-//  lpc2148x_serial_init(1, 2);
-//  lpc214x_ssp_init();
+//  serial_init(1, 2);
+//  ssp_init();
 //  InitMMC();
 //  InitBuzzer();
 
diff --git a/demos/ARM7-LPC214x-GCC/board.c b/demos/ARM7-LPC214x-GCC/board.c
index 9d6d77fc7..69aed08f3 100644
--- a/demos/ARM7-LPC214x-GCC/board.c
+++ b/demos/ARM7-LPC214x-GCC/board.c
@@ -119,7 +119,7 @@ void hwinit1(void) {
   /*
    * Interrupt vectors assignment.
    */
-  lpc214x_vic_init();
+  vic_init();
   VICDefVectAddr = (IOREG32)IrqHandler;
 
   /*
@@ -137,8 +137,8 @@ void hwinit1(void) {
   /*
    * Other subsystems.
    */
-  lpc2148x_serial_init(1, 2);
-  lpc214x_ssp_init();
+  serial_init(1, 2);
+  ssp_init();
   InitMMC();
   InitBuzzer();
 
diff --git a/demos/ARM7-LPC214x-GCC/mmcsd.c b/demos/ARM7-LPC214x-GCC/mmcsd.c
index 10e6c6c5b..292b450d5 100644
--- a/demos/ARM7-LPC214x-GCC/mmcsd.c
+++ b/demos/ARM7-LPC214x-GCC/mmcsd.c
@@ -167,7 +167,7 @@ bool_t mmcInit(void) {
   /*
    * Starting initialization with slow clock mode.
    */
-  lpc214x_ssp_setup(254, CR0_DSS8BIT | CR0_FRFSPI | CR0_CLOCKRATE(0), 0);
+  ssp_setup(254, CR0_DSS8BIT | CR0_FRFSPI | CR0_CLOCKRATE(0), 0);
 
   /*
    * SPI mode selection.
@@ -200,7 +200,7 @@ bool_t mmcInit(void) {
   /*
    * Full speed.
    */
-  lpc214x_ssp_setup(2, CR0_DSS8BIT | CR0_FRFSPI | CR0_CLOCKRATE(0), 0);
+  ssp_setup(2, CR0_DSS8BIT | CR0_FRFSPI | CR0_CLOCKRATE(0), 0);
   return FALSE;
 }
 
diff --git a/demos/ARMCM3-STM32F103-GCC/board.c b/demos/ARMCM3-STM32F103-GCC/board.c
index c545728ec..d3e776d1a 100644
--- a/demos/ARMCM3-STM32F103-GCC/board.c
+++ b/demos/ARMCM3-STM32F103-GCC/board.c
@@ -104,7 +104,7 @@ void hwinit1(void) {
   /*
    * Other subsystems initialization.
    */
-  stm32_serial_init(0xC0, 0xC0, 0xC0);
+  serial_init(0xC0, 0xC0, 0xC0);
 
   /*
    * ChibiOS/RT initialization.
diff --git a/demos/MSP430-MSP430x1611-GCC/board.c b/demos/MSP430-MSP430x1611-GCC/board.c
index de9ac6387..794070803 100644
--- a/demos/MSP430-MSP430x1611-GCC/board.c
+++ b/demos/MSP430-MSP430x1611-GCC/board.c
@@ -82,7 +82,7 @@ void hwinit(void) {
   /*
    * Other subsystems.
    */
-  msp430_serial_init();
+  serial_init();
 }
 
 CH_IRQ_HANDLER(TIMERA0_VECTOR) {