X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Finclude%2Fpic%2Fpic16f684.h;h=9893b063a939fbdcd541db590e17cce9e9de29fc;hb=8970dc67896685a4a83e920a0efeee4e07016ca6;hp=b02ad0ed862011a21e0b7275fe19ce6346a08f8c;hpb=13906aff7874da28c033f501fb593bffc2e25dd3;p=fw%2Fsdcc diff --git a/device/include/pic/pic16f684.h b/device/include/pic/pic16f684.h index b02ad0ed..9893b063 100644 --- a/device/include/pic/pic16f684.h +++ b/device/include/pic/pic16f684.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 // @@ -337,6 +337,7 @@ typedef union { } __ADCON0_bits_t; extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +#ifndef NO_BIT_DEFINES #define ADON ADCON0_bits.ADON #define GO ADCON0_bits.GO #define NOT_DONE ADCON0_bits.NOT_DONE @@ -346,6 +347,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -362,9 +364,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define ADCS0 ADCON1_bits.ADCS0 #define ADCS1 ADCON1_bits.ADCS1 #define ADCS2 ADCON1_bits.ADCS2 +#endif /* NO_BIT_DEFINES */ // ----- ANSEL bits -------------------- typedef union { @@ -381,6 +385,7 @@ typedef union { } __ANSEL_bits_t; extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +#ifndef NO_BIT_DEFINES #define ANS0 ANSEL_bits.ANS0 #define ANS1 ANSEL_bits.ANS1 #define ANS2 ANSEL_bits.ANS2 @@ -389,6 +394,7 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define ANS5 ANSEL_bits.ANS5 #define ANS6 ANSEL_bits.ANS6 #define ANS7 ANSEL_bits.ANS7 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -405,6 +411,7 @@ typedef union { } __CCP1CON_bits_t; extern volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; +#ifndef NO_BIT_DEFINES #define CCP1M0 CCP1CON_bits.CCP1M0 #define CCP1M1 CCP1CON_bits.CCP1M1 #define CCP1M2 CCP1CON_bits.CCP1M2 @@ -413,6 +420,7 @@ extern volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; #define DC1B1 CCP1CON_bits.DC1B1 #define P1M0 CCP1CON_bits.P1M0 #define P1M1 CCP1CON_bits.P1M1 +#endif /* NO_BIT_DEFINES */ // ----- CMCON0 bits -------------------- typedef union { @@ -429,6 +437,7 @@ typedef union { } __CMCON0_bits_t; extern volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; +#ifndef NO_BIT_DEFINES #define CM0 CMCON0_bits.CM0 #define CM1 CMCON0_bits.CM1 #define CM2 CMCON0_bits.CM2 @@ -437,6 +446,7 @@ extern volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; #define C2INV CMCON0_bits.C2INV #define C1OUT CMCON0_bits.C1OUT #define C2OUT CMCON0_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CMCON1 bits -------------------- typedef union { @@ -453,8 +463,10 @@ typedef union { } __CMCON1_bits_t; extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CMCON1_bits.C2SYNC #define T1GSS CMCON1_bits.T1GSS +#endif /* NO_BIT_DEFINES */ // ----- ECCPAS bits -------------------- typedef union { @@ -471,6 +483,7 @@ typedef union { } __ECCPAS_bits_t; extern volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; +#ifndef NO_BIT_DEFINES #define PSSBD0 ECCPAS_bits.PSSBD0 #define PSSBD1 ECCPAS_bits.PSSBD1 #define PSSAC0 ECCPAS_bits.PSSAC0 @@ -479,6 +492,7 @@ extern volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; #define ECCPAS1 ECCPAS_bits.ECCPAS1 #define ECCPAS2 ECCPAS_bits.ECCPAS2 #define ECCPASE ECCPAS_bits.ECCPASE +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -495,10 +509,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 { @@ -515,6 +531,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 @@ -523,6 +540,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 */ // ----- IOC bits -------------------- typedef union { @@ -539,12 +557,14 @@ typedef union { } __IOC_bits_t; extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +#ifndef NO_BIT_DEFINES #define IOC0 IOC_bits.IOC0 #define IOC1 IOC_bits.IOC1 #define IOC2 IOC_bits.IOC2 #define IOC3 IOC_bits.IOC3 #define IOC4 IOC_bits.IOC4 #define IOC5 IOC_bits.IOC5 +#endif /* NO_BIT_DEFINES */ // ----- IOCA bits -------------------- typedef union { @@ -561,12 +581,14 @@ typedef union { } __IOCA_bits_t; extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; +#ifndef NO_BIT_DEFINES #define IOCA0 IOCA_bits.IOCA0 #define IOCA1 IOCA_bits.IOCA1 #define IOCA2 IOCA_bits.IOCA2 #define IOCA3 IOCA_bits.IOCA3 #define IOCA4 IOCA_bits.IOCA4 #define IOCA5 IOCA_bits.IOCA5 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -583,6 +605,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 @@ -591,6 +614,7 @@ extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; #define T0CS OPTION_REG_bits.T0CS #define INTEDG OPTION_REG_bits.INTEDG #define NOT_RAPU OPTION_REG_bits.NOT_RAPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -607,6 +631,7 @@ typedef union { } __OSCCON_bits_t; extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; +#ifndef NO_BIT_DEFINES #define SCS OSCCON_bits.SCS #define LTS OSCCON_bits.LTS #define HTS OSCCON_bits.HTS @@ -614,6 +639,7 @@ extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; #define IRCF0 OSCCON_bits.IRCF0 #define IRCF1 OSCCON_bits.IRCF1 #define IRCF2 OSCCON_bits.IRCF2 +#endif /* NO_BIT_DEFINES */ // ----- OSCTUNE bits -------------------- typedef union { @@ -630,11 +656,13 @@ typedef union { } __OSCTUNE_bits_t; extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; +#ifndef NO_BIT_DEFINES #define TUN0 OSCTUNE_bits.TUN0 #define TUN1 OSCTUNE_bits.TUN1 #define TUN2 OSCTUNE_bits.TUN2 #define TUN3 OSCTUNE_bits.TUN3 #define TUN4 OSCTUNE_bits.TUN4 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -651,10 +679,12 @@ 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 #define SBODEN PCON_bits.SBODEN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -681,6 +711,7 @@ 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 T2IE PIE1_bits.T2IE @@ -691,6 +722,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define CCP1IE PIE1_bits.CCP1IE #define ADIE PIE1_bits.ADIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -717,6 +749,7 @@ 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 T2IF PIR1_bits.T2IF @@ -727,6 +760,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CCP1IF PIR1_bits.CCP1IF #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -743,12 +777,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 { @@ -765,6 +801,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 @@ -773,6 +810,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 */ // ----- PWM1CON bits -------------------- typedef union { @@ -789,6 +827,7 @@ typedef union { } __PWM1CON_bits_t; extern volatile __PWM1CON_bits_t __at(PWM1CON_ADDR) PWM1CON_bits; +#ifndef NO_BIT_DEFINES #define PDC0 PWM1CON_bits.PDC0 #define PDC1 PWM1CON_bits.PDC1 #define PDC2 PWM1CON_bits.PDC2 @@ -797,6 +836,7 @@ extern volatile __PWM1CON_bits_t __at(PWM1CON_ADDR) PWM1CON_bits; #define PDC5 PWM1CON_bits.PDC5 #define PDC6 PWM1CON_bits.PDC6 #define PRSEN PWM1CON_bits.PRSEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -813,6 +853,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 @@ -821,6 +862,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 { @@ -837,6 +879,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 @@ -845,6 +888,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define TMR1GE T1CON_bits.TMR1GE #define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -861,6 +905,7 @@ typedef union { } __T2CON_bits_t; extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +#ifndef NO_BIT_DEFINES #define T2CKPS0 T2CON_bits.T2CKPS0 #define T2CKPS1 T2CON_bits.T2CKPS1 #define TMR2ON T2CON_bits.TMR2ON @@ -868,6 +913,7 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS1 T2CON_bits.TOUTPS1 #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +#endif /* NO_BIT_DEFINES */ // ----- TRISA bits -------------------- typedef union { @@ -884,12 +930,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 { @@ -906,6 +954,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 @@ -914,6 +963,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 { @@ -930,12 +980,14 @@ 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 */ // ----- WDTCON bits -------------------- typedef union { @@ -952,10 +1004,12 @@ typedef union { } __WDTCON_bits_t; extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +#ifndef NO_BIT_DEFINES #define SWDTEN WDTCON_bits.SWDTEN #define WDTPS0 WDTCON_bits.WDTPS0 #define WDTPS1 WDTCON_bits.WDTPS1 #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +#endif /* NO_BIT_DEFINES */ #endif