C99 printf() -Werror fixes

[fw/openocd] / src / flash / avrf.h

diff --git a/src/flash/avrf.h b/src/flash/avrf.h
index d1c976c6f753c98ae0f33cc8d306c72c8bfa8fb8..bcd3b72a9f21bffc8575a697e3febbb471dcaa29 100644 (file)
--- a/src/flash/avrf.h
+++ b/src/flash/avrf.h
@@ -1,39 +1,41 @@
-/***************************************************************************\r
- *   Copyright (C) 2009 by Simon Qian                                      *\r
- *   SimonQian@SimonQian.com                                               *\r
- *                                                                         *\r
- *   This program is free software; you can redistribute it and/or modify  *\r
- *   it under the terms of the GNU General Public License as published by  *\r
- *   the Free Software Foundation; either version 2 of the License, or     *\r
- *   (at your option) any later version.                                   *\r
- *                                                                         *\r
- *   This program is distributed in the hope that it will be useful,       *\r
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *\r
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *\r
- *   GNU General Public License for more details.                          *\r
- *                                                                         *\r
- *   You should have received a copy of the GNU General Public License     *\r
- *   along with this program; if not, write to the                         *\r
- *   Free Software Foundation, Inc.,                                       *\r
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *\r
- ***************************************************************************/\r
-#ifndef AVRF_H\r
-#define AVRF_H\r
-\r
-typedef struct avrf_type_s\r
-{\r
-       char name[15];\r
-       u16 chip_id;\r
-       int flash_page_size;\r
-       int flash_page_num;\r
-       int eeprom_page_size;\r
-       int eeprom_page_num;\r
-} avrf_type_t;\r
-\r
-typedef struct avrf_flash_bank_s\r
-{\r
-       int ppage_size;\r
-       int probed;\r
-} avrf_flash_bank_t;\r
-\r
-#endif /* AVRF_H */\r
+/***************************************************************************
+ *   Copyright (C) 2009 by Simon Qian                                      *
+ *   SimonQian@SimonQian.com                                               *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   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.             *
+ ***************************************************************************/
+#ifndef AVRF_H
+#define AVRF_H
+
+#include "types.h"
+
+typedef struct avrf_type_s
+{
+       char name[15];
+       uint16_t chip_id;
+       int flash_page_size;
+       int flash_page_num;
+       int eeprom_page_size;
+       int eeprom_page_num;
+} avrf_type_t;
+
+typedef struct avrf_flash_bank_s
+{
+       int ppage_size;
+       int probed;
+} avrf_flash_bank_t;
+
+#endif /* AVRF_H */