Renaming of LLD files inclusions.

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

24 files changed, 38 insertions, 40 deletions

diff --git a/os/hal/include/hal_adc.h b/os/hal/include/hal_adc.h
index 91bda58a7..7b93851c5 100644
--- a/os/hal/include/hal_adc.h
+++ b/os/hal/include/hal_adc.h
@@ -76,7 +76,7 @@ typedef enum {
   ADC_ERROR = 5                             /**< Conversion complete.       */

 } adcstate_t;

 

-#include "adc_lld.h"

+#include "hal_adc_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_can.h b/os/hal/include/hal_can.h
index 73f57e580..7a94827fd 100644
--- a/os/hal/include/hal_can.h
+++ b/os/hal/include/hal_can.h
@@ -100,7 +100,7 @@ typedef enum {
   CAN_SLEEP = 4                             /**< Sleep state.               */

 } canstate_t;

 

-#include "can_lld.h"

+#include "hal_can_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_dac.h b/os/hal/include/hal_dac.h
index ebe03e944..90d709256 100644
--- a/os/hal/include/hal_dac.h
+++ b/os/hal/include/hal_dac.h
@@ -76,7 +76,7 @@ typedef enum {
   DAC_ERROR = 5 			        /**< Error.                             */

 } dacstate_t;

 

-#include "dac_lld.h"

