Make #include guard naming consistent

[openocd] / src / target / dsp563xx_once.h

diff --git a/src/target/dsp563xx_once.h b/src/target/dsp563xx_once.h
index 1ba9c1ee7eaa70ac2d956bfd9b8aa5f5eb435973..da7f5e9b864986aee147ec77a224e81d7a10f39c 100644 (file)
--- a/src/target/dsp563xx_once.h
+++ b/src/target/dsp563xx_once.h
@@ -13,15 +13,18 @@
  *   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 DSP563XX_ONCE_H
-#define DSP563XX_ONCE_H
+
+#ifndef OPENOCD_TARGET_DSP563XX_ONCE_H
+#define OPENOCD_TARGET_DSP563XX_ONCE_H
 
 #include <jtag/jtag.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define DSP563XX_ONCE_OCR_EX   (1<<5)
 #define DSP563XX_ONCE_OCR_GO   (1<<6)
 #define DSP563XX_ONCE_OCR_RW   (1<<7)
@@ -57,11 +60,10 @@
 #define DSP563XX_ONCE_OPABF11  0x012   /* trace buffer/inc ptr */
 #define DSP563XX_ONCE_NOREG    0x01F   /* no register selected */
 
-struct once_reg
-{
-       uint8_t num;
-       uint8_t addr;
-       uint8_t len;
+struct once_reg {
+       const uint8_t num;
+       const uint8_t addr;
+       const uint8_t len;
        const char *name;
        uint32_t reg;
 };
@@ -84,4 +86,4 @@ int dsp563xx_once_execute_sw_ir(struct jtag_tap *tap, int flush, uint32_t opcode
 /** double word instruction */
 int dsp563xx_once_execute_dw_ir(struct jtag_tap *tap, int flush, uint32_t opcode, uint32_t operand);
 
-#endif /* DSP563XX_ONCE_H */
+#endif /* OPENOCD_TARGET_DSP563XX_ONCE_H */