From: Zachary T Welch <zw@superlucidity.net>
Date: Thu, 3 Dec 2009 12:14:54 +0000 (-0800)
Subject: change #include "flash.h" to <flash/flash.h>
X-Git-Tag: v0.4.0-rc1~160
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2b2d5ec1e38efdd10ec64f8e880588350fb4edea;p=openocd

change #include "flash.h" to <flash/flash.h>

Changes from the flat namespace to heirarchical one.  Instead of writing:

	#include "flash.h"

the following form should be used.

	#include <flash/flash.h>

The exception is from .c files in the same directory.
---

diff --git a/src/flash/nand.h b/src/flash/nand.h
index a30a6549..d73aee14 100644
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -25,7 +25,7 @@
 #ifndef NAND_H
 #define NAND_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct nand_device;
 
diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c
index a8d76ceb..66969127 100644
--- a/src/flash/nor/aduc702x.c
+++ b/src/flash/nor/aduc702x.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include "flash.h"
+#include <flash/flash.h>
 #include <target/armv4_5.h>
 #include <helper/binarybuffer.h>
 #include <helper/time_support.h>
diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c
index 5f7e8d72..dd4f3471 100644
--- a/src/flash/nor/at91sam3.c
+++ b/src/flash/nor/at91sam3.c
@@ -61,7 +61,7 @@
 #include <string.h>
 #include <stddef.h>
 #include <helper/types.h>
-#include "flash.h"
+#include <flash/flash.h>
 #include <helper/membuf.h>
 #include "at91sam3.h"
 #include <helper/time_support.h>