+#include "hal_dac_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_ext.h b/os/hal/include/hal_ext.h
index 4716d0a85..c93a4ce97 100644
--- a/os/hal/include/hal_ext.h
+++ b/os/hal/include/hal_ext.h
@@ -71,7 +71,7 @@ typedef enum {
  */

 typedef struct EXTDriver EXTDriver;

 

-#include "ext_lld.h"

+#include "hal_ext_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_gpt.h b/os/hal/include/hal_gpt.h
index 561010973..3af462121 100644
--- a/os/hal/include/hal_gpt.h
+++ b/os/hal/include/hal_gpt.h
@@ -66,7 +66,7 @@ typedef struct GPTDriver GPTDriver;
  */

 typedef void (*gptcallback_t)(GPTDriver *gptp);

 

-#include "gpt_lld.h"

+#include "hal_gpt_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_i2c.h b/os/hal/include/hal_i2c.h
index a9676a21d..c9c8409cb 100644
--- a/os/hal/include/hal_i2c.h
+++ b/os/hal/include/hal_i2c.h
@@ -82,7 +82,7 @@ typedef enum {
   I2C_LOCKED = 5                            /**> Bus or driver locked.      */

 } i2cstate_t;

 

-#include "i2c_lld.h"

+#include "hal_i2c_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_i2s.h b/os/hal/include/hal_i2s.h
index 2ef57a030..d66f6ce66 100644
--- a/os/hal/include/hal_i2s.h
+++ b/os/hal/include/hal_i2s.h
@@ -62,7 +62,7 @@ typedef enum {
   I2S_COMPLETE = 4                  /**< Transmission complete.             */

 } i2sstate_t;

 

-#include "i2s_lld.h"

+#include "hal_i2s_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_icu.h b/os/hal/include/hal_icu.h
index b25fe7de5..1e7882644 100644
--- a/os/hal/include/hal_icu.h
+++ b/os/hal/include/hal_icu.h
@@ -66,7 +66,7 @@ typedef struct ICUDriver ICUDriver;
  */

 typedef void (*icucallback_t)(ICUDriver *icup);

 

-#include "icu_lld.h"

+#include "hal_icu_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_mac.h b/os/hal/include/hal_mac.h
index 174ecb991..5c7bc82de 100644
--- a/os/hal/include/hal_mac.h
+++ b/os/hal/include/hal_mac.h
@@ -26,8 +26,6 @@
 

 #if (HAL_USE_MAC == TRUE) || defined(__DOXYGEN__)

 

-#include "mii.h"

-

 /*===========================================================================*/

 /* Driver constants.                                                         */

 /*===========================================================================*/

@@ -77,7 +75,7 @@ typedef enum {
  */

 typedef struct MACDriver MACDriver;

 

-#include "mac_lld.h"

+#include "hal_mac_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/mii.h b/os/hal/include/hal_mii.h
index facbe2352..49a9bb3ac 100644
--- a/os/hal/include/mii.h
+++ b/os/hal/include/hal_mii.h
@@ -15,7 +15,7 @@
 */

 

 /**

- * @file    mii.h

+ * @file    hal_mii.h

  * @brief   MII macros and structures.

  *

  * @addtogroup MII

diff --git a/os/hal/include/hal_pal.h b/os/hal/include/hal_pal.h
index fc3f4453c..3df841453 100644
--- a/os/hal/include/hal_pal.h
+++ b/os/hal/include/hal_pal.h
@@ -110,7 +110,7 @@
 /* Driver data structures and types.                                         */

 /*===========================================================================*/

 

-#include "pal_lld.h"

+#include "hal_pal_lld.h"

 

 /**

  * @brief   I/O bus descriptor.

diff --git a/os/hal/include/hal_pwm.h b/os/hal/include/hal_pwm.h
index e50f7a10d..6d69cdbc7 100644
--- a/os/hal/include/hal_pwm.h
+++ b/os/hal/include/hal_pwm.h
@@ -89,7 +89,7 @@ typedef struct PWMDriver PWMDriver;
  */

 typedef void (*pwmcallback_t)(PWMDriver *pwmp);

 

-#include "pwm_lld.h"

+#include "hal_pwm_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_rtc.h b/os/hal/include/hal_rtc.h
index ddfa0d8c1..f269c9706 100644
--- a/os/hal/include/hal_rtc.h
+++ b/os/hal/include/hal_rtc.h
@@ -101,7 +101,7 @@ typedef struct {
   /*lint -restore*/

 } RTCDateTime;

 

-#include "rtc_lld.h"

+#include "hal_rtc_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_sdc.h b/os/hal/include/hal_sdc.h
index 2f6acdc07..98a0492ab 100644
--- a/os/hal/include/hal_sdc.h
+++ b/os/hal/include/hal_sdc.h
@@ -119,7 +119,7 @@ typedef enum {
   SDC_CLK_50MHz

 } sdcbusclk_t;

 

-#include "sdc_lld.h"

+#include "hal_sdc_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_serial.h b/os/hal/include/hal_serial.h
index ac47cab79..60c7bc4aa 100644
--- a/os/hal/include/hal_serial.h
+++ b/os/hal/include/hal_serial.h
@@ -93,7 +93,7 @@ typedef enum {
  */

 typedef struct SerialDriver SerialDriver;

 

-#include "serial_lld.h"

+#include "hal_serial_lld.h"

 

 /**

  * @brief   @p SerialDriver specific methods.

diff --git a/os/hal/include/hal_serial_usb.h b/os/hal/include/hal_serial_usb.h
index f76f603e1..d0d3c6cd2 100644
--- a/os/hal/include/hal_serial_usb.h
+++ b/os/hal/include/hal_serial_usb.h
@@ -27,7 +27,7 @@
 

 #if (HAL_USE_SERIAL_USB == TRUE) || defined(__DOXYGEN__)

 

-#include "usb_cdc.h"

+#include "hal_usb_cdc.h"

 

 /*===========================================================================*/

 /* Driver constants.                                                         */

diff --git a/os/hal/include/hal_spi.h b/os/hal/include/hal_spi.h
index c25857db6..9e4b46425 100644
--- a/os/hal/include/hal_spi.h
+++ b/os/hal/include/hal_spi.h
@@ -75,7 +75,7 @@ typedef enum {
   SPI_COMPLETE = 4                  /**< Asynchronous operation complete.   */

 } spistate_t;

 

-#include "spi_lld.h"

+#include "hal_spi_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_st.h b/os/hal/include/hal_st.h
index f2daace1d..e2c03cc2e 100644
--- a/os/hal/include/hal_st.h
+++ b/os/hal/include/hal_st.h
@@ -43,7 +43,7 @@
 /* Driver data structures and types.                                         */

 /*===========================================================================*/

 

-#include "st_lld.h"

+#include "hal_st_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_uart.h b/os/hal/include/hal_uart.h
index 02d6a4ff9..02537aa29 100644
--- a/os/hal/include/hal_uart.h
+++ b/os/hal/include/hal_uart.h
@@ -103,7 +103,7 @@ typedef enum {
   UART_RX_COMPLETE = 2              /**< Buffer complete.                   */

 } uartrxstate_t;

 

-#include "uart_lld.h"

+#include "hal_uart_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/hal_usb.h b/os/hal/include/hal_usb.h
index f54195af1..0e9ecb238 100644
--- a/os/hal/include/hal_usb.h
+++ b/os/hal/include/hal_usb.h
@@ -366,7 +366,7 @@ typedef const USBDescriptor * (*usbgetdescriptor_t)(USBDriver *usbp,
                                                     uint8_t dindex,

                                                     uint16_t lang);

 

-#include "usb_lld.h"

+#include "hal_usb_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/include/usb_cdc.h b/os/hal/include/hal_usb_cdc.h
index 63c0bc5c0..a52aa537d 100644
--- a/os/hal/include/usb_cdc.h
+++ b/os/hal/include/hal_usb_cdc.h
@@ -15,7 +15,7 @@
 */

 

 /**

- * @file    usb_cdc.h

+ * @file    hal_usb_cdc.h

  * @brief   USB CDC macros and structures.

  *

  * @addtogroup USB_CDC

diff --git a/os/hal/include/hal_wdg.h b/os/hal/include/hal_wdg.h
index 5e06716ef..b2c86c146 100644
--- a/os/hal/include/hal_wdg.h
+++ b/os/hal/include/hal_wdg.h
@@ -52,7 +52,7 @@ typedef enum {
   WDG_READY = 2                     /**< Ready.                             */

 } wdgstate_t;

 

-#include "wdg_lld.h"

+#include "hal_wdg_lld.h"

 

 /*===========================================================================*/

 /* Driver macros.                                                            */

diff --git a/os/hal/templates/hal_mac_lld.c b/os/hal/templates/hal_mac_lld.c
index 83d15a9d7..45d8722f6 100644
--- a/os/hal/templates/hal_mac_lld.c
+++ b/os/hal/templates/hal_mac_lld.c
@@ -28,7 +28,7 @@
 

 #if (HAL_USE_MAC == TRUE) || defined(__DOXYGEN__)

 

-#include "mii.h"

+#include "hal_mii.h"

 

 /*===========================================================================*/

 /* Driver local definitions.                                                 */

diff --git a/os/hal/templates/platform.mk b/os/hal/templates/platform.mk
index 19c7e6d42..a5fbb1065 100644
--- a/os/hal/templates/platform.mk
+++ b/os/hal/templates/platform.mk
@@ -1,20 +1,20 @@
 # List of all the template platform files.

 PLATFORMSRC = ${CHIBIOS}/os/hal/templates/hal_lld.c \

-              ${CHIBIOS}/os/hal/templates/adc_lld.c \

-              ${CHIBIOS}/os/hal/templates/can_lld.c \

-              ${CHIBIOS}/os/hal/templates/dac_lld.c \

-              ${CHIBIOS}/os/hal/templates/ext_lld.c \

-              ${CHIBIOS}/os/hal/templates/gpt_lld.c \

- 			  ${CHIBIOS}/os/hal/templates/i2c_lld.c \

-              ${CHIBIOS}/os/hal/templates/icu_lld.c \

-              ${CHIBIOS}/os/hal/templates/mac_lld.c \

-              ${CHIBIOS}/os/hal/templates/pal_lld.c \

-              ${CHIBIOS}/os/hal/templates/pwm_lld.c \

-              ${CHIBIOS}/os/hal/templates/sdc_lld.c \

-              ${CHIBIOS}/os/hal/templates/serial_lld.c \

-              ${CHIBIOS}/os/hal/templates/spi_lld.c \

-              ${CHIBIOS}/os/hal/templates/uart_lld.c \

-              ${CHIBIOS}/os/hal/templates/usb_lld.c

+              ${CHIBIOS}/os/hal/templates/hal_adc_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_can_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_dac_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_ext_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_gpt_lld.c \

+ 			  ${CHIBIOS}/os/hal/templates/hal_i2c_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_icu_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_mac_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_pal_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_pwm_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_sdc_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_serial_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_spi_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_uart_lld.c \

+              ${CHIBIOS}/os/hal/templates/hal_usb_lld.c

 

 # Required include directories

 PLATFORMINC = ${CHIBIOS}/os/hal/templates