Make #include guard naming consistent

[openocd] / src / flash / nor / imp.h

diff --git a/src/flash/nor/imp.h b/src/flash/nor/imp.h
index 84ef8715bb5fd2dcd2da6ed529d0715302bba187..87475a39c7ca64f77a5a7e9275e98b7fa7fc750a 100644 (file)
--- a/src/flash/nor/imp.h
+++ b/src/flash/nor/imp.h
@@ -12,23 +12,21 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef FLASH_NOR_IMP_H
-#define FLASH_NOR_IMP_H
 
-// this is an internal header
+#ifndef OPENOCD_FLASH_NOR_IMP_H
+#define OPENOCD_FLASH_NOR_IMP_H
+
+/* this is an internal header */
 #include "core.h"
-// common flash internals
-#include <flash/common.h>
-// almost all drivers will need this file
+#include "driver.h"
+/* almost all drivers will need this file */
 #include <target/target.h>
 
 /**
  * Adds a new NOR bank to the global list of banks.
- * @params bank The bank that should be added.
+ * @param bank The bank that should be added.
  */
 void flash_bank_add(struct flash_bank *bank);
 
@@ -41,9 +39,11 @@ int flash_driver_erase(struct flash_bank *bank, int first, int last);
 int flash_driver_protect(struct flash_bank *bank, int set, int first, int last);
 int flash_driver_write(struct flash_bank *bank,
                uint8_t *buffer, uint32_t offset, uint32_t count);
+int flash_driver_read(struct flash_bank *bank,
+               uint8_t *buffer, uint32_t offset, uint32_t count);
 
 /* write (optional verify) an image to flash memory of the given target */
 int flash_write_unlock(struct target *target, struct image *image,
                uint32_t *written, int erase, bool unlock);
 
-#endif // FLASH_NOR_IMP_H
+#endif /* OPENOCD_FLASH_NOR_IMP_H */