diff --git a/src/flash/nor/at91sam7.h b/src/flash/nor/at91sam7.h
index 45106869..80778794 100644
--- a/src/flash/nor/at91sam7.h
+++ b/src/flash/nor/at91sam7.h
@@ -23,7 +23,7 @@
 #ifndef AT91SAM7_H
 #define AT91SAM7_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct at91sam7_flash_bank
 {
diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c
index 2bc44384..fbc92772 100644
--- a/src/flash/nor/avrf.c
+++ b/src/flash/nor/avrf.c
@@ -23,7 +23,7 @@
 
 #include "avrf.h"
 #include <target/avrt.h>
-#include "flash.h"
+#include <flash/flash.h>
 
 
 /* AVR_JTAG_Instructions */
diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h
index d55fd34e..565a2b6c 100644
--- a/src/flash/nor/cfi.h
+++ b/src/flash/nor/cfi.h
@@ -20,7 +20,7 @@
 #ifndef CFI_H
 #define CFI_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */
 #define CFI_STATUS_POLL_MASK_DQ6_DQ7     0xC0 /* DQ6..DQ7 */
diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c
index 81223b68..8f8f746e 100644
--- a/src/flash/nor/ecos.c
+++ b/src/flash/nor/ecos.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "flash.h"
+#include <flash/flash.h>
 #include <target/embeddedice.h>
 #include <target/image.h>
 #include <target/algorithm.h>
diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c
index 124ca3e1..49a0f722 100644
--- a/src/flash/nor/faux.c
+++ b/src/flash/nor/faux.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "flash.h"
+#include <flash/flash.h>
 #include <target/image.h>
 #include "../hello.h"
 
diff --git a/src/flash/nor/lpc2000.h b/src/flash/nor/lpc2000.h
index 08e278a3..30be3048 100644
--- a/src/flash/nor/lpc2000.h
+++ b/src/flash/nor/lpc2000.h
@@ -23,7 +23,7 @@
 #ifndef LPC2000_H
 #define LPC2000_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 typedef enum
 {
diff --git a/src/flash/nor/lpc288x.h b/src/flash/nor/lpc288x.h
index 5a71ee08..06f634ab 100644
--- a/src/flash/nor/lpc288x.h
+++ b/src/flash/nor/lpc288x.h
@@ -21,7 +21,7 @@
 #ifndef lpc288x_H
 #define lpc288x_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct lpc288x_flash_bank
 {
diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c
index c1fefd70..dc466f8e 100644
--- a/src/flash/nor/lpc2900.c
+++ b/src/flash/nor/lpc2900.c
@@ -24,7 +24,7 @@
 
 
 #include <target/image.h>
-#include "flash.h"
+#include <flash/flash.h>
 #include <helper/binarybuffer.h>
 #include <target/armv4_5.h>
 #include <target/algorithm.h>
diff --git a/src/flash/nor/non_cfi.h b/src/flash/nor/non_cfi.h
index 44c92db4..cc6004e8 100644
--- a/src/flash/nor/non_cfi.h
+++ b/src/flash/nor/non_cfi.h
@@ -20,7 +20,7 @@
 #ifndef NON_CFI_H
 #define NON_CFI_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct non_cfi
 {
diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c
index 57d9efaa..6e3ad1c9 100644
--- a/src/flash/nor/ocl.c
+++ b/src/flash/nor/ocl.c
@@ -22,7 +22,7 @@
 #endif
 
 #include "ocl.h"
-#include "flash.h"
+#include <flash/flash.h>
 #include <target/embeddedice.h>
 
 
diff --git a/src/flash/nor/pic32mx.h b/src/flash/nor/pic32mx.h
index 92f40c2e..b33e8317 100644
--- a/src/flash/nor/pic32mx.h
+++ b/src/flash/nor/pic32mx.h
@@ -26,7 +26,7 @@
 #ifndef PIC32MX_H
 #define PIC32MX_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct pic32mx_flash_bank
 {
diff --git a/src/flash/nor/stellaris.h b/src/flash/nor/stellaris.h
index 949a346d..85b709cc 100644
--- a/src/flash/nor/stellaris.h
+++ b/src/flash/nor/stellaris.h
@@ -20,7 +20,7 @@
 #ifndef STELLARIS_FLASH_H
 #define STELLARIS_FLASH_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct stellaris_flash_bank
 {
diff --git a/src/flash/nor/stm32x.h b/src/flash/nor/stm32x.h
index 6cd047e1..b6e00edc 100644
--- a/src/flash/nor/stm32x.h
+++ b/src/flash/nor/stm32x.h
@@ -23,7 +23,7 @@
 #ifndef STM32X_H
 #define STM32X_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct stm32x_options
 {
diff --git a/src/flash/nor/str7x.h b/src/flash/nor/str7x.h
index 81af0f1e..4daafb7d 100644
--- a/src/flash/nor/str7x.h
+++ b/src/flash/nor/str7x.h
@@ -23,7 +23,7 @@
 #ifndef STR7X_H
 #define STR7X_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct str7x_flash_bank
 {
diff --git a/src/flash/nor/str9x.h b/src/flash/nor/str9x.h
index c9d5152f..29adecfa 100644
--- a/src/flash/nor/str9x.h
+++ b/src/flash/nor/str9x.h
@@ -23,7 +23,7 @@
 #ifndef STR9X_H
 #define STR9X_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct str9x_flash_bank
 {
diff --git a/src/flash/nor/str9xpec.h b/src/flash/nor/str9xpec.h
index 1d5ce943..cb2ac780 100644
--- a/src/flash/nor/str9xpec.h
+++ b/src/flash/nor/str9xpec.h
@@ -23,7 +23,7 @@
 #ifndef STR9XPEC_H
 #define STR9XPEC_H
 
-#include "flash.h"
+#include <flash/flash.h>
 #include <jtag/jtag.h>
 
 struct str9xpec_flash_controller
diff --git a/src/flash/nor/tms470.h b/src/flash/nor/tms470.h
index f275e510..b2fea1b1 100644
--- a/src/flash/nor/tms470.h
+++ b/src/flash/nor/tms470.h
@@ -20,7 +20,7 @@
 #ifndef TMS470_DOT_H
 #define TMS470_DOT_H
 
-#include "flash.h"
+#include <flash/flash.h>
 
 struct tms470_flash_bank
 {
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 91852338..40380a89 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -31,7 +31,7 @@
 #include <target/target_request.h>
 #include <target/register.h>
 #include "server.h"
-#include "flash.h"
+#include <flash/flash.h>
 #include "gdb_server.h"
 #include <target/image.h>
 #include <jtag/jtag.h>