From 7a4eda473dab0238c4ff1acaaec0310863273dee Mon Sep 17 00:00:00 2001 From: Branislav Petrovsk Date: Fri, 3 Jun 2005 10:07:17 +0000 Subject: [PATCH] 2005-06-03 Branislav Petrovsky * h8/h83048/adc.h: Register structures defined as volatile. * h8/h83048/dac.h: Ditto. * h8/h83048/dmac.h: Ditto. * h8/h83048/flash.h: Ditto. * h8/h83048/ic.h: Ditto. * h8/h83048/itu.h: Ditto. * h8/h83048/other.h: Ditto. * h8/h83048/ports.h: Ditto. * h8/h83048/rc.h: Ditto. * h8/h83048/sci.h: Ditto. * h8/h83048/tpc.h: Ditto. * h8/h83048/wdt.h: Ditto. * h8/h8s2357/adc.h: Ditto. * h8/h8s2357/bus.h: Ditto. * h8/h8s2357/dac.h: Ditto. * h8/h8s2357/dmac.h: Ditto. * h8/h8s2357/dtc.h: Ditto. * h8/h8s2357/flash.h: Ditto. * h8/h8s2357/ic.h: Ditto. * h8/h8s2357/mcu.h: Ditto. * h8/h8s2357/ports.h: Ditto. * h8/h8s2357/ppg.h: Ditto. * h8/h8s2357/sci.h: Ditto. * h8/h8s2357/timer.h: Ditto. * h8/h8s2357/tpu.h: Ditto. * h8/h8s2357/wdt.h: Ditto. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@643 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- include/ChangeLog | 29 +++++++++++++++++++++++++++++ include/h8/h83048/adc.h | 2 +- include/h8/h83048/dac.h | 2 +- include/h8/h83048/dmac.h | 2 +- include/h8/h83048/flash.h | 2 +- include/h8/h83048/ic.h | 2 +- include/h8/h83048/itu.h | 6 +++--- include/h8/h83048/other.h | 4 ++-- include/h8/h83048/ports.h | 2 +- include/h8/h83048/rc.h | 2 +- include/h8/h83048/sci.h | 2 +- include/h8/h83048/tpc.h | 2 +- include/h8/h83048/wdt.h | 2 +- include/h8/h8s2357/adc.h | 2 +- include/h8/h8s2357/bus.h | 2 +- include/h8/h8s2357/dac.h | 2 +- include/h8/h8s2357/dmac.h | 2 +- include/h8/h8s2357/dtc.h | 2 +- include/h8/h8s2357/flash.h | 2 +- include/h8/h8s2357/ic.h | 4 ++-- include/h8/h8s2357/mcu.h | 2 +- include/h8/h8s2357/ports.h | 4 ++-- include/h8/h8s2357/ppg.h | 2 +- include/h8/h8s2357/sci.h | 2 +- include/h8/h8s2357/timer.h | 2 +- include/h8/h8s2357/tpu.h | 4 ++-- include/h8/h8s2357/wdt.h | 2 +- 27 files changed, 61 insertions(+), 32 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 081ea1b6..6aaf4e2e 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,32 @@ +2005-06-03 Branislav Petrovsky + + * h8/h83048/adc.h: Register structures defined as volatile. + * h8/h83048/dac.h: Ditto. + * h8/h83048/dmac.h: Ditto. + * h8/h83048/flash.h: Ditto. + * h8/h83048/ic.h: Ditto. + * h8/h83048/itu.h: Ditto. + * h8/h83048/other.h: Ditto. + * h8/h83048/ports.h: Ditto. + * h8/h83048/rc.h: Ditto. + * h8/h83048/sci.h: Ditto. + * h8/h83048/tpc.h: Ditto. + * h8/h83048/wdt.h: Ditto. + * h8/h8s2357/adc.h: Ditto. + * h8/h8s2357/bus.h: Ditto. + * h8/h8s2357/dac.h: Ditto. + * h8/h8s2357/dmac.h: Ditto. + * h8/h8s2357/dtc.h: Ditto. + * h8/h8s2357/flash.h: Ditto. + * h8/h8s2357/ic.h: Ditto. + * h8/h8s2357/mcu.h: Ditto. + * h8/h8s2357/ports.h: Ditto. + * h8/h8s2357/ppg.h: Ditto. + * h8/h8s2357/sci.h: Ditto. + * h8/h8s2357/timer.h: Ditto. + * h8/h8s2357/tpu.h: Ditto. + * h8/h8s2357/wdt.h: Ditto. + 2005-06-03 Branislav Petrovsky * h8/h8s2357/mcu.h (MSTPCR): Register splitted into MSTPCRH and MSTPCRL. diff --git a/include/h8/h83048/adc.h b/include/h8/h83048/adc.h index 61fae1d0..f270f800 100644 --- a/include/h8/h83048/adc.h +++ b/include/h8/h83048/adc.h @@ -51,7 +51,7 @@ #define ADC_BASE 0xffffe0 #if LANGUAGE == C -typedef struct ADC_registers { +typedef volatile struct ADC_registers { uint8_t addrah; uint8_t addral; uint8_t addrbh; diff --git a/include/h8/h83048/dac.h b/include/h8/h83048/dac.h index 0fc84491..6a8342d2 100644 --- a/include/h8/h83048/dac.h +++ b/include/h8/h83048/dac.h @@ -51,7 +51,7 @@ #define DAC_BASE 0xffffdc #if LANGUAGE == C -typedef struct DAC_registers { +typedef volatile struct DAC_registers { uint8_t dadr0; uint8_t dadr1; uint8_t dacr; diff --git a/include/h8/h83048/dmac.h b/include/h8/h83048/dmac.h index 89d6a2a4..5c94b614 100644 --- a/include/h8/h83048/dmac.h +++ b/include/h8/h83048/dmac.h @@ -51,7 +51,7 @@ #define DMAC_BASE 0xffff20 #if LANGUAGE == C -typedef struct DMAC_registers { +typedef volatile struct DMAC_registers { uint32_t mar0a; uint16_t etcr0a; uint8_t ioar0a; diff --git a/include/h8/h83048/flash.h b/include/h8/h83048/flash.h index d44a3a30..12db459c 100644 --- a/include/h8/h83048/flash.h +++ b/include/h8/h83048/flash.h @@ -51,7 +51,7 @@ #define FLASH_BASE 0xffff40 #if LANGUAGE == C -typedef struct FLASH_registers { +typedef volatile struct FLASH_registers { uint8_t flmcr; uint8_t __reserved1; uint8_t ebr1; diff --git a/include/h8/h83048/ic.h b/include/h8/h83048/ic.h index 47ba184f..55efcf97 100644 --- a/include/h8/h83048/ic.h +++ b/include/h8/h83048/ic.h @@ -51,7 +51,7 @@ #define IC_BASE 0xfffff4 #if LANGUAGE == C -typedef struct IC_registers { +typedef volatile struct IC_registers { uint8_t iscr; uint8_t ier; uint8_t isr; diff --git a/include/h8/h83048/itu.h b/include/h8/h83048/itu.h index 0c0850e4..b85860e3 100644 --- a/include/h8/h83048/itu.h +++ b/include/h8/h83048/itu.h @@ -57,7 +57,7 @@ #define ITU4_BASE 0xffff92 #if LANGUAGE == C -typedef struct ITU_registers { +typedef volatile struct ITU_registers { uint8_t tcr; uint8_t tior; uint8_t tier; @@ -74,14 +74,14 @@ typedef struct ITU_registers { uint8_t brbl; /* only ITU channel 3 and 4 */ } ITU_registers_t; -typedef struct ITU_common1_registers { +typedef volatile struct ITU_common1_registers { uint8_t tstr; uint8_t tsnc; uint8_t tmdr; uint8_t tfcr; } ITU_common1_registers_t; -typedef struct ITU_common2_registers { +typedef volatile struct ITU_common2_registers { uint8_t toer; uint8_t tocr; } ITU_common2_registers_t; diff --git a/include/h8/h83048/other.h b/include/h8/h83048/other.h index 4bb45ee2..47fbf38e 100644 --- a/include/h8/h83048/other.h +++ b/include/h8/h83048/other.h @@ -52,14 +52,14 @@ #define OTHER2_BASE 0xffffec #if LANGUAGE == C -typedef struct OTHER1_registers { +typedef volatile struct OTHER1_registers { uint8_t dastcr; uint8_t divcr; uint8_t mstcr; uint8_t cscr; } OTHER1_registers_t; -typedef struct OTHER2_registers { +typedef volatile struct OTHER2_registers { uint8_t abwcr; uint8_t astcr; uint8_t wcr; diff --git a/include/h8/h83048/ports.h b/include/h8/h83048/ports.h index 4d1b60af..570ec4ed 100644 --- a/include/h8/h83048/ports.h +++ b/include/h8/h83048/ports.h @@ -51,7 +51,7 @@ #define PORT_BASE 0xffffc0 #if LANGUAGE == C -typedef struct PORT_registers { +typedef volatile struct PORT_registers { uint8_t p1ddr; uint8_t p2ddr; uint8_t p1dr; diff --git a/include/h8/h83048/rc.h b/include/h8/h83048/rc.h index 592ff286..ac8bb0bd 100644 --- a/include/h8/h83048/rc.h +++ b/include/h8/h83048/rc.h @@ -51,7 +51,7 @@ #define RC_BASE 0xffffac #if LANGUAGE == C -typedef struct RC_registers { +typedef volatile struct RC_registers { uint8_t rfshcr; uint8_t rtmcsr; uint8_t rtcnt; diff --git a/include/h8/h83048/sci.h b/include/h8/h83048/sci.h index 63378fa2..9e432fc1 100644 --- a/include/h8/h83048/sci.h +++ b/include/h8/h83048/sci.h @@ -52,7 +52,7 @@ #define SCI1_BASE 0xffffb8 #if LANGUAGE == C -typedef struct SCI_registers { +typedef volatile struct SCI_registers { uint8_t smr; uint8_t brr; uint8_t scr; diff --git a/include/h8/h83048/tpc.h b/include/h8/h83048/tpc.h index cd0d3cee..3d2f0c0a 100644 --- a/include/h8/h83048/tpc.h +++ b/include/h8/h83048/tpc.h @@ -51,7 +51,7 @@ #define TPC_BASE 0xffffa0 #if LANGUAGE == C -typedef struct TPC_registers { +typedef volatile struct TPC_registers { uint8_t tpmr; uint8_t tpcr; uint8_t nderb; diff --git a/include/h8/h83048/wdt.h b/include/h8/h83048/wdt.h index 530241df..1880529f 100644 --- a/include/h8/h83048/wdt.h +++ b/include/h8/h83048/wdt.h @@ -51,7 +51,7 @@ #define WDT_BASE 0xffffa8 #if LANGUAGE == C -typedef struct WDT_registers { +typedef volatile struct WDT_registers { union { union { uint16_t tcsr; diff --git a/include/h8/h8s2357/adc.h b/include/h8/h8s2357/adc.h index 665faccf..37d4767f 100644 --- a/include/h8/h8s2357/adc.h +++ b/include/h8/h8s2357/adc.h @@ -51,7 +51,7 @@ #define ADC_BASE 0xffffff90 #if LANGUAGE == C -typedef struct ADC_registers { +typedef volatile struct ADC_registers { uint8_t addrah; uint8_t addral; uint8_t addrbh; diff --git a/include/h8/h8s2357/bus.h b/include/h8/h8s2357/bus.h index 83099af2..a83ab38c 100644 --- a/include/h8/h8s2357/bus.h +++ b/include/h8/h8s2357/bus.h @@ -51,7 +51,7 @@ #define BUS_BASE 0xfffffed0 #if LANGUAGE == C -typedef struct BUS_registers { +typedef volatile struct BUS_registers { uint8_t abwcr; uint8_t astcr; uint8_t wcrh; diff --git a/include/h8/h8s2357/dac.h b/include/h8/h8s2357/dac.h index 0094f650..ed696de3 100644 --- a/include/h8/h8s2357/dac.h +++ b/include/h8/h8s2357/dac.h @@ -51,7 +51,7 @@ #define DAC_BASE 0xffffffa4 #if LANGUAGE == C -typedef struct DAC_registers { +typedef volatile struct DAC_registers { uint8_t dadr0; uint8_t dadr1; uint8_t dacr; diff --git a/include/h8/h8s2357/dmac.h b/include/h8/h8s2357/dmac.h index 0b63208e..68cd2ab2 100644 --- a/include/h8/h8s2357/dmac.h +++ b/include/h8/h8s2357/dmac.h @@ -51,7 +51,7 @@ #define DMAC_BASE 0xfffffee0 #if LANGUAGE == C -typedef struct DMAC_registers { +typedef volatile struct DMAC_registers { uint32_t mar0a; uint16_t ioar0a; uint16_t etcr0a; diff --git a/include/h8/h8s2357/dtc.h b/include/h8/h8s2357/dtc.h index 59efd6ca..a1c9f717 100644 --- a/include/h8/h8s2357/dtc.h +++ b/include/h8/h8s2357/dtc.h @@ -51,7 +51,7 @@ #define DTCR_BASE 0xffffff30 #if LANGUAGE == C -typedef struct DTCR_registers { +typedef volatile struct DTCR_registers { uint8_t dtcera; uint8_t dtcerb; uint8_t dtcerc; diff --git a/include/h8/h8s2357/flash.h b/include/h8/h8s2357/flash.h index c4213961..b59f86b1 100644 --- a/include/h8/h8s2357/flash.h +++ b/include/h8/h8s2357/flash.h @@ -51,7 +51,7 @@ #define FLASH_BASE 0xffffffc8 #if LANGUAGE == C -typedef struct FLASH_registers { +typedef volatile struct FLASH_registers { uint8_t flmcr1; uint8_t flmcr2; uint8_t ebr1; diff --git a/include/h8/h8s2357/ic.h b/include/h8/h8s2357/ic.h index d9d714fd..88812134 100644 --- a/include/h8/h8s2357/ic.h +++ b/include/h8/h8s2357/ic.h @@ -52,7 +52,7 @@ #define IC_BASE 0xffffff2c #if LANGUAGE == C -typedef struct IPR_registers { +typedef volatile struct IPR_registers { uint8_t ipra; uint8_t iprb; uint8_t iprc; @@ -66,7 +66,7 @@ typedef struct IPR_registers { uint8_t iprk; } IPR_registers_t; -typedef struct IC_registers { +typedef volatile struct IC_registers { uint16_t iscr; uint8_t ier; uint8_t isr; diff --git a/include/h8/h8s2357/mcu.h b/include/h8/h8s2357/mcu.h index 388ba80e..e32428ba 100644 --- a/include/h8/h8s2357/mcu.h +++ b/include/h8/h8s2357/mcu.h @@ -51,7 +51,7 @@ #define MCU_BASE 0xffffff38 #if LANGUAGE == C -typedef struct MCU_registers { +typedef volatile struct MCU_registers { uint8_t sbycr; uint8_t syscr; uint8_t sckcr; diff --git a/include/h8/h8s2357/ports.h b/include/h8/h8s2357/ports.h index d28b7d73..52976761 100644 --- a/include/h8/h8s2357/ports.h +++ b/include/h8/h8s2357/ports.h @@ -52,7 +52,7 @@ #define DDR_BASE 0xfffffeb0 #if LANGUAGE == C -typedef struct PORT_registers { +typedef volatile struct PORT_registers { uint8_t port1; uint8_t port2; uint8_t port3; @@ -91,7 +91,7 @@ typedef struct PORT_registers { uint8_t paodr; } PORT_registers_t; -typedef struct DDR_registers { +typedef volatile struct DDR_registers { uint8_t p1ddr; uint8_t p2ddr; uint8_t p3ddr; diff --git a/include/h8/h8s2357/ppg.h b/include/h8/h8s2357/ppg.h index b2c64e77..4c54309f 100644 --- a/include/h8/h8s2357/ppg.h +++ b/include/h8/h8s2357/ppg.h @@ -51,7 +51,7 @@ #define PPG_BASE 0xffffff46 #if LANGUAGE == C -typedef struct PPG_registers { +typedef volatile struct PPG_registers { uint8_t pcr; uint8_t pmr; uint8_t nderh; diff --git a/include/h8/h8s2357/sci.h b/include/h8/h8s2357/sci.h index 1e1f2fdb..0b16250e 100644 --- a/include/h8/h8s2357/sci.h +++ b/include/h8/h8s2357/sci.h @@ -53,7 +53,7 @@ #define SCI2_BASE 0xffffff88 #if LANGUAGE == C -typedef struct SCI_registers { +typedef volatile struct SCI_registers { uint8_t smr; uint8_t brr; uint8_t scr; diff --git a/include/h8/h8s2357/timer.h b/include/h8/h8s2357/timer.h index 2c806b41..969b6cb1 100644 --- a/include/h8/h8s2357/timer.h +++ b/include/h8/h8s2357/timer.h @@ -51,7 +51,7 @@ #define TIMER_BASE 0xffffffb0 #if LANGUAGE == C -typedef struct TIMER_registers { +typedef volatile struct TIMER_registers { uint8_t tcr0; uint8_t tcr1; uint8_t tcsr0; diff --git a/include/h8/h8s2357/tpu.h b/include/h8/h8s2357/tpu.h index 9edb0b26..ec6fe861 100644 --- a/include/h8/h8s2357/tpu.h +++ b/include/h8/h8s2357/tpu.h @@ -57,7 +57,7 @@ #define TPU_COMMON_BASE 0xffffffc0 #if LANGUAGE == C -typedef struct TPU_registers { +typedef volatile struct TPU_registers { uint8_t tcr; uint8_t tmdr; uint8_t tiorh; /* tior in TPU1, TPU2, TPU4, TPU5 */ @@ -71,7 +71,7 @@ typedef struct TPU_registers { uint16_t tgrd; /* only for TPU0 and TPU3 */ } TPU_registers_t; -typedef struct TPU_common_registers { +typedef volatile struct TPU_common_registers { uint8_t tstr; uint8_t tsyr; } TPU_common_registers_t; diff --git a/include/h8/h8s2357/wdt.h b/include/h8/h8s2357/wdt.h index 28513161..5596427c 100644 --- a/include/h8/h8s2357/wdt.h +++ b/include/h8/h8s2357/wdt.h @@ -51,7 +51,7 @@ #define WDT_BASE 0xffffffbc #if LANGUAGE == C -typedef struct WDT_registers { +typedef volatile struct WDT_registers { union { union { uint16_t tcsr;