* Makefile.in, configure.in, configure,

[fw/sdcc] / device / include / pic / pic16f630.h

diff --git a/device/include/pic/pic16f630.h b/device/include/pic/pic16f630.h
index 0008012740eb877fb10061f9b1bf3a101a557ed6..edd4e4d3c2064f83789ea1ec7efdacbb85f2d8e5 100644 (file)
--- a/device/include/pic/pic16f630.h
+++ b/device/include/pic/pic16f630.h
@@ -4,7 +4,7 @@
 //
 // This header file was automatically generated by:
 //
-//     inc2h.pl V4585
+//     inc2h.pl V4783
 //
 //     Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved
 //
@@ -235,12 +235,14 @@ typedef union {
 } __CMCON_bits_t;
 extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits;
 
+#ifndef NO_BIT_DEFINES
 #define CM0                  CMCON_bits.CM0
 #define CM1                  CMCON_bits.CM1
 #define CM2                  CMCON_bits.CM2
 #define CIS                  CMCON_bits.CIS
 #define CINV                 CMCON_bits.CINV
 #define COUT                 CMCON_bits.COUT
+#endif /* NO_BIT_DEFINES */
 
 // ----- EECON1 bits --------------------
 typedef union {
@@ -257,10 +259,12 @@ typedef union {
 } __EECON1_bits_t;
 extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits;
 
+#ifndef NO_BIT_DEFINES
 #define RD                   EECON1_bits.RD
 #define WR                   EECON1_bits.WR
 #define WREN                 EECON1_bits.WREN
 #define WRERR                EECON1_bits.WRERR
+#endif /* NO_BIT_DEFINES */
 
 // ----- INTCON bits --------------------
 typedef union {
@@ -277,6 +281,7 @@ typedef union {
 } __INTCON_bits_t;
 extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits;
 
+#ifndef NO_BIT_DEFINES
 #define RAIF                 INTCON_bits.RAIF
 #define INTF                 INTCON_bits.INTF
 #define T0IF                 INTCON_bits.T0IF
@@ -285,6 +290,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits;
 #define T0IE                 INTCON_bits.T0IE
 #define PEIE                 INTCON_bits.PEIE
 #define GIE                  INTCON_bits.GIE
+#endif /* NO_BIT_DEFINES */
 
 // ----- OPTION_REG bits --------------------
 typedef union {
@@ -311,6 +317,7 @@ typedef union {
 } __OPTION_REG_bits_t;
 extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits;
 
+#ifndef NO_BIT_DEFINES
 #define PS0                  OPTION_REG_bits.PS0
 #define PS1                  OPTION_REG_bits.PS1
 #define PS2                  OPTION_REG_bits.PS2
@@ -320,6 +327,7 @@ extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits;
 #define INTEDG               OPTION_REG_bits.INTEDG
 #define NOT_GPPU             OPTION_REG_bits.NOT_GPPU
 #define NOT_RAPU             OPTION_REG_bits.NOT_RAPU
+#endif /* NO_BIT_DEFINES */
 
 // ----- OSCCAL bits --------------------
 typedef union {
@@ -336,12 +344,14 @@ typedef union {
 } __OSCCAL_bits_t;
 extern volatile __OSCCAL_bits_t __at(OSCCAL_ADDR) OSCCAL_bits;
 
+#ifndef NO_BIT_DEFINES
 #define CAL0                 OSCCAL_bits.CAL0
 #define CAL1                 OSCCAL_bits.CAL1
 #define CAL2                 OSCCAL_bits.CAL2
 #define CAL3                 OSCCAL_bits.CAL3
 #define CAL4                 OSCCAL_bits.CAL4
 #define CAL5                 OSCCAL_bits.CAL5
+#endif /* NO_BIT_DEFINES */
 
 // ----- PCON bits --------------------
 typedef union {
@@ -358,8 +368,10 @@ typedef union {
 } __PCON_bits_t;
 extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits;
 
+#ifndef NO_BIT_DEFINES
 #define NOT_BOD              PCON_bits.NOT_BOD
 #define NOT_POR              PCON_bits.NOT_POR
+#endif /* NO_BIT_DEFINES */
 
 // ----- PIE1 bits --------------------
 typedef union {
@@ -386,11 +398,13 @@ typedef union {
 } __PIE1_bits_t;
 extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits;
 
+#ifndef NO_BIT_DEFINES
 #define T1IE                 PIE1_bits.T1IE
 #define TMR1IE               PIE1_bits.TMR1IE
 #define CMIE                 PIE1_bits.CMIE
 #define ADIE                 PIE1_bits.ADIE
 #define EEIE                 PIE1_bits.EEIE
+#endif /* NO_BIT_DEFINES */
 
 // ----- PIR1 bits --------------------
 typedef union {
@@ -417,11 +431,13 @@ typedef union {
 } __PIR1_bits_t;
 extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits;
 
+#ifndef NO_BIT_DEFINES
 #define T1IF                 PIR1_bits.T1IF
 #define TMR1IF               PIR1_bits.TMR1IF
 #define CMIF                 PIR1_bits.CMIF
 #define ADIF                 PIR1_bits.ADIF
 #define EEIF                 PIR1_bits.EEIF
+#endif /* NO_BIT_DEFINES */
 
 // ----- PORTA bits --------------------
 typedef union {
@@ -438,12 +454,14 @@ typedef union {
 } __PORTA_bits_t;
 extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits;
 
+#ifndef NO_BIT_DEFINES
 #define RA0                  PORTA_bits.RA0
 #define RA1                  PORTA_bits.RA1
 #define RA2                  PORTA_bits.RA2
 #define RA3                  PORTA_bits.RA3
 #define RA4                  PORTA_bits.RA4
 #define RA5                  PORTA_bits.RA5
+#endif /* NO_BIT_DEFINES */
 
 // ----- PORTC bits --------------------
 typedef union {
@@ -460,6 +478,7 @@ typedef union {
 } __PORTC_bits_t;
 extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits;
 
+#ifndef NO_BIT_DEFINES
 #define RC0                  PORTC_bits.RC0
 #define RC1                  PORTC_bits.RC1
 #define RC2                  PORTC_bits.RC2
@@ -468,6 +487,7 @@ extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits;
 #define RC5                  PORTC_bits.RC5
 #define RC6                  PORTC_bits.RC6
 #define RC7                  PORTC_bits.RC7
+#endif /* NO_BIT_DEFINES */
 
 // ----- STATUS bits --------------------
 typedef union {
@@ -484,6 +504,7 @@ typedef union {
 } __STATUS_bits_t;
 extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits;
 
+#ifndef NO_BIT_DEFINES
 #define C                    STATUS_bits.C
 #define DC                   STATUS_bits.DC
 #define Z                    STATUS_bits.Z
@@ -492,6 +513,7 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits;
 #define RP0                  STATUS_bits.RP0
 #define RP1                  STATUS_bits.RP1
 #define IRP                  STATUS_bits.IRP
+#endif /* NO_BIT_DEFINES */
 
 // ----- T1CON bits --------------------
 typedef union {
@@ -508,6 +530,7 @@ typedef union {
 } __T1CON_bits_t;
 extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits;
 
+#ifndef NO_BIT_DEFINES
 #define TMR1ON               T1CON_bits.TMR1ON
 #define TMR1CS               T1CON_bits.TMR1CS
 #define NOT_T1SYNC           T1CON_bits.NOT_T1SYNC
@@ -515,6 +538,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits;
 #define T1CKPS0              T1CON_bits.T1CKPS0
 #define T1CKPS1              T1CON_bits.T1CKPS1
 #define TMR1GE               T1CON_bits.TMR1GE
+#endif /* NO_BIT_DEFINES */
 
 // ----- TRISA bits --------------------
 typedef union {
@@ -531,12 +555,14 @@ typedef union {
 } __TRISA_bits_t;
 extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits;
 
+#ifndef NO_BIT_DEFINES
 #define TRISA0               TRISA_bits.TRISA0
 #define TRISA1               TRISA_bits.TRISA1
 #define TRISA2               TRISA_bits.TRISA2
 #define TRISA3               TRISA_bits.TRISA3
 #define TRISA4               TRISA_bits.TRISA4
 #define TRISA5               TRISA_bits.TRISA5
+#endif /* NO_BIT_DEFINES */
 
 // ----- TRISC bits --------------------
 typedef union {
@@ -553,6 +579,7 @@ typedef union {
 } __TRISC_bits_t;
 extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits;
 
+#ifndef NO_BIT_DEFINES
 #define TRISC0               TRISC_bits.TRISC0
 #define TRISC1               TRISC_bits.TRISC1
 #define TRISC2               TRISC_bits.TRISC2
@@ -561,6 +588,7 @@ extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits;
 #define TRISC5               TRISC_bits.TRISC5
 #define TRISC6               TRISC_bits.TRISC6
 #define TRISC7               TRISC_bits.TRISC7
+#endif /* NO_BIT_DEFINES */
 
 // ----- VRCON bits --------------------
 typedef union {
@@ -577,11 +605,13 @@ typedef union {
 } __VRCON_bits_t;
 extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits;
 
+#ifndef NO_BIT_DEFINES
 #define VR0                  VRCON_bits.VR0
 #define VR1                  VRCON_bits.VR1
 #define VR2                  VRCON_bits.VR2
 #define VR3                  VRCON_bits.VR3
 #define VRR                  VRCON_bits.VRR
 #define VREN                 VRCON_bits.VREN
+#endif /* NO_BIT_DEFINES */
 
 #endif