From 400f6edf7fae363751deaa5153a097f3f2b09097 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Thu, 29 Sep 2005 11:13:32 +0000 Subject: [PATCH] 2005-09-29 Marcel Telka * h8/h83048/adc.h: Simplified preprocessor directive syntax. * 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. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@665 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- include/ChangeLog | 15 +++++++++++++++ include/NEWS | 1 + include/h8/h83048/adc.h | 6 +++--- include/h8/h83048/dac.h | 6 +++--- include/h8/h83048/dmac.h | 6 +++--- include/h8/h83048/flash.h | 6 +++--- include/h8/h83048/ic.h | 6 +++--- include/h8/h83048/itu.h | 6 +++--- include/h8/h83048/other.h | 6 +++--- include/h8/h83048/ports.h | 6 +++--- include/h8/h83048/rc.h | 6 +++--- include/h8/h83048/sci.h | 6 +++--- include/h8/h83048/tpc.h | 6 +++--- include/h8/h83048/wdt.h | 6 +++--- 14 files changed, 52 insertions(+), 36 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index a282f445..904d0c33 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,18 @@ +2005-09-29 Marcel Telka + + * h8/h83048/adc.h: Simplified preprocessor directive syntax. + * 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. + 2005-09-29 Marcel Telka * common.h: Replaced file content with openwince.h include. diff --git a/include/NEWS b/include/NEWS index 83696790..6490ac1f 100644 --- a/include/NEWS +++ b/include/NEWS @@ -3,6 +3,7 @@ $Id$ include-0.4.2: * Moved content of the obsolete common.h into new openwince.h file. + * Simplified preprocessor directive syntax for Renesas H8/3048 headers. include-0.4.1 (2005-07-15): diff --git a/include/h8/h83048/adc.h b/include/h8/h83048/adc.h index 4a40ac72..fff8a432 100644 --- a/include/h8/h83048/adc.h +++ b/include/h8/h83048/adc.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define ADC_BASE 0xffffe0 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct ADC_registers { uint8_t addrah; uint8_t addral; @@ -76,7 +76,7 @@ typedef volatile struct ADC_registers { #define ADDRDL ADC_pointer->addrdl #define ADCSR ADC_pointer->adcsr #define ADCR ADC_pointer->adcr -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define ADDRAH_OFFSET 0x00 #define ADDRAL_OFFSET 0x01 diff --git a/include/h8/h83048/dac.h b/include/h8/h83048/dac.h index d863c6bf..433c089c 100644 --- a/include/h8/h83048/dac.h +++ b/include/h8/h83048/dac.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define DAC_BASE 0xffffdc -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct DAC_registers { uint8_t dadr0; uint8_t dadr1; @@ -62,7 +62,7 @@ typedef volatile struct DAC_registers { #define DADR0 DAC_pointer->dadr0 #define DADR1 DAC_pointer->dadr1 #define DACR DAC_pointer->dacr -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define DADR0_OFFSET 0x00 #define DADR1_OFFSET 0x01 diff --git a/include/h8/h83048/dmac.h b/include/h8/h83048/dmac.h index a00ceb1f..05e0dd6c 100644 --- a/include/h8/h83048/dmac.h +++ b/include/h8/h83048/dmac.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define DMAC_BASE 0xffff20 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct DMAC_registers { uint32_t mar0a; uint16_t etcr0a; @@ -88,7 +88,7 @@ typedef volatile struct DMAC_registers { #define ETCR1B DMAC_pointer->etcr1b #define IOAR1B DMAC_pointer->ioar1b #define DTCR1B DMAC_pointer->dtcr1b -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define MAR0A_OFFSET 0x00 #define ETCR0A_OFFSET 0x04 diff --git a/include/h8/h83048/flash.h b/include/h8/h83048/flash.h index 3735c26b..6fc49409 100644 --- a/include/h8/h83048/flash.h +++ b/include/h8/h83048/flash.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define FLASH_BASE 0xffff40 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct FLASH_registers { uint8_t flmcr; uint8_t __reserved1; @@ -66,7 +66,7 @@ typedef volatile struct FLASH_registers { #define EBR1 FLASH_pointer->ebr1 #define EBR2 FLASH_pointer->ebr2 #define RAMCR FLASH_pointer->ramcr -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define FLMCR_OFFSET 0x00 #define EBR1_OFFSET 0x02 diff --git a/include/h8/h83048/ic.h b/include/h8/h83048/ic.h index 058fb3ab..883c652e 100644 --- a/include/h8/h83048/ic.h +++ b/include/h8/h83048/ic.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define IC_BASE 0xfffff4 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct IC_registers { uint8_t iscr; uint8_t ier; @@ -67,7 +67,7 @@ typedef volatile struct IC_registers { #define ISR IC_pointer->isr #define IPRA IC_pointer->ipra #define IPRB IC_pointer->iprb -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define ISCR_OFFSET 0x00 #define IER_OFFSET 0x01 diff --git a/include/h8/h83048/itu.h b/include/h8/h83048/itu.h index 3ac3532b..477a1209 100644 --- a/include/h8/h83048/itu.h +++ b/include/h8/h83048/itu.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -56,7 +56,7 @@ #define ITU3_BASE 0xffff82 #define ITU4_BASE 0xffff92 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct ITU_registers { uint8_t tcr; uint8_t tior; @@ -140,7 +140,7 @@ typedef volatile struct ITU_common2_registers { #define TOER ITU_COMMON2_pointer->toer #define TOCR ITU_COMMON2_pointer->tocr -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define TCR_OFFSET 0x00 #define TIOR_OFFSET 0x01 diff --git a/include/h8/h83048/other.h b/include/h8/h83048/other.h index 5276ea18..eeee48fb 100644 --- a/include/h8/h83048/other.h +++ b/include/h8/h83048/other.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -51,7 +51,7 @@ #define OTHER1_BASE 0xffff5c #define OTHER2_BASE 0xffffec -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct OTHER1_registers { uint8_t dastcr; uint8_t divcr; @@ -85,7 +85,7 @@ typedef volatile struct OTHER2_registers { #define MDCR OTHER2_pointer->mdcr #define SYSCR OTHER2_pointer->syscr #define BRCR OTHER2_pointer->brcr -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define DASTCR_OFFSET 0x00 #define DIVCR_OFFSET 0x01 diff --git a/include/h8/h83048/ports.h b/include/h8/h83048/ports.h index 889c0d23..adba08f9 100644 --- a/include/h8/h83048/ports.h +++ b/include/h8/h83048/ports.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define PORT_BASE 0xffffc0 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct PORT_registers { uint8_t p1ddr; uint8_t p2ddr; @@ -108,7 +108,7 @@ typedef volatile struct PORT_registers { #define P2PCR PORT_pointer->p2pcr #define P4PCR PORT_pointer->p4pcr #define P5PCR PORT_pointer->p5pcr -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define P1DDR_OFFSET 0x00 #define P2DDR_OFFSET 0x01 diff --git a/include/h8/h83048/rc.h b/include/h8/h83048/rc.h index 795680f7..24cacc6b 100644 --- a/include/h8/h83048/rc.h +++ b/include/h8/h83048/rc.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define RC_BASE 0xffffac -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct RC_registers { uint8_t rfshcr; uint8_t rtmcsr; @@ -64,7 +64,7 @@ typedef volatile struct RC_registers { #define RTMCSR RC_pointer->rtmcsr #define RTCNT RC_pointer->rtcnt #define RTCOR RC_pointer->rtcor -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define RFSHCR_OFFSET 0x00 #define RTMCSR_OFFSET 0x01 diff --git a/include/h8/h83048/sci.h b/include/h8/h83048/sci.h index ffffc147..28016c7e 100644 --- a/include/h8/h83048/sci.h +++ b/include/h8/h83048/sci.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -51,7 +51,7 @@ #define SCI0_BASE 0xffffb0 #define SCI1_BASE 0xffffb8 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct SCI_registers { uint8_t smr; uint8_t brr; @@ -80,7 +80,7 @@ typedef volatile struct SCI_registers { #define SSR1 SCI1_pointer->ssr #define RDR1 SCI1_pointer->rdr #define SCMR1 SCI1_pointer->scmr -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define SMR_OFFSET 0x00 #define BRR_OFFSET 0x01 diff --git a/include/h8/h83048/tpc.h b/include/h8/h83048/tpc.h index cd2ee403..2c44f987 100644 --- a/include/h8/h83048/tpc.h +++ b/include/h8/h83048/tpc.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define TPC_BASE 0xffffa0 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct TPC_registers { uint8_t tpmr; uint8_t tpcr; @@ -72,7 +72,7 @@ typedef volatile struct TPC_registers { #define NDRA TPC_pointer->ndra #define NDRB_D TPC_pointer->ndrb_d #define NDRA_D TPC_pointer->ndra_d -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define TPMR_OFFSET 0x00 #define TPCR_OFFSET 0x01 diff --git a/include/h8/h83048/wdt.h b/include/h8/h83048/wdt.h index a852c740..1be8c964 100644 --- a/include/h8/h83048/wdt.h +++ b/include/h8/h83048/wdt.h @@ -42,7 +42,7 @@ #include -#if LANGUAGE == C +#ifndef __ASSEMBLY__ #include #endif @@ -50,7 +50,7 @@ #define WDT_BASE 0xffffa8 -#if LANGUAGE == C +#ifndef __ASSEMBLY__ typedef volatile struct WDT_registers { union { union { @@ -81,7 +81,7 @@ typedef volatile struct WDT_registers { #define TCSR_w WDT_pointer->_timer._write.tcsr #define TCNT_w WDT_pointer->_timer._write.tcnt #define RSTCSR_w WDT_pointer->_rstcsr._write.rstcsr -#endif /* LANGUAGE == C */ +#endif /* __ASSEMBLY__ */ #define TCSR_OFFSET 0x00 #define TCNT_OFFSET_w 0x00