Renamed for consistency.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12346 110e8d01-0319-4d1e-a829-52ad28d1bb01

5 files changed, 11 insertions, 11 deletions

diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.c b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
index 5f320ebc8..1bba8f99a 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.c
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
@@ -26,7 +26,7 @@
 #include <string.h>

 

 #include "hal.h"

-#include "serial_nor.h"

+#include "hal_serial_nor.h"

 

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

 /* Driver local definitions.                                                 */

diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.h b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h
index 8ae3bae13..22b024b95 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.h
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.h
@@ -23,8 +23,8 @@
  * @{

  */

 

-#ifndef FLASH_DEVICE_H

-#define FLASH_DEVICE_H

+#ifndef HAL_FLASH_DEVICE_H

+#define HAL_FLASH_DEVICE_H

 

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

 /* Driver constants.                                                         */

@@ -201,7 +201,7 @@ extern "C" {
 }

 #endif

 

-#endif /* FLASH_DEVICE_H */

+#endif /* HAL_FLASH_DEVICE_H */

 

 /** @} */

 

diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.mk b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.mk
index 07103fe29..c333513dd 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.mk
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.mk
@@ -1,7 +1,7 @@
 # List of all the Micron N25Q device files.

 N25QSRC := $(CHIBIOS)/os/hal/lib/peripherals/flash/hal_flash.c \

-           $(CHIBIOS)/os/hal/lib/complex/serial_nor/serial_nor.c \

-           $(CHIBIOS)/os/hal/lib/complex/serial_nor/devices/micron_n25q/flash_device.c

+           $(CHIBIOS)/os/hal/lib/complex/serial_nor/hal_serial_nor.c \

+           $(CHIBIOS)/os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c

 

 # Required include directories

 N25QINC := $(CHIBIOS)/os/hal/lib/peripherals/flash \

diff --git a/os/hal/lib/complex/serial_nor/serial_nor.c b/os/hal/lib/complex/serial_nor/hal_serial_nor.c
index 6e512fcc3..b21d09694 100644
--- a/os/hal/lib/complex/serial_nor/serial_nor.c
+++ b/os/hal/lib/complex/serial_nor/hal_serial_nor.c
@@ -24,7 +24,7 @@
  */

 

 #include "hal.h"

-#include "serial_nor.h"

+#include "hal_serial_nor.h"

 

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

 /* Driver local definitions.                                                 */

diff --git a/os/hal/lib/complex/serial_nor/serial_nor.h b/os/hal/lib/complex/serial_nor/hal_serial_nor.h
index 62c25a1ba..6be8e8e0c 100644
--- a/os/hal/lib/complex/serial_nor/serial_nor.h
+++ b/os/hal/lib/complex/serial_nor/hal_serial_nor.h
@@ -23,8 +23,8 @@
  * @{

  */

 

-#ifndef SERIAL_NOR_H

-#define SERIAL_NOR_H

+#ifndef HAL_SERIAL_NOR_H

+#define HAL_SERIAL_NOR_H

 

 #include "hal_flash.h"

 

@@ -192,9 +192,9 @@ extern "C" {
 #endif

 

 /* Device-specific implementations.*/

-#include "flash_device.h"

+#include "hal_flash_device.h"

 

-#endif /* SERIAL_NOR_H */

+#endif /* HAL_SERIAL_NOR_H */

 

 /** @} */