From 95076014fa7ba0e0e3a04d537ff1f2eca72a5467 Mon Sep 17 00:00:00 2001 From: tecodev Date: Tue, 12 Jun 2007 21:49:18 +0000 Subject: [PATCH] * support/scripts/inc2h.pl: conditionally emit defines for SFR bits, suppress bit defines if NO_BIT_DEFINES is #define'd * device/include/pic/pic*.h: recreated all headers to include conditional bit defines * device/include/pic/pic16f886.h, * device/include/pic/pic16f887.h: fixed based on newer .inc file * device/include/pic/recreate.sh: script to recreate the complete device library files based on the currently supported devices git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4850 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 11 +++ device/include/pic/pic12f629.h | 30 +++++++- device/include/pic/pic12f635.h | 44 +++++++++++- device/include/pic/pic12f675.h | 34 ++++++++- device/include/pic/pic12f683.h | 44 +++++++++++- device/include/pic/pic16c432.h | 26 ++++++- device/include/pic/pic16c433.h | 20 +++++- device/include/pic/pic16c554.h | 18 ++++- device/include/pic/pic16c557.h | 22 +++++- device/include/pic/pic16c558.h | 18 ++++- device/include/pic/pic16c62.h | 36 +++++++++- device/include/pic/pic16c620.h | 26 ++++++- device/include/pic/pic16c620a.h | 26 ++++++- device/include/pic/pic16c621.h | 26 ++++++- device/include/pic/pic16c621a.h | 26 ++++++- device/include/pic/pic16c622.h | 26 ++++++- device/include/pic/pic16c622a.h | 26 ++++++- device/include/pic/pic16c63a.h | 46 +++++++++++- device/include/pic/pic16c65b.h | 54 +++++++++++++- device/include/pic/pic16c71.h | 20 +++++- device/include/pic/pic16c710.h | 22 +++++- device/include/pic/pic16c711.h | 22 +++++- device/include/pic/pic16c715.h | 26 ++++++- device/include/pic/pic16c717.h | 48 ++++++++++++- device/include/pic/pic16c72.h | 40 ++++++++++- device/include/pic/pic16c73b.h | 50 ++++++++++++- device/include/pic/pic16c745.h | 56 ++++++++++++++- device/include/pic/pic16c74b.h | 58 ++++++++++++++- device/include/pic/pic16c765.h | 64 ++++++++++++++++- device/include/pic/pic16c770.h | 48 ++++++++++++- device/include/pic/pic16c771.h | 48 ++++++++++++- device/include/pic/pic16c773.h | 56 ++++++++++++++- device/include/pic/pic16c774.h | 64 ++++++++++++++++- device/include/pic/pic16c781.h | 50 ++++++++++++- device/include/pic/pic16c782.h | 50 ++++++++++++- device/include/pic/pic16c925.h | 56 ++++++++++++++- device/include/pic/pic16c926.h | 56 ++++++++++++++- device/include/pic/pic16f627.h | 38 +++++++++- device/include/pic/pic16f627a.h | 38 +++++++++- device/include/pic/pic16f628.h | 38 +++++++++- device/include/pic/pic16f628a.h | 38 +++++++++- device/include/pic/pic16f630.h | 32 ++++++++- device/include/pic/pic16f636.h | 48 ++++++++++++- device/include/pic/pic16f639.h | 48 ++++++++++++- device/include/pic/pic16f648a.h | 38 +++++++++- device/include/pic/pic16f676.h | 38 +++++++++- device/include/pic/pic16f684.h | 56 ++++++++++++++- device/include/pic/pic16f685.h | 78 +++++++++++++++++++- device/include/pic/pic16f687.h | 82 ++++++++++++++++++++- device/include/pic/pic16f688.h | 52 +++++++++++++- device/include/pic/pic16f689.h | 82 ++++++++++++++++++++- device/include/pic/pic16f690.h | 92 +++++++++++++++++++++++- device/include/pic/pic16f716.h | 36 +++++++++- device/include/pic/pic16f72.h | 42 ++++++++++- device/include/pic/pic16f73.h | 52 +++++++++++++- device/include/pic/pic16f737.h | 78 +++++++++++++++++++- device/include/pic/pic16f74.h | 60 +++++++++++++++- device/include/pic/pic16f76.h | 52 +++++++++++++- device/include/pic/pic16f767.h | 74 ++++++++++++++++++- device/include/pic/pic16f77.h | 60 +++++++++++++++- device/include/pic/pic16f777.h | 78 +++++++++++++++++++- device/include/pic/pic16f785.h | 68 +++++++++++++++++- device/include/pic/pic16f818.h | 46 +++++++++++- device/include/pic/pic16f819.h | 46 +++++++++++- device/include/pic/pic16f84.h | 18 ++++- device/include/pic/pic16f84a.h | 18 ++++- device/include/pic/pic16f87.h | 52 +++++++++++++- device/include/pic/pic16f870.h | 46 +++++++++++- device/include/pic/pic16f871.h | 54 +++++++++++++- device/include/pic/pic16f872.h | 48 ++++++++++++- device/include/pic/pic16f873.h | 54 +++++++++++++- device/include/pic/pic16f873a.h | 58 ++++++++++++++- device/include/pic/pic16f874.h | 62 +++++++++++++++- device/include/pic/pic16f874a.h | 66 ++++++++++++++++- device/include/pic/pic16f876.h | 54 +++++++++++++- device/include/pic/pic16f876a.h | 58 ++++++++++++++- device/include/pic/pic16f877.h | 62 +++++++++++++++- device/include/pic/pic16f877a.h | 66 ++++++++++++++++- device/include/pic/pic16f88.h | 56 ++++++++++++++- device/include/pic/pic16f886.h | 119 +++++++++++++++++++++++++++--- device/include/pic/pic16f887.h | 123 +++++++++++++++++++++++++++++--- device/include/pic/pic16f913.h | 106 ++++++++++++++++++++++++++- device/include/pic/pic16f914.h | 122 ++++++++++++++++++++++++++++++- device/include/pic/pic16f916.h | 106 ++++++++++++++++++++++++++- device/include/pic/pic16f917.h | 122 ++++++++++++++++++++++++++++++- device/include/pic/recreate.sh | 20 ++++++ support/scripts/inc2h.pl | 2 + 87 files changed, 4277 insertions(+), 98 deletions(-) create mode 100755 device/include/pic/recreate.sh diff --git a/ChangeLog b/ChangeLog index 0442bbf3..9a1ce174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-06-12 Raphael Neider + + * support/scripts/inc2h.pl: conditionally emit defines for SFR bits, + suppress bit defines if NO_BIT_DEFINES is #define'd + * device/include/pic/pic*.h: recreated all headers to include + conditional bit defines + * device/include/pic/pic16f886.h, + * device/include/pic/pic16f887.h: fixed based on newer .inc file + * device/include/pic/recreate.sh: script to recreate the complete + device library files based on the currently supported devices + 2007-06-12 Borut Razem * src/pic16/main.c, src/SDCCargs.h, SDCCmain.c, diff --git a/device/include/pic/pic12f629.h b/device/include/pic/pic12f629.h index 4e701117..2d398be5 100644 --- a/device/include/pic/pic12f629.h +++ b/device/include/pic/pic12f629.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 // @@ -244,12 +244,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 { @@ -266,10 +268,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 */ // ----- GPIO bits -------------------- typedef union { @@ -296,6 +300,7 @@ typedef union { } __GPIO_bits_t; extern volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; +#ifndef NO_BIT_DEFINES #define GP0 GPIO_bits.GP0 #define GPIO0 GPIO_bits.GPIO0 #define GP1 GPIO_bits.GP1 @@ -308,6 +313,7 @@ extern volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; #define GPIO4 GPIO_bits.GPIO4 #define GP5 GPIO_bits.GP5 #define GPIO5 GPIO_bits.GPIO5 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -324,6 +330,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define GPIF INTCON_bits.GPIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -332,6 +339,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 { @@ -348,12 +356,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 */ // ----- IOCB bits -------------------- typedef union { @@ -370,12 +380,14 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB0 IOCB_bits.IOCB0 #define IOCB1 IOCB_bits.IOCB1 #define IOCB2 IOCB_bits.IOCB2 #define IOCB3 IOCB_bits.IOCB3 #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -392,6 +404,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 @@ -400,6 +413,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_GPPU OPTION_REG_bits.NOT_GPPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCAL bits -------------------- typedef union { @@ -416,12 +430,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 { @@ -438,8 +454,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 { @@ -466,11 +484,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 { @@ -497,11 +517,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 */ // ----- STATUS bits -------------------- typedef union { @@ -518,6 +540,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 @@ -526,6 +549,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 { @@ -542,6 +566,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 @@ -549,6 +574,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 */ // ----- VRCON bits -------------------- typedef union { @@ -565,11 +591,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 diff --git a/device/include/pic/pic12f635.h b/device/include/pic/pic12f635.h index 1c5d7887..62e13bcb 100644 --- a/device/include/pic/pic12f635.h +++ b/device/include/pic/pic12f635.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 // @@ -294,12 +294,14 @@ 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 #define CIS CMCON0_bits.CIS #define C1INV CMCON0_bits.C1INV #define C1OUT CMCON0_bits.C1OUT +#endif /* NO_BIT_DEFINES */ // ----- CMCON1 bits -------------------- typedef union { @@ -316,8 +318,10 @@ typedef union { } __CMCON1_bits_t; extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +#ifndef NO_BIT_DEFINES #define C1SYNC CMCON1_bits.C1SYNC #define T1GSS CMCON1_bits.T1GSS +#endif /* NO_BIT_DEFINES */ // ----- CRCON bits -------------------- typedef union { @@ -334,10 +338,12 @@ typedef union { } __CRCON_bits_t; extern volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; +#ifndef NO_BIT_DEFINES #define CRREG0 CRCON_bits.CRREG0 #define CRREG1 CRCON_bits.CRREG1 #define ENC_DEC CRCON_bits.ENC_DEC #define GO CRCON_bits.GO +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -354,10 +360,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 */ // ----- GPIO bits -------------------- typedef union { @@ -374,12 +382,14 @@ typedef union { } __GPIO_bits_t; extern volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; +#ifndef NO_BIT_DEFINES #define GP0 GPIO_bits.GP0 #define GP1 GPIO_bits.GP1 #define GP2 GPIO_bits.GP2 #define GP3 GPIO_bits.GP3 #define GP4 GPIO_bits.GP4 #define GP5 GPIO_bits.GP5 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -396,6 +406,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 @@ -404,6 +415,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 */ // ----- IOCA bits -------------------- typedef union { @@ -420,12 +432,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -442,11 +456,13 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define PLVDEN LVDCON_bits.PLVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -463,6 +479,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 @@ -471,6 +488,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 { @@ -487,6 +505,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 @@ -494,6 +513,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 { @@ -510,11 +530,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 { @@ -531,11 +553,13 @@ 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 NOT_WUR PCON_bits.NOT_WUR #define SBODEN PCON_bits.SBODEN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -552,12 +576,14 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define OSFIE PIE1_bits.OSFIE #define C1IE PIE1_bits.C1IE #define CRIE PIE1_bits.CRIE #define LVDIE PIE1_bits.LVDIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -574,12 +600,14 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define OSFIF PIR1_bits.OSFIF #define C1IF PIR1_bits.C1IF #define CRIF PIR1_bits.CRIF #define LVDIF PIR1_bits.LVDIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -596,12 +624,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 */ // ----- STATUS bits -------------------- typedef union { @@ -618,6 +648,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 @@ -626,6 +657,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 { @@ -642,6 +674,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 @@ -650,6 +683,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 */ // ----- VRCON bits -------------------- typedef union { @@ -666,12 +700,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 */ // ----- WDA bits -------------------- typedef union { @@ -688,11 +724,13 @@ typedef union { } __WDA_bits_t; extern volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; +#ifndef NO_BIT_DEFINES #define WDA0 WDA_bits.WDA0 #define WDA1 WDA_bits.WDA1 #define WDA2 WDA_bits.WDA2 #define WDA4 WDA_bits.WDA4 #define WDA5 WDA_bits.WDA5 +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -709,11 +747,13 @@ 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 */ // ----- WPUDA bits -------------------- typedef union { @@ -730,10 +770,12 @@ typedef union { } __WPUDA_bits_t; extern volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; +#ifndef NO_BIT_DEFINES #define WPUDA0 WPUDA_bits.WPUDA0 #define WPUDA1 WPUDA_bits.WPUDA1 #define WPUDA2 WPUDA_bits.WPUDA2 #define WPUDA4 WPUDA_bits.WPUDA4 #define WPUDA5 WPUDA_bits.WPUDA5 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic12f675.h b/device/include/pic/pic12f675.h index 66e338c2..0f4a9a44 100644 --- a/device/include/pic/pic12f675.h +++ b/device/include/pic/pic12f675.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 // @@ -279,6 +279,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 @@ -287,6 +288,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS1 ADCON0_bits.CHS1 #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ANSEL bits -------------------- typedef union { @@ -303,6 +305,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 @@ -310,6 +313,7 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define ADCS0 ANSEL_bits.ADCS0 #define ADCS1 ANSEL_bits.ADCS1 #define ADCS2 ANSEL_bits.ADCS2 +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -326,12 +330,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 { @@ -348,10 +354,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 */ // ----- GPIO bits -------------------- typedef union { @@ -378,6 +386,7 @@ typedef union { } __GPIO_bits_t; extern volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; +#ifndef NO_BIT_DEFINES #define GP0 GPIO_bits.GP0 #define GPIO0 GPIO_bits.GPIO0 #define GP1 GPIO_bits.GP1 @@ -390,6 +399,7 @@ extern volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; #define GPIO4 GPIO_bits.GPIO4 #define GP5 GPIO_bits.GP5 #define GPIO5 GPIO_bits.GPIO5 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -406,6 +416,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define GPIF INTCON_bits.GPIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -414,6 +425,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 { @@ -430,12 +442,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 */ // ----- IOCB bits -------------------- typedef union { @@ -452,12 +466,14 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB0 IOCB_bits.IOCB0 #define IOCB1 IOCB_bits.IOCB1 #define IOCB2 IOCB_bits.IOCB2 #define IOCB3 IOCB_bits.IOCB3 #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -474,6 +490,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 @@ -482,6 +499,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_GPPU OPTION_REG_bits.NOT_GPPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCAL bits -------------------- typedef union { @@ -498,12 +516,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 { @@ -520,8 +540,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 { @@ -548,11 +570,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 { @@ -579,11 +603,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 */ // ----- STATUS bits -------------------- typedef union { @@ -600,6 +626,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 @@ -608,6 +635,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 { @@ -624,6 +652,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 @@ -631,6 +660,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 */ // ----- VRCON bits -------------------- typedef union { @@ -647,11 +677,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 diff --git a/device/include/pic/pic12f683.h b/device/include/pic/pic12f683.h index 7e7a4e1f..4e348289 100644 --- a/device/include/pic/pic12f683.h +++ b/device/include/pic/pic12f683.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 // @@ -319,6 +319,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 @@ -328,6 +329,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 */ // ----- ANSEL bits -------------------- typedef union { @@ -344,6 +346,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 @@ -351,6 +354,7 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define ADCS0 ANSEL_bits.ADCS0 #define ADCS1 ANSEL_bits.ADCS1 #define ADCS2 ANSEL_bits.ADCS2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -367,12 +371,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define DC1B0 CCP1CON_bits.DC1B0 #define DC1B1 CCP1CON_bits.DC1B1 +#endif /* NO_BIT_DEFINES */ // ----- CMCON0 bits -------------------- typedef union { @@ -389,12 +395,14 @@ 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 #define CIS CMCON0_bits.CIS #define CINV CMCON0_bits.CINV #define COUT CMCON0_bits.COUT +#endif /* NO_BIT_DEFINES */ // ----- CMCON1 bits -------------------- typedef union { @@ -411,8 +419,10 @@ typedef union { } __CMCON1_bits_t; extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +#ifndef NO_BIT_DEFINES #define CMSYNC CMCON1_bits.CMSYNC #define T1GSS CMCON1_bits.T1GSS +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -429,10 +439,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 */ // ----- GPIO bits -------------------- typedef union { @@ -459,6 +471,7 @@ typedef union { } __GPIO_bits_t; extern volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; +#ifndef NO_BIT_DEFINES #define GP0 GPIO_bits.GP0 #define GPIO0 GPIO_bits.GPIO0 #define GP1 GPIO_bits.GP1 @@ -471,6 +484,7 @@ extern volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; #define GPIO4 GPIO_bits.GPIO4 #define GP5 GPIO_bits.GP5 #define GPIO5 GPIO_bits.GPIO5 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -487,6 +501,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define GPIF INTCON_bits.GPIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -495,6 +510,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 { @@ -511,12 +527,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 { @@ -533,12 +551,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 { @@ -555,6 +575,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 @@ -563,6 +584,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_GPPU OPTION_REG_bits.NOT_GPPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -579,6 +601,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 @@ -586,6 +609,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 { @@ -602,11 +626,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 { @@ -623,10 +649,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 { @@ -653,6 +681,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 @@ -662,6 +691,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 { @@ -688,6 +718,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 @@ -697,6 +728,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 */ // ----- STATUS bits -------------------- typedef union { @@ -713,6 +745,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 @@ -721,6 +754,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 { @@ -737,6 +771,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 @@ -745,6 +780,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1GE T1CON_bits.T1GE #define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -761,6 +797,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 @@ -768,6 +805,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 */ // ----- VRCON bits -------------------- typedef union { @@ -784,12 +822,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 { @@ -806,10 +846,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 diff --git a/device/include/pic/pic16c432.h b/device/include/pic/pic16c432.h index a4ba728d..d22a57fa 100644 --- a/device/include/pic/pic16c432.h +++ b/device/include/pic/pic16c432.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 // @@ -197,12 +197,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 C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -219,6 +221,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -227,6 +230,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 */ // ----- LINPRT bits -------------------- typedef union { @@ -243,8 +247,10 @@ typedef union { } __LINPRT_bits_t; extern volatile __LINPRT_bits_t __at(LINPRT_ADDR) LINPRT_bits; +#ifndef NO_BIT_DEFINES #define LINVDD LINPRT_bits.LINVDD #define LINTX LINPRT_bits.LINTX +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -261,6 +267,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 @@ -269,6 +276,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -295,9 +303,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -314,7 +324,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define CMIE PIE1_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -331,7 +343,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define CMIF PIR1_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -348,7 +362,9 @@ typedef union { } __PORTA_bits_t; extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +#ifndef NO_BIT_DEFINES #define LINRX PORTA_bits.LINRX +#endif /* NO_BIT_DEFINES */ // ----- PORTB bits -------------------- typedef union { @@ -365,6 +381,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -373,6 +390,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -389,6 +407,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 @@ -397,6 +416,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 */ // ----- TRISB bits -------------------- typedef union { @@ -413,6 +433,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -421,6 +442,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -437,6 +459,7 @@ 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 @@ -444,5 +467,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c433.h b/device/include/pic/pic16c433.h index 3e3741f6..ff535d29 100644 --- a/device/include/pic/pic16c433.h +++ b/device/include/pic/pic16c433.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 // @@ -218,6 +218,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 @@ -226,6 +227,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS1 ADCON0_bits.CHS1 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -242,9 +244,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -261,6 +265,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define GPIF INTCON_bits.GPIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -269,6 +274,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 { @@ -285,6 +291,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 @@ -293,6 +300,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_GPPU OPTION_REG_bits.NOT_GPPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCAL bits -------------------- typedef union { @@ -309,12 +317,14 @@ typedef union { } __OSCCAL_bits_t; extern volatile __OSCCAL_bits_t __at(OSCCAL_ADDR) OSCCAL_bits; +#ifndef NO_BIT_DEFINES #define CALSLW OSCCAL_bits.CALSLW #define CALFST OSCCAL_bits.CALFST #define CAL0 OSCCAL_bits.CAL0 #define CAL1 OSCCAL_bits.CAL1 #define CAL2 OSCCAL_bits.CAL2 #define CAL3 OSCCAL_bits.CAL3 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -331,7 +341,9 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -348,7 +360,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -365,7 +379,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -392,6 +408,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 @@ -402,5 +419,6 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define LINRX STATUS_bits.LINRX #define IRP STATUS_bits.IRP #define LINTX STATUS_bits.LINTX +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c554.h b/device/include/pic/pic16c554.h index 22d8f762..9ccc4f67 100644 --- a/device/include/pic/pic16c554.h +++ b/device/include/pic/pic16c554.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 // @@ -164,6 +164,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -171,6 +172,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define INTE INTCON_bits.INTE #define T0IE INTCON_bits.T0IE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -187,6 +189,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 @@ -195,6 +198,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -211,7 +215,9 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -228,12 +234,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 */ // ----- PORTB bits -------------------- typedef union { @@ -250,6 +258,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -258,6 +267,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -274,6 +284,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 @@ -282,6 +293,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 */ // ----- TRISA bits -------------------- typedef union { @@ -298,12 +310,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 */ // ----- TRISB bits -------------------- typedef union { @@ -320,6 +334,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -328,5 +343,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c557.h b/device/include/pic/pic16c557.h index f24028eb..033e36f6 100644 --- a/device/include/pic/pic16c557.h +++ b/device/include/pic/pic16c557.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 // @@ -170,6 +170,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -177,6 +178,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define INTE INTCON_bits.INTE #define T0IE INTCON_bits.T0IE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -193,6 +195,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 @@ -201,6 +204,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -217,7 +221,9 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -234,12 +240,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 */ // ----- PORTB bits -------------------- typedef union { @@ -256,6 +264,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -264,6 +273,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -280,6 +290,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 @@ -288,6 +299,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 { @@ -304,6 +316,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 @@ -312,6 +325,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 */ // ----- TRISA bits -------------------- typedef union { @@ -328,12 +342,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 */ // ----- TRISB bits -------------------- typedef union { @@ -350,6 +366,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -358,6 +375,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -374,6 +392,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 @@ -382,5 +401,6 @@ 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 */ #endif diff --git a/device/include/pic/pic16c558.h b/device/include/pic/pic16c558.h index 9353f969..a9849a11 100644 --- a/device/include/pic/pic16c558.h +++ b/device/include/pic/pic16c558.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 // @@ -166,6 +166,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -173,6 +174,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define INTE INTCON_bits.INTE #define T0IE INTCON_bits.T0IE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -189,6 +191,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 @@ -197,6 +200,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -213,7 +217,9 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -230,12 +236,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 */ // ----- PORTB bits -------------------- typedef union { @@ -252,6 +260,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -260,6 +269,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -276,6 +286,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 @@ -284,6 +295,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 */ // ----- TRISA bits -------------------- typedef union { @@ -300,12 +312,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 */ // ----- TRISB bits -------------------- typedef union { @@ -322,6 +336,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -330,5 +345,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c62.h b/device/include/pic/pic16c62.h index 15aa88dc..c2593036 100644 --- a/device/include/pic/pic16c62.h +++ b/device/include/pic/pic16c62.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 // @@ -221,12 +221,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -243,6 +245,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -251,6 +254,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 { @@ -267,6 +271,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 @@ -275,6 +280,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -291,7 +297,9 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -308,10 +316,12 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -328,10 +338,12 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -348,12 +360,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 */ // ----- PORTB bits -------------------- typedef union { @@ -370,6 +384,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -378,6 +393,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -394,6 +410,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 @@ -402,6 +419,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 */ // ----- SSPCON bits -------------------- typedef union { @@ -418,6 +436,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -426,6 +445,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -492,6 +512,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -510,6 +531,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define NOT_ADDRESS SSPSTAT_bits.NOT_ADDRESS #define D_A SSPSTAT_bits.D_A #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -526,6 +548,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 @@ -534,6 +557,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 { @@ -560,6 +584,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 @@ -567,6 +592,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -583,6 +609,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 @@ -590,6 +617,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 { @@ -606,12 +634,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 */ // ----- TRISB bits -------------------- typedef union { @@ -628,6 +658,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -636,6 +667,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -652,6 +684,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 @@ -660,5 +693,6 @@ 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 */ #endif diff --git a/device/include/pic/pic16c620.h b/device/include/pic/pic16c620.h index f20a564a..da50ea50 100644 --- a/device/include/pic/pic16c620.h +++ b/device/include/pic/pic16c620.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 // @@ -187,12 +187,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 C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -209,6 +211,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -217,6 +220,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 { @@ -233,6 +237,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 @@ -241,6 +246,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -267,9 +273,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -286,7 +294,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define CMIE PIE1_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -303,7 +313,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define CMIF PIR1_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -320,12 +332,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 */ // ----- PORTB bits -------------------- typedef union { @@ -342,6 +356,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -350,6 +365,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -366,6 +382,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 @@ -374,6 +391,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 */ // ----- TRISA bits -------------------- typedef union { @@ -390,12 +408,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 */ // ----- TRISB bits -------------------- typedef union { @@ -412,6 +432,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -420,6 +441,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -436,6 +458,7 @@ 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 @@ -443,5 +466,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c620a.h b/device/include/pic/pic16c620a.h index 63d99d52..551fca20 100644 --- a/device/include/pic/pic16c620a.h +++ b/device/include/pic/pic16c620a.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 // @@ -193,12 +193,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 C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -215,6 +217,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -223,6 +226,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 { @@ -239,6 +243,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 @@ -247,6 +252,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -273,9 +279,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -292,7 +300,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define CMIE PIE1_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -309,7 +319,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define CMIF PIR1_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -326,12 +338,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 */ // ----- PORTB bits -------------------- typedef union { @@ -348,6 +362,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -356,6 +371,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -372,6 +388,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 @@ -380,6 +397,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 */ // ----- TRISA bits -------------------- typedef union { @@ -396,12 +414,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 */ // ----- TRISB bits -------------------- typedef union { @@ -418,6 +438,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -426,6 +447,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -442,6 +464,7 @@ 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 @@ -449,5 +472,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c621.h b/device/include/pic/pic16c621.h index 97cddc64..f36a1c50 100644 --- a/device/include/pic/pic16c621.h +++ b/device/include/pic/pic16c621.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 // @@ -188,12 +188,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 C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -210,6 +212,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -218,6 +221,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 { @@ -234,6 +238,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 @@ -242,6 +247,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -268,9 +274,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -287,7 +295,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define CMIE PIE1_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -304,7 +314,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define CMIF PIR1_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -321,12 +333,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 */ // ----- PORTB bits -------------------- typedef union { @@ -343,6 +357,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -351,6 +366,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -367,6 +383,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 @@ -375,6 +392,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 */ // ----- TRISA bits -------------------- typedef union { @@ -391,12 +409,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 */ // ----- TRISB bits -------------------- typedef union { @@ -413,6 +433,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -421,6 +442,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -437,6 +459,7 @@ 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 @@ -444,5 +467,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c621a.h b/device/include/pic/pic16c621a.h index 21c6d73d..853b2bf1 100644 --- a/device/include/pic/pic16c621a.h +++ b/device/include/pic/pic16c621a.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 // @@ -189,12 +189,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 C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -211,6 +213,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -219,6 +222,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 { @@ -235,6 +239,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 @@ -243,6 +248,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -269,9 +275,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -288,7 +296,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define CMIE PIE1_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -305,7 +315,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define CMIF PIR1_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -322,12 +334,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 */ // ----- PORTB bits -------------------- typedef union { @@ -344,6 +358,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -352,6 +367,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -368,6 +384,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 @@ -376,6 +393,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 */ // ----- TRISA bits -------------------- typedef union { @@ -392,12 +410,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 */ // ----- TRISB bits -------------------- typedef union { @@ -414,6 +434,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -422,6 +443,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -438,6 +460,7 @@ 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 @@ -445,5 +468,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c622.h b/device/include/pic/pic16c622.h index 7aff8d6a..784ed27e 100644 --- a/device/include/pic/pic16c622.h +++ b/device/include/pic/pic16c622.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 // @@ -188,12 +188,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 C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -210,6 +212,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -218,6 +221,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 { @@ -234,6 +238,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 @@ -242,6 +247,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -268,9 +274,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -287,7 +295,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define CMIE PIE1_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -304,7 +314,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define CMIF PIR1_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -321,12 +333,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 */ // ----- PORTB bits -------------------- typedef union { @@ -343,6 +357,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -351,6 +366,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -367,6 +383,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 @@ -375,6 +392,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 */ // ----- TRISA bits -------------------- typedef union { @@ -391,12 +409,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 */ // ----- TRISB bits -------------------- typedef union { @@ -413,6 +433,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -421,6 +442,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -437,6 +459,7 @@ 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 @@ -444,5 +467,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c622a.h b/device/include/pic/pic16c622a.h index 284af6ed..695c5dc5 100644 --- a/device/include/pic/pic16c622a.h +++ b/device/include/pic/pic16c622a.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 // @@ -189,12 +189,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 C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -211,6 +213,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -219,6 +222,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 { @@ -235,6 +239,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 @@ -243,6 +248,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -269,9 +275,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -288,7 +296,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define CMIE PIE1_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -305,7 +315,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define CMIF PIR1_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -322,12 +334,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 */ // ----- PORTB bits -------------------- typedef union { @@ -344,6 +358,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -352,6 +367,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -368,6 +384,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 @@ -376,6 +393,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 */ // ----- TRISA bits -------------------- typedef union { @@ -392,12 +410,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 */ // ----- TRISB bits -------------------- typedef union { @@ -414,6 +434,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -422,6 +443,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -438,6 +460,7 @@ 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 @@ -445,5 +468,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c63a.h b/device/include/pic/pic16c63a.h index 7b2f083f..f196fe97 100644 --- a/device/include/pic/pic16c63a.h +++ b/device/include/pic/pic16c63a.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 // @@ -258,12 +258,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -280,12 +282,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -302,6 +306,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -310,6 +315,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 { @@ -326,6 +332,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 @@ -334,6 +341,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -360,9 +368,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -379,12 +389,14 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -401,7 +413,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -418,12 +432,14 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -440,7 +456,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -457,12 +475,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 */ // ----- PORTB bits -------------------- typedef union { @@ -479,6 +499,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -487,6 +508,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -503,6 +525,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 @@ -511,6 +534,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -557,6 +581,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -568,6 +593,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -584,6 +610,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -592,6 +619,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -658,6 +686,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -678,6 +707,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -694,6 +724,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 @@ -702,6 +733,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 { @@ -728,6 +760,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 @@ -735,6 +768,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -751,6 +785,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 @@ -758,6 +793,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 { @@ -774,12 +810,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 */ // ----- TRISB bits -------------------- typedef union { @@ -796,6 +834,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -804,6 +843,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -820,6 +860,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 @@ -828,6 +869,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -864,6 +906,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -874,5 +917,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c65b.h b/device/include/pic/pic16c65b.h index 72467645..e53899d6 100644 --- a/device/include/pic/pic16c65b.h +++ b/device/include/pic/pic16c65b.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 // @@ -268,12 +268,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -290,12 +292,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -312,6 +316,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -320,6 +325,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 { @@ -336,6 +342,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 @@ -344,6 +351,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -370,9 +378,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -389,6 +399,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -396,6 +407,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -412,7 +424,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -429,6 +443,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -436,6 +451,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -452,7 +468,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -469,12 +487,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 */ // ----- PORTB bits -------------------- typedef union { @@ -491,6 +511,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -499,6 +520,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -515,6 +537,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 @@ -523,6 +546,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 */ // ----- PORTD bits -------------------- typedef union { @@ -539,6 +563,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -547,6 +572,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -563,9 +589,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -612,6 +640,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -623,6 +652,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -639,6 +669,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -647,6 +678,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -713,6 +745,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -733,6 +766,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -749,6 +783,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 @@ -757,6 +792,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 { @@ -783,6 +819,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 @@ -790,6 +827,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -806,6 +844,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 @@ -813,6 +852,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 { @@ -829,12 +869,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 */ // ----- TRISB bits -------------------- typedef union { @@ -851,6 +893,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -859,6 +902,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -875,6 +919,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 @@ -883,6 +928,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 */ // ----- TRISD bits -------------------- typedef union { @@ -899,6 +945,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -907,6 +954,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -923,6 +971,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -930,6 +979,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -966,6 +1016,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -976,5 +1027,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c71.h b/device/include/pic/pic16c71.h index fe3c80be..9786e12d 100644 --- a/device/include/pic/pic16c71.h +++ b/device/include/pic/pic16c71.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 // @@ -190,6 +190,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 ADIF ADCON0_bits.ADIF #define GO ADCON0_bits.GO @@ -199,6 +200,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS1 ADCON0_bits.CHS1 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -215,8 +217,10 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -233,6 +237,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -241,6 +246,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define T0IE INTCON_bits.T0IE #define ADIE INTCON_bits.ADIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -257,6 +263,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 @@ -265,6 +272,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -281,12 +289,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 */ // ----- PORTB bits -------------------- typedef union { @@ -303,6 +313,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -311,6 +322,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -327,6 +339,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 @@ -335,6 +348,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 */ // ----- TRISA bits -------------------- typedef union { @@ -351,12 +365,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 */ // ----- TRISB bits -------------------- typedef union { @@ -373,6 +389,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -381,5 +398,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c710.h b/device/include/pic/pic16c710.h index 20cfbdbc..2d6bc355 100644 --- a/device/include/pic/pic16c710.h +++ b/device/include/pic/pic16c710.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 // @@ -197,6 +197,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 ADIF ADCON0_bits.ADIF #define GO ADCON0_bits.GO @@ -206,6 +207,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS1 ADCON0_bits.CHS1 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -222,8 +224,10 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -240,6 +244,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -248,6 +253,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define T0IE INTCON_bits.T0IE #define ADIE INTCON_bits.ADIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -264,6 +270,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 @@ -272,6 +279,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -298,9 +306,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -317,12 +327,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 */ // ----- PORTB bits -------------------- typedef union { @@ -339,6 +351,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -347,6 +360,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -363,6 +377,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 @@ -371,6 +386,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 */ // ----- TRISA bits -------------------- typedef union { @@ -387,12 +403,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 */ // ----- TRISB bits -------------------- typedef union { @@ -409,6 +427,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -417,5 +436,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c711.h b/device/include/pic/pic16c711.h index 2147a43f..bb8783d6 100644 --- a/device/include/pic/pic16c711.h +++ b/device/include/pic/pic16c711.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 // @@ -197,6 +197,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 ADIF ADCON0_bits.ADIF #define GO ADCON0_bits.GO @@ -206,6 +207,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS1 ADCON0_bits.CHS1 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -222,8 +224,10 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -240,6 +244,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -248,6 +253,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define T0IE INTCON_bits.T0IE #define ADIE INTCON_bits.ADIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -264,6 +270,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 @@ -272,6 +279,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -298,9 +306,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -317,12 +327,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 */ // ----- PORTB bits -------------------- typedef union { @@ -339,6 +351,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -347,6 +360,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -363,6 +377,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 @@ -371,6 +386,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 */ // ----- TRISA bits -------------------- typedef union { @@ -387,12 +403,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 */ // ----- TRISB bits -------------------- typedef union { @@ -409,6 +427,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -417,5 +436,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c715.h b/device/include/pic/pic16c715.h index 2af976fd..ec5bee5a 100644 --- a/device/include/pic/pic16c715.h +++ b/device/include/pic/pic16c715.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 // @@ -212,6 +212,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 @@ -221,6 +222,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -237,8 +239,10 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -255,6 +259,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -263,6 +268,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 { @@ -279,6 +285,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 @@ -287,6 +294,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -313,10 +321,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define NOT_MPE PCON_bits.NOT_MPE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -333,7 +343,9 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -350,7 +362,9 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -367,12 +381,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 */ // ----- PORTB bits -------------------- typedef union { @@ -389,6 +405,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -397,6 +414,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -413,6 +431,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 @@ -421,6 +440,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 */ // ----- TRISA bits -------------------- typedef union { @@ -437,12 +457,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 */ // ----- TRISB bits -------------------- typedef union { @@ -459,6 +481,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -467,5 +490,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c717.h b/device/include/pic/pic16c717.h index f6d5302f..f28527fd 100644 --- a/device/include/pic/pic16c717.h +++ b/device/include/pic/pic16c717.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 // @@ -313,6 +313,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -323,6 +324,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -339,10 +341,12 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define VCFG0 ADCON1_bits.VCFG0 #define VCFG1 ADCON1_bits.VCFG1 #define VCFG2 ADCON1_bits.VCFG2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -359,6 +363,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 @@ -367,6 +372,7 @@ extern volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; #define DC1B1 CCP1CON_bits.DC1B1 #define PWM1M0 CCP1CON_bits.PWM1M0 #define PWM1M1 CCP1CON_bits.PWM1M1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -383,6 +389,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -391,6 +398,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -407,12 +415,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LV0 LVDCON_bits.LV0 #define LV1 LVDCON_bits.LV1 #define LV2 LVDCON_bits.LV2 #define LV3 LVDCON_bits.LV3 #define LVDEN LVDCON_bits.LVDEN #define BGST LVDCON_bits.BGST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -429,6 +439,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 @@ -437,6 +448,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -463,10 +475,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -483,11 +497,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -504,8 +520,10 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define BCLIE PIE2_bits.BCLIE #define LVDIE PIE2_bits.LVDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -522,11 +540,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -543,8 +563,10 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -561,7 +583,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -578,12 +602,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 */ // ----- PORTB bits -------------------- typedef union { @@ -600,6 +626,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -608,6 +635,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- REFCON bits -------------------- typedef union { @@ -624,10 +652,12 @@ typedef union { } __REFCON_bits_t; extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; +#ifndef NO_BIT_DEFINES #define VRLOEN REFCON_bits.VRLOEN #define VRHOEN REFCON_bits.VRHOEN #define VRLEN REFCON_bits.VRLEN #define VRHEN REFCON_bits.VRHEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -644,6 +674,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -652,6 +683,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -668,6 +700,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -676,6 +709,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -742,6 +776,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -762,6 +797,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -778,6 +814,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 @@ -786,6 +823,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 { @@ -812,6 +850,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 @@ -819,6 +858,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -835,6 +875,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 @@ -842,6 +883,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 { @@ -858,12 +900,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 */ // ----- TRISB bits -------------------- typedef union { @@ -880,6 +924,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -888,5 +933,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c72.h b/device/include/pic/pic16c72.h index 3ea01b29..45ac5448 100644 --- a/device/include/pic/pic16c72.h +++ b/device/include/pic/pic16c72.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 // @@ -256,6 +256,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 @@ -265,6 +266,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -281,9 +283,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -300,12 +304,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -322,6 +328,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -330,6 +337,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 { @@ -346,6 +354,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 @@ -354,6 +363,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -380,9 +390,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -399,11 +411,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -420,11 +434,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -441,12 +457,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 */ // ----- PORTB bits -------------------- typedef union { @@ -463,6 +481,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -471,6 +490,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -487,6 +507,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 @@ -495,6 +516,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 */ // ----- SSPCON bits -------------------- typedef union { @@ -511,6 +533,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -519,6 +542,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -585,6 +609,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -603,6 +628,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define NOT_ADDRESS SSPSTAT_bits.NOT_ADDRESS #define D_A SSPSTAT_bits.D_A #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -619,6 +645,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 @@ -627,6 +654,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 { @@ -653,6 +681,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 @@ -660,6 +689,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -676,6 +706,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 @@ -683,6 +714,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 { @@ -699,12 +731,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 */ // ----- TRISB bits -------------------- typedef union { @@ -721,6 +755,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -729,6 +764,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -745,6 +781,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 @@ -753,5 +790,6 @@ 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 */ #endif diff --git a/device/include/pic/pic16c73b.h b/device/include/pic/pic16c73b.h index 6fa6177c..54ef3898 100644 --- a/device/include/pic/pic16c73b.h +++ b/device/include/pic/pic16c73b.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 // @@ -290,6 +290,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 @@ -299,6 +300,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -315,9 +317,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -334,12 +338,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -356,12 +362,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -378,6 +386,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -386,6 +395,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 { @@ -402,6 +412,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 @@ -410,6 +421,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -436,9 +448,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -455,6 +469,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -462,6 +477,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -478,7 +494,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -495,6 +513,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -502,6 +521,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -518,7 +538,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -535,12 +557,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 */ // ----- PORTB bits -------------------- typedef union { @@ -557,6 +581,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -565,6 +590,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -581,6 +607,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 @@ -589,6 +616,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -635,6 +663,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -646,6 +675,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -662,6 +692,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -670,6 +701,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -736,6 +768,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -756,6 +789,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -772,6 +806,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 @@ -780,6 +815,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 { @@ -806,6 +842,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 @@ -813,6 +850,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -829,6 +867,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 @@ -836,6 +875,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 { @@ -852,12 +892,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 */ // ----- TRISB bits -------------------- typedef union { @@ -874,6 +916,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -882,6 +925,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -898,6 +942,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 @@ -906,6 +951,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -942,6 +988,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -952,5 +999,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c745.h b/device/include/pic/pic16c745.h index 871e37d5..4c07dca1 100644 --- a/device/include/pic/pic16c745.h +++ b/device/include/pic/pic16c745.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 // @@ -355,6 +355,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 @@ -364,6 +365,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -380,9 +382,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -399,12 +403,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define DC1B0 CCP1CON_bits.DC1B0 #define DC1B1 CCP1CON_bits.DC1B1 +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -421,12 +427,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define DC2B0 CCP2CON_bits.DC2B0 #define DC2B1 CCP2CON_bits.DC2B1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -443,6 +451,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -451,6 +460,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 { @@ -467,6 +477,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 @@ -475,6 +486,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -501,9 +513,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -520,6 +534,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -527,6 +542,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -543,7 +559,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -560,6 +578,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -567,6 +586,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -583,7 +603,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -600,12 +622,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 */ // ----- PORTB bits -------------------- typedef union { @@ -622,6 +646,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -630,6 +655,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -646,6 +672,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 @@ -654,6 +681,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -700,6 +728,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -711,6 +740,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -727,6 +757,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 @@ -735,6 +766,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 { @@ -761,6 +793,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 @@ -768,6 +801,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -784,6 +818,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 @@ -791,6 +826,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 { @@ -807,12 +843,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 */ // ----- TRISB bits -------------------- typedef union { @@ -829,6 +867,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -837,6 +876,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -853,6 +893,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 @@ -861,6 +902,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -897,6 +939,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -907,6 +950,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- UCTRL bits -------------------- typedef union { @@ -923,11 +967,13 @@ typedef union { } __UCTRL_bits_t; extern volatile __UCTRL_bits_t __at(UCTRL_ADDR) UCTRL_bits; +#ifndef NO_BIT_DEFINES #define SUSPND UCTRL_bits.SUSPND #define RESUME UCTRL_bits.RESUME #define DEV_ATT UCTRL_bits.DEV_ATT #define PKT_DIS UCTRL_bits.PKT_DIS #define SE0 UCTRL_bits.SE0 +#endif /* NO_BIT_DEFINES */ // ----- UEIE bits -------------------- typedef union { @@ -944,6 +990,7 @@ typedef union { } __UEIE_bits_t; extern volatile __UEIE_bits_t __at(UEIE_ADDR) UEIE_bits; +#ifndef NO_BIT_DEFINES #define PID_ERR UEIE_bits.PID_ERR #define CRC5 UEIE_bits.CRC5 #define CRC16 UEIE_bits.CRC16 @@ -952,6 +999,7 @@ extern volatile __UEIE_bits_t __at(UEIE_ADDR) UEIE_bits; #define WRT_ERR UEIE_bits.WRT_ERR #define OWN_ERR UEIE_bits.OWN_ERR #define BTS_ERR UEIE_bits.BTS_ERR +#endif /* NO_BIT_DEFINES */ // ----- UEP0 bits -------------------- typedef union { @@ -988,6 +1036,7 @@ typedef union { } __UEP0_bits_t; extern volatile __UEP0_bits_t __at(UEP0_ADDR) UEP0_bits; +#ifndef NO_BIT_DEFINES #define EP_STALL UEP0_bits.EP_STALL #define EP_IN_EN UEP0_bits.EP_IN_EN #define EP_OUT_EN UEP0_bits.EP_OUT_EN @@ -1001,6 +1050,7 @@ extern volatile __UEP0_bits_t __at(UEP0_ADDR) UEP0_bits; #define DATA01 UEP0_bits.DATA01 #define UOWN UEP0_bits.UOWN #define OWN UEP0_bits.OWN +#endif /* NO_BIT_DEFINES */ // ----- UIE bits -------------------- typedef union { @@ -1017,12 +1067,14 @@ typedef union { } __UIE_bits_t; extern volatile __UIE_bits_t __at(UIE_ADDR) UIE_bits; +#ifndef NO_BIT_DEFINES #define USB_RST UIE_bits.USB_RST #define UERR UIE_bits.UERR #define ACTIVITY UIE_bits.ACTIVITY #define TOK_DNE UIE_bits.TOK_DNE #define UIDLE UIE_bits.UIDLE #define STALL UIE_bits.STALL +#endif /* NO_BIT_DEFINES */ // ----- USTAT bits -------------------- typedef union { @@ -1039,8 +1091,10 @@ typedef union { } __USTAT_bits_t; extern volatile __USTAT_bits_t __at(USTAT_ADDR) USTAT_bits; +#ifndef NO_BIT_DEFINES #define IN USTAT_bits.IN #define ENDP0 USTAT_bits.ENDP0 #define ENDP1 USTAT_bits.ENDP1 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c74b.h b/device/include/pic/pic16c74b.h index 1ee20e04..161e70a1 100644 --- a/device/include/pic/pic16c74b.h +++ b/device/include/pic/pic16c74b.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 // @@ -300,6 +300,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 @@ -309,6 +310,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -325,9 +327,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -344,12 +348,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -366,12 +372,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -388,6 +396,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -396,6 +405,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 { @@ -412,6 +422,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 @@ -420,6 +431,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -446,9 +458,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -465,6 +479,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -473,6 +488,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -489,7 +505,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -506,6 +524,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -514,6 +533,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -530,7 +550,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -547,12 +569,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 */ // ----- PORTB bits -------------------- typedef union { @@ -569,6 +593,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -577,6 +602,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -593,6 +619,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 @@ -601,6 +628,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 */ // ----- PORTD bits -------------------- typedef union { @@ -617,6 +645,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -625,6 +654,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -641,9 +671,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -690,6 +722,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -701,6 +734,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -717,6 +751,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -725,6 +760,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -791,6 +827,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -811,6 +848,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -827,6 +865,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 @@ -835,6 +874,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 { @@ -861,6 +901,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 @@ -868,6 +909,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -884,6 +926,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 @@ -891,6 +934,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 { @@ -907,12 +951,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 */ // ----- TRISB bits -------------------- typedef union { @@ -929,6 +975,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -937,6 +984,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -953,6 +1001,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 @@ -961,6 +1010,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 */ // ----- TRISD bits -------------------- typedef union { @@ -977,6 +1027,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -985,6 +1036,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1001,6 +1053,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1008,6 +1061,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1044,6 +1098,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1054,5 +1109,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c765.h b/device/include/pic/pic16c765.h index ffb794da..c33d0766 100644 --- a/device/include/pic/pic16c765.h +++ b/device/include/pic/pic16c765.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 // @@ -365,6 +365,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 @@ -374,6 +375,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -390,9 +392,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -409,12 +413,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define DC1B0 CCP1CON_bits.DC1B0 #define DC1B1 CCP1CON_bits.DC1B1 +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -431,12 +437,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define DC2B0 CCP2CON_bits.DC2B0 #define DC2B1 CCP2CON_bits.DC2B1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -453,6 +461,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -461,6 +470,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 { @@ -477,6 +487,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 @@ -485,6 +496,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -511,9 +523,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -530,6 +544,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -538,6 +553,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -554,7 +570,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -571,6 +589,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -579,6 +598,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -595,7 +615,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -612,12 +634,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 */ // ----- PORTB bits -------------------- typedef union { @@ -634,6 +658,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -642,6 +667,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -658,6 +684,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 @@ -666,6 +693,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 */ // ----- PORTD bits -------------------- typedef union { @@ -682,6 +710,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -690,6 +719,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -706,9 +736,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -755,6 +787,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -766,6 +799,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -782,6 +816,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 @@ -790,6 +825,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 { @@ -816,6 +852,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 @@ -823,6 +860,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -839,6 +877,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 @@ -846,6 +885,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 { @@ -862,12 +902,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 */ // ----- TRISB bits -------------------- typedef union { @@ -884,6 +926,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -892,6 +935,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -908,6 +952,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 @@ -916,6 +961,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 */ // ----- TRISD bits -------------------- typedef union { @@ -932,6 +978,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -940,6 +987,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -956,6 +1004,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -963,6 +1012,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -999,6 +1049,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1009,6 +1060,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- UCTRL bits -------------------- typedef union { @@ -1025,11 +1077,13 @@ typedef union { } __UCTRL_bits_t; extern volatile __UCTRL_bits_t __at(UCTRL_ADDR) UCTRL_bits; +#ifndef NO_BIT_DEFINES #define SUSPND UCTRL_bits.SUSPND #define RESUME UCTRL_bits.RESUME #define DEV_ATT UCTRL_bits.DEV_ATT #define PKT_DIS UCTRL_bits.PKT_DIS #define SE0 UCTRL_bits.SE0 +#endif /* NO_BIT_DEFINES */ // ----- UEIE bits -------------------- typedef union { @@ -1046,6 +1100,7 @@ typedef union { } __UEIE_bits_t; extern volatile __UEIE_bits_t __at(UEIE_ADDR) UEIE_bits; +#ifndef NO_BIT_DEFINES #define PID_ERR UEIE_bits.PID_ERR #define CRC5 UEIE_bits.CRC5 #define CRC16 UEIE_bits.CRC16 @@ -1054,6 +1109,7 @@ extern volatile __UEIE_bits_t __at(UEIE_ADDR) UEIE_bits; #define WRT_ERR UEIE_bits.WRT_ERR #define OWN_ERR UEIE_bits.OWN_ERR #define BTS_ERR UEIE_bits.BTS_ERR +#endif /* NO_BIT_DEFINES */ // ----- UEP0 bits -------------------- typedef union { @@ -1090,6 +1146,7 @@ typedef union { } __UEP0_bits_t; extern volatile __UEP0_bits_t __at(UEP0_ADDR) UEP0_bits; +#ifndef NO_BIT_DEFINES #define EP_STALL UEP0_bits.EP_STALL #define EP_IN_EN UEP0_bits.EP_IN_EN #define EP_OUT_EN UEP0_bits.EP_OUT_EN @@ -1103,6 +1160,7 @@ extern volatile __UEP0_bits_t __at(UEP0_ADDR) UEP0_bits; #define DATA01 UEP0_bits.DATA01 #define UOWN UEP0_bits.UOWN #define OWN UEP0_bits.OWN +#endif /* NO_BIT_DEFINES */ // ----- UIE bits -------------------- typedef union { @@ -1119,12 +1177,14 @@ typedef union { } __UIE_bits_t; extern volatile __UIE_bits_t __at(UIE_ADDR) UIE_bits; +#ifndef NO_BIT_DEFINES #define USB_RST UIE_bits.USB_RST #define UERR UIE_bits.UERR #define ACTIVITY UIE_bits.ACTIVITY #define TOK_DNE UIE_bits.TOK_DNE #define UIDLE UIE_bits.UIDLE #define STALL UIE_bits.STALL +#endif /* NO_BIT_DEFINES */ // ----- USTAT bits -------------------- typedef union { @@ -1141,8 +1201,10 @@ typedef union { } __USTAT_bits_t; extern volatile __USTAT_bits_t __at(USTAT_ADDR) USTAT_bits; +#ifndef NO_BIT_DEFINES #define IN USTAT_bits.IN #define ENDP0 USTAT_bits.ENDP0 #define ENDP1 USTAT_bits.ENDP1 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c770.h b/device/include/pic/pic16c770.h index 32f94c5b..cf295a6b 100644 --- a/device/include/pic/pic16c770.h +++ b/device/include/pic/pic16c770.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 // @@ -313,6 +313,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -323,6 +324,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -339,10 +341,12 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define VCFG0 ADCON1_bits.VCFG0 #define VCFG1 ADCON1_bits.VCFG1 #define VCFG2 ADCON1_bits.VCFG2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -359,6 +363,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 @@ -367,6 +372,7 @@ extern volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; #define DC1B1 CCP1CON_bits.DC1B1 #define PWM1M0 CCP1CON_bits.PWM1M0 #define PWM1M1 CCP1CON_bits.PWM1M1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -383,6 +389,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -391,6 +398,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -407,12 +415,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LV0 LVDCON_bits.LV0 #define LV1 LVDCON_bits.LV1 #define LV2 LVDCON_bits.LV2 #define LV3 LVDCON_bits.LV3 #define LVDEN LVDCON_bits.LVDEN #define BGST LVDCON_bits.BGST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -429,6 +439,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 @@ -437,6 +448,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -463,10 +475,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -483,11 +497,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -504,8 +520,10 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define BCLIE PIE2_bits.BCLIE #define LVDIE PIE2_bits.LVDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -522,11 +540,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -543,8 +563,10 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -561,7 +583,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -578,12 +602,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 */ // ----- PORTB bits -------------------- typedef union { @@ -600,6 +626,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -608,6 +635,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- REFCON bits -------------------- typedef union { @@ -624,10 +652,12 @@ typedef union { } __REFCON_bits_t; extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; +#ifndef NO_BIT_DEFINES #define VRLOEN REFCON_bits.VRLOEN #define VRHOEN REFCON_bits.VRHOEN #define VRLEN REFCON_bits.VRLEN #define VRHEN REFCON_bits.VRHEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -644,6 +674,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -652,6 +683,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -668,6 +700,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -676,6 +709,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -742,6 +776,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -762,6 +797,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -778,6 +814,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 @@ -786,6 +823,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 { @@ -812,6 +850,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 @@ -819,6 +858,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -835,6 +875,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 @@ -842,6 +883,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 { @@ -858,12 +900,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 */ // ----- TRISB bits -------------------- typedef union { @@ -880,6 +924,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -888,5 +933,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c771.h b/device/include/pic/pic16c771.h index f3e22e9f..759e9e31 100644 --- a/device/include/pic/pic16c771.h +++ b/device/include/pic/pic16c771.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 // @@ -313,6 +313,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -323,6 +324,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -339,10 +341,12 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define VCFG0 ADCON1_bits.VCFG0 #define VCFG1 ADCON1_bits.VCFG1 #define VCFG2 ADCON1_bits.VCFG2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -359,6 +363,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 @@ -367,6 +372,7 @@ extern volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; #define DC1B1 CCP1CON_bits.DC1B1 #define PWM1M0 CCP1CON_bits.PWM1M0 #define PWM1M1 CCP1CON_bits.PWM1M1 +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -383,6 +389,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -391,6 +398,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -407,12 +415,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LV0 LVDCON_bits.LV0 #define LV1 LVDCON_bits.LV1 #define LV2 LVDCON_bits.LV2 #define LV3 LVDCON_bits.LV3 #define LVDEN LVDCON_bits.LVDEN #define BGST LVDCON_bits.BGST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -429,6 +439,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 @@ -437,6 +448,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -463,10 +475,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -483,11 +497,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -504,8 +520,10 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define BCLIE PIE2_bits.BCLIE #define LVDIE PIE2_bits.LVDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -522,11 +540,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -543,8 +563,10 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -561,7 +583,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -578,12 +602,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 */ // ----- PORTB bits -------------------- typedef union { @@ -600,6 +626,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -608,6 +635,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- REFCON bits -------------------- typedef union { @@ -624,10 +652,12 @@ typedef union { } __REFCON_bits_t; extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; +#ifndef NO_BIT_DEFINES #define VRLOEN REFCON_bits.VRLOEN #define VRHOEN REFCON_bits.VRHOEN #define VRLEN REFCON_bits.VRLEN #define VRHEN REFCON_bits.VRHEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -644,6 +674,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -652,6 +683,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -668,6 +700,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -676,6 +709,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -742,6 +776,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -762,6 +797,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -778,6 +814,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 @@ -786,6 +823,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 { @@ -812,6 +850,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 @@ -819,6 +858,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -835,6 +875,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 @@ -842,6 +883,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 { @@ -858,12 +900,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 */ // ----- TRISB bits -------------------- typedef union { @@ -880,6 +924,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -888,5 +933,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c773.h b/device/include/pic/pic16c773.h index 96b701c9..4ccef981 100644 --- a/device/include/pic/pic16c773.h +++ b/device/include/pic/pic16c773.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 // @@ -314,6 +314,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -324,6 +325,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -340,6 +342,7 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 @@ -348,6 +351,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define VCFG1 ADCON1_bits.VCFG1 #define VCFG2 ADCON1_bits.VCFG2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -364,12 +368,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -386,12 +392,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -408,6 +416,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -416,6 +425,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -432,12 +442,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LV0 LVDCON_bits.LV0 #define LV1 LVDCON_bits.LV1 #define LV2 LVDCON_bits.LV2 #define LV3 LVDCON_bits.LV3 #define LVDEN LVDCON_bits.LVDEN #define BGST LVDCON_bits.BGST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -454,6 +466,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 @@ -462,6 +475,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -488,9 +502,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -507,6 +523,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -514,6 +531,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -530,9 +548,11 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define LVDIE PIE2_bits.LVDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -549,6 +569,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -556,6 +577,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -572,9 +594,11 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -591,12 +615,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 */ // ----- PORTB bits -------------------- typedef union { @@ -613,6 +639,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -621,6 +648,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -637,6 +665,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 @@ -645,6 +674,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -691,6 +721,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -703,6 +734,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- REFCON bits -------------------- typedef union { @@ -719,10 +751,12 @@ typedef union { } __REFCON_bits_t; extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; +#ifndef NO_BIT_DEFINES #define VRLOEN REFCON_bits.VRLOEN #define VRHOEN REFCON_bits.VRHOEN #define VRLEN REFCON_bits.VRLEN #define VRHEN REFCON_bits.VRHEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -739,6 +773,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -747,6 +782,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -763,6 +799,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -771,6 +808,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -837,6 +875,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -857,6 +896,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -873,6 +913,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 @@ -881,6 +922,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 { @@ -917,6 +959,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 @@ -925,6 +968,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -941,6 +985,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 @@ -948,6 +993,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 { @@ -964,12 +1010,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 */ // ----- TRISB bits -------------------- typedef union { @@ -986,6 +1034,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -994,6 +1043,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1010,6 +1060,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 @@ -1018,6 +1069,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -1054,6 +1106,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1064,5 +1117,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c774.h b/device/include/pic/pic16c774.h index e9a19c10..59630dfb 100644 --- a/device/include/pic/pic16c774.h +++ b/device/include/pic/pic16c774.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 // @@ -324,6 +324,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -334,6 +335,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -350,6 +352,7 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 @@ -358,6 +361,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define VCFG1 ADCON1_bits.VCFG1 #define VCFG2 ADCON1_bits.VCFG2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -374,12 +378,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -396,12 +402,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -418,6 +426,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -426,6 +435,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -442,12 +452,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LV0 LVDCON_bits.LV0 #define LV1 LVDCON_bits.LV1 #define LV2 LVDCON_bits.LV2 #define LV3 LVDCON_bits.LV3 #define LVDEN LVDCON_bits.LVDEN #define BGST LVDCON_bits.BGST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -464,6 +476,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 @@ -472,6 +485,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -498,9 +512,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -517,6 +533,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -524,6 +541,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -540,9 +558,11 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define LVDIE PIE2_bits.LVDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -559,6 +579,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -566,6 +587,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -582,9 +604,11 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -601,12 +625,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 */ // ----- PORTB bits -------------------- typedef union { @@ -623,6 +649,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -631,6 +658,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -647,6 +675,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 @@ -655,6 +684,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 */ // ----- PORTD bits -------------------- typedef union { @@ -671,6 +701,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -679,6 +710,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -695,9 +727,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -744,6 +778,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -756,6 +791,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- REFCON bits -------------------- typedef union { @@ -772,10 +808,12 @@ typedef union { } __REFCON_bits_t; extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; +#ifndef NO_BIT_DEFINES #define VRLOEN REFCON_bits.VRLOEN #define VRHOEN REFCON_bits.VRHOEN #define VRLEN REFCON_bits.VRLEN #define VRHEN REFCON_bits.VRHEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -792,6 +830,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -800,6 +839,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -816,6 +856,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -824,6 +865,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -890,6 +932,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -910,6 +953,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -926,6 +970,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 @@ -934,6 +979,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 { @@ -970,6 +1016,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 @@ -978,6 +1025,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -994,6 +1042,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 @@ -1001,6 +1050,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 { @@ -1017,12 +1067,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1039,6 +1091,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1047,6 +1100,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1063,6 +1117,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 @@ -1071,6 +1126,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1087,6 +1143,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1095,6 +1152,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1111,6 +1169,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1118,6 +1177,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1154,6 +1214,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1164,5 +1225,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c781.h b/device/include/pic/pic16c781.h index a3ad8ce6..67175966 100644 --- a/device/include/pic/pic16c781.h +++ b/device/include/pic/pic16c781.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 // @@ -304,6 +304,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -314,6 +315,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -330,8 +332,10 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define VCFG0 ADCON1_bits.VCFG0 #define VCFG1 ADCON1_bits.VCFG1 +#endif /* NO_BIT_DEFINES */ // ----- CALCON bits -------------------- typedef union { @@ -348,9 +352,11 @@ typedef union { } __CALCON_bits_t; extern volatile __CALCON_bits_t __at(CALCON_ADDR) CALCON_bits; +#ifndef NO_BIT_DEFINES #define CALREF CALCON_bits.CALREF #define CALERR CALCON_bits.CALERR #define CAL CALCON_bits.CAL +#endif /* NO_BIT_DEFINES */ // ----- CM1CON0 bits -------------------- typedef union { @@ -367,6 +373,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -375,6 +382,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -391,6 +399,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -399,6 +408,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -415,9 +425,11 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT +#endif /* NO_BIT_DEFINES */ // ----- DACON0 bits -------------------- typedef union { @@ -434,10 +446,12 @@ typedef union { } __DACON0_bits_t; extern volatile __DACON0_bits_t __at(DACON0_ADDR) DACON0_bits; +#ifndef NO_BIT_DEFINES #define DARS0 DACON0_bits.DARS0 #define DARS1 DACON0_bits.DARS1 #define DAOE DACON0_bits.DAOE #define DAON DACON0_bits.DAON +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -454,6 +468,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -462,6 +477,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -478,12 +494,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LV0 LVDCON_bits.LV0 #define LV1 LVDCON_bits.LV1 #define LV2 LVDCON_bits.LV2 #define LV3 LVDCON_bits.LV3 #define LVDEN LVDCON_bits.LVDEN #define BGST LVDCON_bits.BGST +#endif /* NO_BIT_DEFINES */ // ----- OPACON bits -------------------- typedef union { @@ -500,9 +518,11 @@ typedef union { } __OPACON_bits_t; extern volatile __OPACON_bits_t __at(OPACON_ADDR) OPACON_bits; +#ifndef NO_BIT_DEFINES #define GBWP OPACON_bits.GBWP #define CMPEN OPACON_bits.CMPEN #define OPAON OPACON_bits.OPAON +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -519,6 +539,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 @@ -527,6 +548,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -553,11 +575,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF #define WDTON PCON_bits.WDTON +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -574,11 +598,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define C1IE PIE1_bits.C1IE #define C2IE PIE1_bits.C2IE #define ADIE PIE1_bits.ADIE #define LVDIE PIE1_bits.LVDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -595,11 +621,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define C1IF PIR1_bits.C1IF #define C2IF PIR1_bits.C2IF #define ADIF PIR1_bits.ADIF #define LVDIF PIR1_bits.LVDIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -616,7 +644,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -633,12 +663,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 */ // ----- PORTB bits -------------------- typedef union { @@ -655,6 +687,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -663,6 +696,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PSMCCON0 bits -------------------- typedef union { @@ -679,6 +713,7 @@ typedef union { } __PSMCCON0_bits_t; extern volatile __PSMCCON0_bits_t __at(PSMCCON0_ADDR) PSMCCON0_bits; +#ifndef NO_BIT_DEFINES #define DC0 PSMCCON0_bits.DC0 #define DC1 PSMCCON0_bits.DC1 #define MAXDC0 PSMCCON0_bits.MAXDC0 @@ -687,6 +722,7 @@ extern volatile __PSMCCON0_bits_t __at(PSMCCON0_ADDR) PSMCCON0_bits; #define MINDC1 PSMCCON0_bits.MINDC1 #define SMCCL0 PSMCCON0_bits.SMCCL0 #define SMCCL1 PSMCCON0_bits.SMCCL1 +#endif /* NO_BIT_DEFINES */ // ----- PSMCCON1 bits -------------------- typedef union { @@ -723,6 +759,7 @@ typedef union { } __PSMCCON1_bits_t; extern volatile __PSMCCON1_bits_t __at(PSMCCON1_ADDR) PSMCCON1_bits; +#ifndef NO_BIT_DEFINES #define SMCCS PSMCCON1_bits.SMCCS #define PWM PSMCCON1_bits.PWM #define PSM PSMCCON1_bits.PSM @@ -732,6 +769,7 @@ extern volatile __PSMCCON1_bits_t __at(PSMCCON1_ADDR) PSMCCON1_bits; #define S1BPOL PSMCCON1_bits.S1BPOL #define S1APOL PSMCCON1_bits.S1APOL #define SMCON PSMCCON1_bits.SMCON +#endif /* NO_BIT_DEFINES */ // ----- REFCON bits -------------------- typedef union { @@ -748,8 +786,10 @@ typedef union { } __REFCON_bits_t; extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; +#ifndef NO_BIT_DEFINES #define VREFOE REFCON_bits.VREFOE #define VREFEN REFCON_bits.VREFEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -766,6 +806,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 @@ -774,6 +815,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 { @@ -800,6 +842,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 @@ -808,6 +851,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 { @@ -824,12 +868,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 */ // ----- TRISB bits -------------------- typedef union { @@ -846,6 +892,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -854,5 +901,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c782.h b/device/include/pic/pic16c782.h index 5b994113..df85dec1 100644 --- a/device/include/pic/pic16c782.h +++ b/device/include/pic/pic16c782.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 // @@ -304,6 +304,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -314,6 +315,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -330,8 +332,10 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define VCFG0 ADCON1_bits.VCFG0 #define VCFG1 ADCON1_bits.VCFG1 +#endif /* NO_BIT_DEFINES */ // ----- CALCON bits -------------------- typedef union { @@ -348,9 +352,11 @@ typedef union { } __CALCON_bits_t; extern volatile __CALCON_bits_t __at(CALCON_ADDR) CALCON_bits; +#ifndef NO_BIT_DEFINES #define CALREF CALCON_bits.CALREF #define CALERR CALCON_bits.CALERR #define CAL CALCON_bits.CAL +#endif /* NO_BIT_DEFINES */ // ----- CM1CON0 bits -------------------- typedef union { @@ -367,6 +373,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -375,6 +382,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -391,6 +399,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -399,6 +408,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -415,9 +425,11 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT +#endif /* NO_BIT_DEFINES */ // ----- DACON0 bits -------------------- typedef union { @@ -434,10 +446,12 @@ typedef union { } __DACON0_bits_t; extern volatile __DACON0_bits_t __at(DACON0_ADDR) DACON0_bits; +#ifndef NO_BIT_DEFINES #define DARS0 DACON0_bits.DARS0 #define DARS1 DACON0_bits.DARS1 #define DAOE DACON0_bits.DAOE #define DAON DACON0_bits.DAON +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -454,6 +468,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -462,6 +477,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -478,12 +494,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LV0 LVDCON_bits.LV0 #define LV1 LVDCON_bits.LV1 #define LV2 LVDCON_bits.LV2 #define LV3 LVDCON_bits.LV3 #define LVDEN LVDCON_bits.LVDEN #define BGST LVDCON_bits.BGST +#endif /* NO_BIT_DEFINES */ // ----- OPACON bits -------------------- typedef union { @@ -500,9 +518,11 @@ typedef union { } __OPACON_bits_t; extern volatile __OPACON_bits_t __at(OPACON_ADDR) OPACON_bits; +#ifndef NO_BIT_DEFINES #define GBWP OPACON_bits.GBWP #define CMPEN OPACON_bits.CMPEN #define OPAON OPACON_bits.OPAON +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -519,6 +539,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 @@ -527,6 +548,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -553,11 +575,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF #define WDTON PCON_bits.WDTON +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -574,11 +598,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define C1IE PIE1_bits.C1IE #define C2IE PIE1_bits.C2IE #define ADIE PIE1_bits.ADIE #define LVDIE PIE1_bits.LVDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -595,11 +621,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define C1IF PIR1_bits.C1IF #define C2IF PIR1_bits.C2IF #define ADIF PIR1_bits.ADIF #define LVDIF PIR1_bits.LVDIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -616,7 +644,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -633,12 +663,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 */ // ----- PORTB bits -------------------- typedef union { @@ -655,6 +687,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -663,6 +696,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PSMCCON0 bits -------------------- typedef union { @@ -679,6 +713,7 @@ typedef union { } __PSMCCON0_bits_t; extern volatile __PSMCCON0_bits_t __at(PSMCCON0_ADDR) PSMCCON0_bits; +#ifndef NO_BIT_DEFINES #define DC0 PSMCCON0_bits.DC0 #define DC1 PSMCCON0_bits.DC1 #define MAXDC0 PSMCCON0_bits.MAXDC0 @@ -687,6 +722,7 @@ extern volatile __PSMCCON0_bits_t __at(PSMCCON0_ADDR) PSMCCON0_bits; #define MINDC1 PSMCCON0_bits.MINDC1 #define SMCCL0 PSMCCON0_bits.SMCCL0 #define SMCCL1 PSMCCON0_bits.SMCCL1 +#endif /* NO_BIT_DEFINES */ // ----- PSMCCON1 bits -------------------- typedef union { @@ -723,6 +759,7 @@ typedef union { } __PSMCCON1_bits_t; extern volatile __PSMCCON1_bits_t __at(PSMCCON1_ADDR) PSMCCON1_bits; +#ifndef NO_BIT_DEFINES #define SMCCS PSMCCON1_bits.SMCCS #define PWM PSMCCON1_bits.PWM #define PSM PSMCCON1_bits.PSM @@ -732,6 +769,7 @@ extern volatile __PSMCCON1_bits_t __at(PSMCCON1_ADDR) PSMCCON1_bits; #define S1BPOL PSMCCON1_bits.S1BPOL #define S1APOL PSMCCON1_bits.S1APOL #define SMCON PSMCCON1_bits.SMCON +#endif /* NO_BIT_DEFINES */ // ----- REFCON bits -------------------- typedef union { @@ -748,8 +786,10 @@ typedef union { } __REFCON_bits_t; extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; +#ifndef NO_BIT_DEFINES #define VREFOE REFCON_bits.VREFOE #define VREFEN REFCON_bits.VREFEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -766,6 +806,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 @@ -774,6 +815,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 { @@ -800,6 +842,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 @@ -808,6 +851,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 { @@ -824,12 +868,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 */ // ----- TRISB bits -------------------- typedef union { @@ -846,6 +892,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -854,5 +901,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c925.h b/device/include/pic/pic16c925.h index ff0cd12c..4c88c0ec 100644 --- a/device/include/pic/pic16c925.h +++ b/device/include/pic/pic16c925.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 // @@ -352,6 +352,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 @@ -361,6 +362,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -377,11 +379,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -398,12 +402,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -420,6 +426,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -428,6 +435,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 */ // ----- LCDCON bits -------------------- typedef union { @@ -444,6 +452,7 @@ typedef union { } __LCDCON_bits_t; extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; +#ifndef NO_BIT_DEFINES #define LMUX0 LCDCON_bits.LMUX0 #define LMUX1 LCDCON_bits.LMUX1 #define CS0 LCDCON_bits.CS0 @@ -452,6 +461,7 @@ extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; #define WERR LCDCON_bits.WERR #define SLPEN LCDCON_bits.SLPEN #define LCDEN LCDCON_bits.LCDEN +#endif /* NO_BIT_DEFINES */ // ----- LCDPS bits -------------------- typedef union { @@ -468,10 +478,12 @@ typedef union { } __LCDPS_bits_t; extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; +#ifndef NO_BIT_DEFINES #define LP0 LCDPS_bits.LP0 #define LP1 LCDPS_bits.LP1 #define LP2 LCDPS_bits.LP2 #define LP3 LCDPS_bits.LP3 +#endif /* NO_BIT_DEFINES */ // ----- LCDSE bits -------------------- typedef union { @@ -488,6 +500,7 @@ typedef union { } __LCDSE_bits_t; extern volatile __LCDSE_bits_t __at(LCDSE_ADDR) LCDSE_bits; +#ifndef NO_BIT_DEFINES #define SE0 LCDSE_bits.SE0 #define SE5 LCDSE_bits.SE5 #define SE9 LCDSE_bits.SE9 @@ -496,6 +509,7 @@ extern volatile __LCDSE_bits_t __at(LCDSE_ADDR) LCDSE_bits; #define SE20 LCDSE_bits.SE20 #define SE27 LCDSE_bits.SE27 #define SE29 LCDSE_bits.SE29 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -512,6 +526,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 @@ -520,6 +535,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -536,8 +552,10 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -554,12 +572,14 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE #define LCDIE PIE1_bits.LCDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -576,12 +596,14 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF #define LCDIF PIR1_bits.LCDIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -598,7 +620,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -615,12 +639,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 */ // ----- PORTB bits -------------------- typedef union { @@ -637,6 +663,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -645,6 +672,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -661,6 +689,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 @@ -669,6 +698,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 */ // ----- PORTD bits -------------------- typedef union { @@ -685,6 +715,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -693,6 +724,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -709,9 +741,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -728,6 +762,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -736,6 +771,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -802,6 +838,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -822,6 +859,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -838,6 +876,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 @@ -846,6 +885,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 { @@ -872,6 +912,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 @@ -879,6 +920,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -895,6 +937,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 @@ -902,6 +945,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 { @@ -918,12 +962,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 */ // ----- TRISB bits -------------------- typedef union { @@ -940,6 +986,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -948,6 +995,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -964,6 +1012,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 @@ -972,6 +1021,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 */ // ----- TRISD bits -------------------- typedef union { @@ -988,6 +1038,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -996,6 +1047,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1012,6 +1064,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1019,5 +1072,6 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16c926.h b/device/include/pic/pic16c926.h index 54c21eba..70ff7305 100644 --- a/device/include/pic/pic16c926.h +++ b/device/include/pic/pic16c926.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 // @@ -352,6 +352,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 @@ -361,6 +362,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -377,11 +379,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -398,12 +402,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -420,6 +426,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -428,6 +435,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 */ // ----- LCDCON bits -------------------- typedef union { @@ -444,6 +452,7 @@ typedef union { } __LCDCON_bits_t; extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; +#ifndef NO_BIT_DEFINES #define LMUX0 LCDCON_bits.LMUX0 #define LMUX1 LCDCON_bits.LMUX1 #define CS0 LCDCON_bits.CS0 @@ -452,6 +461,7 @@ extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; #define WERR LCDCON_bits.WERR #define SLPEN LCDCON_bits.SLPEN #define LCDEN LCDCON_bits.LCDEN +#endif /* NO_BIT_DEFINES */ // ----- LCDPS bits -------------------- typedef union { @@ -468,10 +478,12 @@ typedef union { } __LCDPS_bits_t; extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; +#ifndef NO_BIT_DEFINES #define LP0 LCDPS_bits.LP0 #define LP1 LCDPS_bits.LP1 #define LP2 LCDPS_bits.LP2 #define LP3 LCDPS_bits.LP3 +#endif /* NO_BIT_DEFINES */ // ----- LCDSE bits -------------------- typedef union { @@ -488,6 +500,7 @@ typedef union { } __LCDSE_bits_t; extern volatile __LCDSE_bits_t __at(LCDSE_ADDR) LCDSE_bits; +#ifndef NO_BIT_DEFINES #define SE0 LCDSE_bits.SE0 #define SE5 LCDSE_bits.SE5 #define SE9 LCDSE_bits.SE9 @@ -496,6 +509,7 @@ extern volatile __LCDSE_bits_t __at(LCDSE_ADDR) LCDSE_bits; #define SE20 LCDSE_bits.SE20 #define SE27 LCDSE_bits.SE27 #define SE29 LCDSE_bits.SE29 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -512,6 +526,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 @@ -520,6 +535,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -536,8 +552,10 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -554,12 +572,14 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE #define LCDIE PIE1_bits.LCDIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -576,12 +596,14 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF #define LCDIF PIR1_bits.LCDIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -598,7 +620,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -615,12 +639,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 */ // ----- PORTB bits -------------------- typedef union { @@ -637,6 +663,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -645,6 +672,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -661,6 +689,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 @@ -669,6 +698,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 */ // ----- PORTD bits -------------------- typedef union { @@ -685,6 +715,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -693,6 +724,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -709,9 +741,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -728,6 +762,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -736,6 +771,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -802,6 +838,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -822,6 +859,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -838,6 +876,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 @@ -846,6 +885,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 { @@ -872,6 +912,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 @@ -879,6 +920,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -895,6 +937,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 @@ -902,6 +945,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 { @@ -918,12 +962,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 */ // ----- TRISB bits -------------------- typedef union { @@ -940,6 +986,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -948,6 +995,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -964,6 +1012,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 @@ -972,6 +1021,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 */ // ----- TRISD bits -------------------- typedef union { @@ -988,6 +1038,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -996,6 +1047,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1012,6 +1064,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1019,5 +1072,6 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f627.h b/device/include/pic/pic16f627.h index ac78f4b3..5be8e159 100644 --- a/device/include/pic/pic16f627.h +++ b/device/include/pic/pic16f627.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 // @@ -248,12 +248,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -270,6 +272,7 @@ 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 @@ -278,6 +281,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -294,10 +298,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 { @@ -314,6 +320,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -322,6 +329,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 { @@ -338,6 +346,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 @@ -346,6 +355,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -382,11 +392,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_BOD PCON_bits.NOT_BOD #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -403,6 +415,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -410,6 +423,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define CMIE PIE1_bits.CMIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -426,6 +440,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -433,6 +448,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -449,12 +465,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 */ // ----- PORTB bits -------------------- typedef union { @@ -471,6 +489,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -479,6 +498,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -495,6 +515,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define OERR RCSTA_bits.OERR #define FERR RCSTA_bits.FERR @@ -503,6 +524,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -519,6 +541,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 @@ -527,6 +550,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 { @@ -543,12 +567,14 @@ 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 #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -565,6 +591,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 @@ -572,6 +599,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 { @@ -588,12 +616,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 */ // ----- TRISB bits -------------------- typedef union { @@ -610,6 +640,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -618,6 +649,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -634,6 +666,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -641,6 +674,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -657,6 +691,7 @@ 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 @@ -664,5 +699,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f627a.h b/device/include/pic/pic16f627a.h index 4b3d21f6..0474f8d4 100644 --- a/device/include/pic/pic16f627a.h +++ b/device/include/pic/pic16f627a.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 // @@ -252,12 +252,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -274,6 +276,7 @@ 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 @@ -282,6 +285,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -298,10 +302,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 { @@ -318,6 +324,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -326,6 +333,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 { @@ -342,6 +350,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 @@ -350,6 +359,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -386,11 +396,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_BOD PCON_bits.NOT_BOD #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -407,6 +419,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -414,6 +427,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define CMIE PIE1_bits.CMIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -430,6 +444,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -437,6 +452,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -453,12 +469,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 */ // ----- PORTB bits -------------------- typedef union { @@ -475,6 +493,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -483,6 +502,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -499,6 +519,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define OERR RCSTA_bits.OERR #define FERR RCSTA_bits.FERR @@ -507,6 +528,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -523,6 +545,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 @@ -531,6 +554,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 { @@ -547,12 +571,14 @@ 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 #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -569,6 +595,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 @@ -576,6 +603,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 { @@ -592,12 +620,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 */ // ----- TRISB bits -------------------- typedef union { @@ -614,6 +644,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -622,6 +653,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -638,6 +670,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -645,6 +678,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -661,6 +695,7 @@ 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 @@ -668,5 +703,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f628.h b/device/include/pic/pic16f628.h index 7fc4216b..a3238e59 100644 --- a/device/include/pic/pic16f628.h +++ b/device/include/pic/pic16f628.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 // @@ -248,12 +248,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -270,6 +272,7 @@ 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 @@ -278,6 +281,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -294,10 +298,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 { @@ -314,6 +320,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -322,6 +329,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 { @@ -338,6 +346,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 @@ -346,6 +355,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -382,11 +392,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_BOD PCON_bits.NOT_BOD #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -403,6 +415,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -410,6 +423,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define CMIE PIE1_bits.CMIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -426,6 +440,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -433,6 +448,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -449,12 +465,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 */ // ----- PORTB bits -------------------- typedef union { @@ -471,6 +489,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -479,6 +498,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -495,6 +515,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define OERR RCSTA_bits.OERR #define FERR RCSTA_bits.FERR @@ -503,6 +524,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -519,6 +541,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 @@ -527,6 +550,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 { @@ -543,12 +567,14 @@ 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 #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -565,6 +591,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 @@ -572,6 +599,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 { @@ -588,12 +616,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 */ // ----- TRISB bits -------------------- typedef union { @@ -610,6 +640,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -618,6 +649,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -634,6 +666,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -641,6 +674,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -657,6 +691,7 @@ 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 @@ -664,5 +699,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f628a.h b/device/include/pic/pic16f628a.h index ed44658b..fa28bbdc 100644 --- a/device/include/pic/pic16f628a.h +++ b/device/include/pic/pic16f628a.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 // @@ -253,12 +253,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -275,6 +277,7 @@ 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 @@ -283,6 +286,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -299,10 +303,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 { @@ -319,6 +325,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -327,6 +334,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 { @@ -343,6 +351,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 @@ -351,6 +360,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -387,11 +397,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_BOD PCON_bits.NOT_BOD #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -408,6 +420,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -415,6 +428,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define CMIE PIE1_bits.CMIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -431,6 +445,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -438,6 +453,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -454,12 +470,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 */ // ----- PORTB bits -------------------- typedef union { @@ -476,6 +494,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -484,6 +503,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -500,6 +520,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define OERR RCSTA_bits.OERR #define FERR RCSTA_bits.FERR @@ -508,6 +529,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -524,6 +546,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 @@ -532,6 +555,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 { @@ -548,12 +572,14 @@ 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 #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -570,6 +596,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 @@ -577,6 +604,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 { @@ -593,12 +621,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 */ // ----- TRISB bits -------------------- typedef union { @@ -615,6 +645,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -623,6 +654,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -639,6 +671,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -646,6 +679,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -662,6 +696,7 @@ 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 @@ -669,5 +704,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f630.h b/device/include/pic/pic16f630.h index 00080127..edd4e4d3 100644 --- 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 diff --git a/device/include/pic/pic16f636.h b/device/include/pic/pic16f636.h index 2b6c26dc..d49c1c6d 100644 --- a/device/include/pic/pic16f636.h +++ b/device/include/pic/pic16f636.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 // @@ -290,6 +290,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 @@ -298,6 +299,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 { @@ -314,8 +316,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 */ // ----- CRCON bits -------------------- typedef union { @@ -332,10 +336,12 @@ typedef union { } __CRCON_bits_t; extern volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; +#ifndef NO_BIT_DEFINES #define CRREG0 CRCON_bits.CRREG0 #define CRREG1 CRCON_bits.CRREG1 #define ENC_DEC CRCON_bits.ENC_DEC #define GO CRCON_bits.GO +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -352,10 +358,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 { @@ -372,6 +380,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 @@ -380,6 +389,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 */ // ----- IOCA bits -------------------- typedef union { @@ -396,12 +406,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -418,11 +430,13 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -439,6 +453,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 @@ -447,6 +462,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 { @@ -463,6 +479,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 @@ -470,6 +487,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 { @@ -486,11 +504,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 { @@ -507,11 +527,13 @@ 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 NOT_WUR PCON_bits.NOT_WUR #define SBODEN PCON_bits.SBODEN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -528,6 +550,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define OSFIE PIE1_bits.OSFIE #define C1IE PIE1_bits.C1IE @@ -535,6 +558,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define CRIE PIE1_bits.CRIE #define LVDIE PIE1_bits.LVDIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -551,6 +575,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define OSFIF PIR1_bits.OSFIF #define C1IF PIR1_bits.C1IF @@ -558,6 +583,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CRIF PIR1_bits.CRIF #define LVDIF PIR1_bits.LVDIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -574,12 +600,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 { @@ -596,6 +624,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 @@ -604,6 +633,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 { @@ -620,6 +650,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 @@ -628,6 +659,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 { @@ -644,6 +676,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 @@ -652,6 +685,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 */ // ----- TRISA bits -------------------- typedef union { @@ -668,12 +702,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 { @@ -690,6 +726,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 @@ -698,6 +735,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 { @@ -714,12 +752,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 */ // ----- WDA bits -------------------- typedef union { @@ -736,11 +776,13 @@ typedef union { } __WDA_bits_t; extern volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; +#ifndef NO_BIT_DEFINES #define WDA0 WDA_bits.WDA0 #define WDA1 WDA_bits.WDA1 #define WDA2 WDA_bits.WDA2 #define WDA4 WDA_bits.WDA4 #define WDA5 WDA_bits.WDA5 +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -757,11 +799,13 @@ 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 */ // ----- WPUDA bits -------------------- typedef union { @@ -778,10 +822,12 @@ typedef union { } __WPUDA_bits_t; extern volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; +#ifndef NO_BIT_DEFINES #define WPUDA0 WPUDA_bits.WPUDA0 #define WPUDA1 WPUDA_bits.WPUDA1 #define WPUDA2 WPUDA_bits.WPUDA2 #define WPUDA4 WPUDA_bits.WPUDA4 #define WPUDA5 WPUDA_bits.WPUDA5 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f639.h b/device/include/pic/pic16f639.h index 031980f0..edfb30be 100644 --- a/device/include/pic/pic16f639.h +++ b/device/include/pic/pic16f639.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 // @@ -288,6 +288,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 @@ -296,6 +297,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 { @@ -312,8 +314,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 */ // ----- CRCON bits -------------------- typedef union { @@ -330,10 +334,12 @@ typedef union { } __CRCON_bits_t; extern volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; +#ifndef NO_BIT_DEFINES #define CRREG0 CRCON_bits.CRREG0 #define CRREG1 CRCON_bits.CRREG1 #define ENC_DEC CRCON_bits.ENC_DEC #define GO CRCON_bits.GO +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -350,10 +356,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 { @@ -370,6 +378,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 @@ -378,6 +387,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 */ // ----- IOCA bits -------------------- typedef union { @@ -394,12 +404,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 */ // ----- LVDCON bits -------------------- typedef union { @@ -416,11 +428,13 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -437,6 +451,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 @@ -445,6 +460,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 { @@ -461,6 +477,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 @@ -468,6 +485,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 { @@ -484,11 +502,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 { @@ -505,11 +525,13 @@ 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 NOT_WUR PCON_bits.NOT_WUR #define SBODEN PCON_bits.SBODEN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -526,6 +548,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define OSFIE PIE1_bits.OSFIE #define C1IE PIE1_bits.C1IE @@ -533,6 +556,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define CRIE PIE1_bits.CRIE #define LVDIE PIE1_bits.LVDIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -549,6 +573,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define OSFIF PIR1_bits.OSFIF #define C1IF PIR1_bits.C1IF @@ -556,6 +581,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CRIF PIR1_bits.CRIF #define LVDIF PIR1_bits.LVDIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -572,12 +598,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 { @@ -594,6 +622,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 @@ -602,6 +631,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 { @@ -618,6 +648,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 @@ -626,6 +657,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 { @@ -642,6 +674,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 @@ -650,6 +683,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 */ // ----- TRISA bits -------------------- typedef union { @@ -666,12 +700,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 { @@ -688,6 +724,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 @@ -696,6 +733,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 { @@ -712,12 +750,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 */ // ----- WDA bits -------------------- typedef union { @@ -734,11 +774,13 @@ typedef union { } __WDA_bits_t; extern volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; +#ifndef NO_BIT_DEFINES #define WDA0 WDA_bits.WDA0 #define WDA1 WDA_bits.WDA1 #define WDA2 WDA_bits.WDA2 #define WDA4 WDA_bits.WDA4 #define WDA5 WDA_bits.WDA5 +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -755,11 +797,13 @@ 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 */ // ----- WPUDA bits -------------------- typedef union { @@ -776,10 +820,12 @@ typedef union { } __WPUDA_bits_t; extern volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; +#ifndef NO_BIT_DEFINES #define WPUDA0 WPUDA_bits.WPUDA0 #define WPUDA1 WPUDA_bits.WPUDA1 #define WPUDA2 WPUDA_bits.WPUDA2 #define WPUDA4 WPUDA_bits.WPUDA4 #define WPUDA5 WPUDA_bits.WPUDA5 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f648a.h b/device/include/pic/pic16f648a.h index f63df500..73ac4776 100644 --- a/device/include/pic/pic16f648a.h +++ b/device/include/pic/pic16f648a.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 // @@ -251,12 +251,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -273,6 +275,7 @@ 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 @@ -281,6 +284,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -297,10 +301,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 { @@ -317,6 +323,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -325,6 +332,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 { @@ -341,6 +349,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 @@ -349,6 +358,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -385,11 +395,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_BOD PCON_bits.NOT_BOD #define NOT_POR PCON_bits.NOT_POR #define OSCF PCON_bits.OSCF +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -406,6 +418,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -413,6 +426,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define CMIE PIE1_bits.CMIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -429,6 +443,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -436,6 +451,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -452,12 +468,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 */ // ----- PORTB bits -------------------- typedef union { @@ -474,6 +492,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -482,6 +501,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -498,6 +518,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define OERR RCSTA_bits.OERR #define FERR RCSTA_bits.FERR @@ -506,6 +527,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -522,6 +544,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 @@ -530,6 +553,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 { @@ -546,12 +570,14 @@ 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 #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -568,6 +594,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 @@ -575,6 +602,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 { @@ -591,12 +619,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 */ // ----- TRISB bits -------------------- typedef union { @@ -613,6 +643,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -621,6 +652,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -637,6 +669,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -644,6 +677,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -660,6 +694,7 @@ 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 @@ -667,5 +702,6 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f676.h b/device/include/pic/pic16f676.h index 37bf15f9..7a5f39bb 100644 --- a/device/include/pic/pic16f676.h +++ b/device/include/pic/pic16f676.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 // @@ -278,6 +278,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 @@ -287,6 +288,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 { @@ -303,9 +305,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 { @@ -322,6 +326,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 @@ -330,6 +335,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 */ // ----- CMCON bits -------------------- typedef union { @@ -346,12 +352,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 { @@ -368,10 +376,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 { @@ -388,6 +398,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 @@ -396,6 +407,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 { @@ -422,6 +434,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 @@ -431,6 +444,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 { @@ -447,12 +461,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 { @@ -469,8 +485,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 { @@ -497,11 +515,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 { @@ -528,11 +548,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 { @@ -549,12 +571,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 { @@ -571,6 +595,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 @@ -579,6 +604,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 { @@ -595,6 +621,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 @@ -603,6 +630,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 { @@ -619,6 +647,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 @@ -626,6 +655,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 { @@ -642,12 +672,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 { @@ -664,6 +696,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 @@ -672,6 +705,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 { @@ -688,11 +722,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 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 diff --git a/device/include/pic/pic16f685.h b/device/include/pic/pic16f685.h index ca715c29..144565d1 100644 --- a/device/include/pic/pic16f685.h +++ b/device/include/pic/pic16f685.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 // @@ -423,6 +423,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 @@ -433,6 +434,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS3 ADCON0_bits.CHS3 #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -449,9 +451,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 { @@ -468,6 +472,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 @@ -476,6 +481,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 */ // ----- ANSELH bits -------------------- typedef union { @@ -492,10 +498,12 @@ typedef union { } __ANSELH_bits_t; extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; +#ifndef NO_BIT_DEFINES #define ANS8 ANSELH_bits.ANS8 #define ANS9 ANSELH_bits.ANS9 #define ANS10 ANSELH_bits.ANS10 #define ANS11 ANSELH_bits.ANS11 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -512,6 +520,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 @@ -520,6 +529,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 */ // ----- CM1CON0 bits -------------------- typedef union { @@ -536,6 +546,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -543,6 +554,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -559,6 +571,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -566,6 +579,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -582,10 +596,12 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define T1GSS CM2CON1_bits.T1GSS #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT +#endif /* NO_BIT_DEFINES */ // ----- ECCPAS bits -------------------- typedef union { @@ -602,6 +618,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 @@ -610,6 +627,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 { @@ -626,11 +644,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -647,6 +667,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RABIF INTCON_bits.RABIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -655,6 +676,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 { @@ -671,12 +693,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 { @@ -693,12 +717,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 */ // ----- IOCB bits -------------------- typedef union { @@ -715,10 +741,12 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -735,6 +763,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 @@ -743,6 +772,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_RABPU OPTION_REG_bits.NOT_RABPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -759,6 +789,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 @@ -766,6 +797,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 { @@ -782,11 +814,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 { @@ -813,11 +847,13 @@ 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_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -844,12 +880,14 @@ 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 #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -866,10 +904,12 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -896,12 +936,14 @@ 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 #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -918,10 +960,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -938,12 +982,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 */ // ----- PORTB bits -------------------- typedef union { @@ -960,6 +1006,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -968,6 +1015,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -984,6 +1032,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 @@ -992,6 +1041,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 */ // ----- PSTRCON bits -------------------- typedef union { @@ -1008,11 +1058,13 @@ typedef union { } __PSTRCON_bits_t; extern volatile __PSTRCON_bits_t __at(PSTRCON_ADDR) PSTRCON_bits; +#ifndef NO_BIT_DEFINES #define STRA PSTRCON_bits.STRA #define STRB PSTRCON_bits.STRB #define STRC PSTRCON_bits.STRC #define STRD PSTRCON_bits.STRD #define STRSYNC PSTRCON_bits.STRSYNC +#endif /* NO_BIT_DEFINES */ // ----- PWM1CON bits -------------------- typedef union { @@ -1029,6 +1081,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 @@ -1037,6 +1090,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 */ // ----- SRCON bits -------------------- typedef union { @@ -1053,12 +1107,14 @@ typedef union { } __SRCON_bits_t; extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; +#ifndef NO_BIT_DEFINES #define PULSR SRCON_bits.PULSR #define PULSS SRCON_bits.PULSS #define C2REN SRCON_bits.C2REN #define C1SEN SRCON_bits.C1SEN #define SR0 SRCON_bits.SR0 #define SR1 SRCON_bits.SR1 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1075,6 +1131,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 @@ -1083,6 +1140,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 { @@ -1099,6 +1157,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 @@ -1107,6 +1166,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 { @@ -1123,6 +1183,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 @@ -1130,6 +1191,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 { @@ -1146,12 +1208,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1168,10 +1232,12 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB4 TRISB_bits.TRISB4 #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1188,6 +1254,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 @@ -1196,6 +1263,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 { @@ -1212,6 +1280,7 @@ 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 @@ -1220,6 +1289,7 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define C2VREN VRCON_bits.C2VREN #define C1VREN VRCON_bits.C1VREN +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1236,11 +1306,13 @@ 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 */ // ----- WPUA bits -------------------- typedef union { @@ -1257,11 +1329,13 @@ typedef union { } __WPUA_bits_t; extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; +#ifndef NO_BIT_DEFINES #define WPUA0 WPUA_bits.WPUA0 #define WPUA1 WPUA_bits.WPUA1 #define WPUA2 WPUA_bits.WPUA2 #define WPUA4 WPUA_bits.WPUA4 #define WPUA5 WPUA_bits.WPUA5 +#endif /* NO_BIT_DEFINES */ // ----- WPUB bits -------------------- typedef union { @@ -1278,9 +1352,11 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB4 WPUB_bits.WPUB4 #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f687.h b/device/include/pic/pic16f687.h index 677b0dea..65674c2f 100644 --- a/device/include/pic/pic16f687.h +++ b/device/include/pic/pic16f687.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 // @@ -439,6 +439,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 @@ -449,6 +450,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS3 ADCON0_bits.CHS3 #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -465,9 +467,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 { @@ -484,6 +488,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 @@ -492,6 +497,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 */ // ----- ANSELH bits -------------------- typedef union { @@ -508,10 +514,12 @@ typedef union { } __ANSELH_bits_t; extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; +#ifndef NO_BIT_DEFINES #define ANS8 ANSELH_bits.ANS8 #define ANS9 ANSELH_bits.ANS9 #define ANS10 ANSELH_bits.ANS10 #define ANS11 ANSELH_bits.ANS11 +#endif /* NO_BIT_DEFINES */ // ----- BAUDCTL bits -------------------- typedef union { @@ -528,12 +536,14 @@ typedef union { } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; +#ifndef NO_BIT_DEFINES #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF +#endif /* NO_BIT_DEFINES */ // ----- CM1CON0 bits -------------------- typedef union { @@ -550,6 +560,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -557,6 +568,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -573,6 +585,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -580,6 +593,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -596,10 +610,12 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define T1GSS CM2CON1_bits.T1GSS #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -616,11 +632,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -637,6 +655,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RABIF INTCON_bits.RABIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -645,6 +664,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 { @@ -661,12 +681,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 { @@ -683,12 +705,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 */ // ----- IOCB bits -------------------- typedef union { @@ -705,10 +729,12 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -725,6 +751,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 @@ -733,6 +760,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_RABPU OPTION_REG_bits.NOT_RABPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -749,6 +777,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 @@ -756,6 +785,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 { @@ -772,11 +802,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 { @@ -793,10 +825,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -823,12 +857,14 @@ 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 SSPIE PIE1_bits.SSPIE #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -845,10 +881,12 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -875,12 +913,14 @@ 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 SSPIF PIR1_bits.SSPIF #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -897,10 +937,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -917,12 +959,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 */ // ----- PORTB bits -------------------- typedef union { @@ -939,6 +983,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -947,6 +992,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -963,6 +1009,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 @@ -971,6 +1018,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -987,6 +1035,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define OERR RCSTA_bits.OERR #define FERR RCSTA_bits.FERR @@ -995,6 +1044,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SPBRG bits -------------------- typedef union { @@ -1011,6 +1061,7 @@ typedef union { } __SPBRG_bits_t; extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; +#ifndef NO_BIT_DEFINES #define BRG0 SPBRG_bits.BRG0 #define BRG1 SPBRG_bits.BRG1 #define BRG2 SPBRG_bits.BRG2 @@ -1019,6 +1070,7 @@ extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; #define BRG5 SPBRG_bits.BRG5 #define BRG6 SPBRG_bits.BRG6 #define BRG7 SPBRG_bits.BRG7 +#endif /* NO_BIT_DEFINES */ // ----- SPBRGH bits -------------------- typedef union { @@ -1035,6 +1087,7 @@ typedef union { } __SPBRGH_bits_t; extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; +#ifndef NO_BIT_DEFINES #define BRG8 SPBRGH_bits.BRG8 #define BRG9 SPBRGH_bits.BRG9 #define BRG10 SPBRGH_bits.BRG10 @@ -1043,6 +1096,7 @@ extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; #define BRG13 SPBRGH_bits.BRG13 #define BRG14 SPBRGH_bits.BRG14 #define BRG15 SPBRGH_bits.BRG15 +#endif /* NO_BIT_DEFINES */ // ----- SRCON bits -------------------- typedef union { @@ -1059,12 +1113,14 @@ typedef union { } __SRCON_bits_t; extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; +#ifndef NO_BIT_DEFINES #define PULSR SRCON_bits.PULSR #define PULSS SRCON_bits.PULSS #define C2REN SRCON_bits.C2REN #define C1SEN SRCON_bits.C1SEN #define SR0 SRCON_bits.SR0 #define SR1 SRCON_bits.SR1 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1081,6 +1137,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1089,6 +1146,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1155,6 +1213,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1175,6 +1234,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1191,6 +1251,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 @@ -1199,6 +1260,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 { @@ -1215,6 +1277,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 @@ -1223,6 +1286,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 */ // ----- TRISA bits -------------------- typedef union { @@ -1239,12 +1303,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1261,10 +1327,12 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB4 TRISB_bits.TRISB4 #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1281,6 +1349,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 @@ -1289,6 +1358,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -1305,6 +1375,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -1313,6 +1384,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -1329,6 +1401,7 @@ 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 @@ -1337,6 +1410,7 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define C2VREN VRCON_bits.C2VREN #define C1VREN VRCON_bits.C1VREN +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1353,11 +1427,13 @@ 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 */ // ----- WPUA bits -------------------- typedef union { @@ -1374,11 +1450,13 @@ typedef union { } __WPUA_bits_t; extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; +#ifndef NO_BIT_DEFINES #define WPUA0 WPUA_bits.WPUA0 #define WPUA1 WPUA_bits.WPUA1 #define WPUA2 WPUA_bits.WPUA2 #define WPUA4 WPUA_bits.WPUA4 #define WPUA5 WPUA_bits.WPUA5 +#endif /* NO_BIT_DEFINES */ // ----- WPUB bits -------------------- typedef union { @@ -1395,9 +1473,11 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB4 WPUB_bits.WPUB4 #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f688.h b/device/include/pic/pic16f688.h index 6d35ff5e..0c599046 100644 --- a/device/include/pic/pic16f688.h +++ b/device/include/pic/pic16f688.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 // @@ -335,6 +335,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 @@ -344,6 +345,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 { @@ -360,9 +362,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 { @@ -379,6 +383,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 @@ -387,6 +392,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 */ // ----- BAUDCTL bits -------------------- typedef union { @@ -403,12 +409,14 @@ typedef union { } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; +#ifndef NO_BIT_DEFINES #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF +#endif /* NO_BIT_DEFINES */ // ----- CMCON0 bits -------------------- typedef union { @@ -425,6 +433,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 @@ -433,6 +442,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 { @@ -449,8 +459,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 */ // ----- EECON1 bits -------------------- typedef union { @@ -467,11 +479,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -488,6 +502,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 @@ -496,6 +511,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 { @@ -512,12 +528,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 { @@ -534,12 +552,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 { @@ -556,6 +576,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 @@ -564,6 +585,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 { @@ -580,6 +602,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 @@ -587,6 +610,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 { @@ -603,11 +627,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 { @@ -624,10 +650,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 { @@ -654,6 +682,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 TXIE PIE1_bits.TXIE @@ -663,6 +692,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -689,6 +719,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 TXIF PIR1_bits.TXIF @@ -698,6 +729,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -714,12 +746,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 { @@ -736,6 +770,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 @@ -744,6 +779,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -770,6 +806,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define SWDTEN RCSTA_bits.SWDTEN #define OERR RCSTA_bits.OERR @@ -783,6 +820,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -799,6 +837,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 @@ -807,6 +846,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 { @@ -823,6 +863,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 @@ -831,6 +872,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 */ // ----- TRISA bits -------------------- typedef union { @@ -847,12 +889,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 { @@ -869,6 +913,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 @@ -877,6 +922,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -893,6 +939,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -901,6 +948,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -917,11 +965,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 diff --git a/device/include/pic/pic16f689.h b/device/include/pic/pic16f689.h index 3d115aa4..5485551a 100644 --- a/device/include/pic/pic16f689.h +++ b/device/include/pic/pic16f689.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 // @@ -439,6 +439,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 @@ -449,6 +450,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS3 ADCON0_bits.CHS3 #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -465,9 +467,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 { @@ -484,6 +488,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 @@ -492,6 +497,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 */ // ----- ANSELH bits -------------------- typedef union { @@ -508,10 +514,12 @@ typedef union { } __ANSELH_bits_t; extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; +#ifndef NO_BIT_DEFINES #define ANS8 ANSELH_bits.ANS8 #define ANS9 ANSELH_bits.ANS9 #define ANS10 ANSELH_bits.ANS10 #define ANS11 ANSELH_bits.ANS11 +#endif /* NO_BIT_DEFINES */ // ----- BAUDCTL bits -------------------- typedef union { @@ -528,12 +536,14 @@ typedef union { } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; +#ifndef NO_BIT_DEFINES #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF +#endif /* NO_BIT_DEFINES */ // ----- CM1CON0 bits -------------------- typedef union { @@ -550,6 +560,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -557,6 +568,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -573,6 +585,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -580,6 +593,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -596,10 +610,12 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define T1GSS CM2CON1_bits.T1GSS #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -616,11 +632,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -637,6 +655,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RABIF INTCON_bits.RABIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -645,6 +664,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 { @@ -661,12 +681,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 { @@ -683,12 +705,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 */ // ----- IOCB bits -------------------- typedef union { @@ -705,10 +729,12 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -725,6 +751,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 @@ -733,6 +760,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_RABPU OPTION_REG_bits.NOT_RABPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -749,6 +777,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 @@ -756,6 +785,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 { @@ -772,11 +802,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 { @@ -793,10 +825,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -823,12 +857,14 @@ 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 SSPIE PIE1_bits.SSPIE #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -845,10 +881,12 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -875,12 +913,14 @@ 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 SSPIF PIR1_bits.SSPIF #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -897,10 +937,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -917,12 +959,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 */ // ----- PORTB bits -------------------- typedef union { @@ -939,6 +983,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -947,6 +992,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -963,6 +1009,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 @@ -971,6 +1018,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -987,6 +1035,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define OERR RCSTA_bits.OERR #define FERR RCSTA_bits.FERR @@ -995,6 +1044,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SPBRG bits -------------------- typedef union { @@ -1011,6 +1061,7 @@ typedef union { } __SPBRG_bits_t; extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; +#ifndef NO_BIT_DEFINES #define BRG0 SPBRG_bits.BRG0 #define BRG1 SPBRG_bits.BRG1 #define BRG2 SPBRG_bits.BRG2 @@ -1019,6 +1070,7 @@ extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; #define BRG5 SPBRG_bits.BRG5 #define BRG6 SPBRG_bits.BRG6 #define BRG7 SPBRG_bits.BRG7 +#endif /* NO_BIT_DEFINES */ // ----- SPBRGH bits -------------------- typedef union { @@ -1035,6 +1087,7 @@ typedef union { } __SPBRGH_bits_t; extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; +#ifndef NO_BIT_DEFINES #define BRG8 SPBRGH_bits.BRG8 #define BRG9 SPBRGH_bits.BRG9 #define BRG10 SPBRGH_bits.BRG10 @@ -1043,6 +1096,7 @@ extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; #define BRG13 SPBRGH_bits.BRG13 #define BRG14 SPBRGH_bits.BRG14 #define BRG15 SPBRGH_bits.BRG15 +#endif /* NO_BIT_DEFINES */ // ----- SRCON bits -------------------- typedef union { @@ -1059,12 +1113,14 @@ typedef union { } __SRCON_bits_t; extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; +#ifndef NO_BIT_DEFINES #define PULSR SRCON_bits.PULSR #define PULSS SRCON_bits.PULSS #define C2REN SRCON_bits.C2REN #define C1SEN SRCON_bits.C1SEN #define SR0 SRCON_bits.SR0 #define SR1 SRCON_bits.SR1 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1081,6 +1137,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1089,6 +1146,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1155,6 +1213,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1175,6 +1234,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1191,6 +1251,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 @@ -1199,6 +1260,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 { @@ -1215,6 +1277,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 @@ -1223,6 +1286,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 */ // ----- TRISA bits -------------------- typedef union { @@ -1239,12 +1303,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1261,10 +1327,12 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB4 TRISB_bits.TRISB4 #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1281,6 +1349,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 @@ -1289,6 +1358,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -1305,6 +1375,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -1313,6 +1384,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -1329,6 +1401,7 @@ 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 @@ -1337,6 +1410,7 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define C2VREN VRCON_bits.C2VREN #define C1VREN VRCON_bits.C1VREN +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1353,11 +1427,13 @@ 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 */ // ----- WPUA bits -------------------- typedef union { @@ -1374,11 +1450,13 @@ typedef union { } __WPUA_bits_t; extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; +#ifndef NO_BIT_DEFINES #define WPUA0 WPUA_bits.WPUA0 #define WPUA1 WPUA_bits.WPUA1 #define WPUA2 WPUA_bits.WPUA2 #define WPUA4 WPUA_bits.WPUA4 #define WPUA5 WPUA_bits.WPUA5 +#endif /* NO_BIT_DEFINES */ // ----- WPUB bits -------------------- typedef union { @@ -1395,9 +1473,11 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB4 WPUB_bits.WPUB4 #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f690.h b/device/include/pic/pic16f690.h index 40bb0441..96d64005 100644 --- a/device/include/pic/pic16f690.h +++ b/device/include/pic/pic16f690.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 // @@ -460,6 +460,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 @@ -470,6 +471,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS3 ADCON0_bits.CHS3 #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -486,9 +488,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 { @@ -505,6 +509,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 @@ -513,6 +518,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 */ // ----- ANSELH bits -------------------- typedef union { @@ -529,10 +535,12 @@ typedef union { } __ANSELH_bits_t; extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; +#ifndef NO_BIT_DEFINES #define ANS8 ANSELH_bits.ANS8 #define ANS9 ANSELH_bits.ANS9 #define ANS10 ANSELH_bits.ANS10 #define ANS11 ANSELH_bits.ANS11 +#endif /* NO_BIT_DEFINES */ // ----- BAUDCTL bits -------------------- typedef union { @@ -549,12 +557,14 @@ typedef union { } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; +#ifndef NO_BIT_DEFINES #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -571,6 +581,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 @@ -579,6 +590,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 */ // ----- CM1CON0 bits -------------------- typedef union { @@ -595,6 +607,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -602,6 +615,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -618,6 +632,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -625,6 +640,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -641,10 +657,12 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define T1GSS CM2CON1_bits.T1GSS #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT +#endif /* NO_BIT_DEFINES */ // ----- ECCPAS bits -------------------- typedef union { @@ -661,6 +679,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 @@ -669,6 +688,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 { @@ -685,11 +705,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -706,6 +728,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RABIF INTCON_bits.RABIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -714,6 +737,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 { @@ -730,12 +754,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 { @@ -752,12 +778,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 */ // ----- IOCB bits -------------------- typedef union { @@ -774,10 +802,12 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -794,6 +824,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 @@ -802,6 +833,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_RABPU OPTION_REG_bits.NOT_RABPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -818,6 +850,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 @@ -825,6 +858,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 { @@ -841,11 +875,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 { @@ -862,10 +898,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -892,6 +930,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 @@ -901,6 +940,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -917,10 +957,12 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -947,6 +989,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 @@ -956,6 +999,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -972,10 +1016,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -992,12 +1038,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 */ // ----- PORTB bits -------------------- typedef union { @@ -1014,6 +1062,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -1022,6 +1071,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -1038,6 +1088,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 @@ -1046,6 +1097,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 */ // ----- PSTRCON bits -------------------- typedef union { @@ -1062,11 +1114,13 @@ typedef union { } __PSTRCON_bits_t; extern volatile __PSTRCON_bits_t __at(PSTRCON_ADDR) PSTRCON_bits; +#ifndef NO_BIT_DEFINES #define STRA PSTRCON_bits.STRA #define STRB PSTRCON_bits.STRB #define STRC PSTRCON_bits.STRC #define STRD PSTRCON_bits.STRD #define STRSYNC PSTRCON_bits.STRSYNC +#endif /* NO_BIT_DEFINES */ // ----- PWM1CON bits -------------------- typedef union { @@ -1083,6 +1137,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 @@ -1091,6 +1146,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -1107,6 +1163,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define OERR RCSTA_bits.OERR #define FERR RCSTA_bits.FERR @@ -1115,6 +1172,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define SREN RCSTA_bits.SREN #define RX9 RCSTA_bits.RX9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SPBRG bits -------------------- typedef union { @@ -1131,6 +1189,7 @@ typedef union { } __SPBRG_bits_t; extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; +#ifndef NO_BIT_DEFINES #define BRG0 SPBRG_bits.BRG0 #define BRG1 SPBRG_bits.BRG1 #define BRG2 SPBRG_bits.BRG2 @@ -1139,6 +1198,7 @@ extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; #define BRG5 SPBRG_bits.BRG5 #define BRG6 SPBRG_bits.BRG6 #define BRG7 SPBRG_bits.BRG7 +#endif /* NO_BIT_DEFINES */ // ----- SPBRGH bits -------------------- typedef union { @@ -1155,6 +1215,7 @@ typedef union { } __SPBRGH_bits_t; extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; +#ifndef NO_BIT_DEFINES #define BRG8 SPBRGH_bits.BRG8 #define BRG9 SPBRGH_bits.BRG9 #define BRG10 SPBRGH_bits.BRG10 @@ -1163,6 +1224,7 @@ extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; #define BRG13 SPBRGH_bits.BRG13 #define BRG14 SPBRGH_bits.BRG14 #define BRG15 SPBRGH_bits.BRG15 +#endif /* NO_BIT_DEFINES */ // ----- SRCON bits -------------------- typedef union { @@ -1179,12 +1241,14 @@ typedef union { } __SRCON_bits_t; extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; +#ifndef NO_BIT_DEFINES #define PULSR SRCON_bits.PULSR #define PULSS SRCON_bits.PULSS #define C2REN SRCON_bits.C2REN #define C1SEN SRCON_bits.C1SEN #define SR0 SRCON_bits.SR0 #define SR1 SRCON_bits.SR1 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1201,6 +1265,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1209,6 +1274,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1275,6 +1341,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1295,6 +1362,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1311,6 +1379,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 @@ -1319,6 +1388,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 { @@ -1335,6 +1405,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 @@ -1343,6 +1414,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 { @@ -1359,6 +1431,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 @@ -1366,6 +1439,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 { @@ -1382,12 +1456,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1404,10 +1480,12 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB4 TRISB_bits.TRISB4 #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1424,6 +1502,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 @@ -1432,6 +1511,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -1448,6 +1528,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH @@ -1456,6 +1537,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -1472,6 +1554,7 @@ 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 @@ -1480,6 +1563,7 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define C2VREN VRCON_bits.C2VREN #define C1VREN VRCON_bits.C1VREN +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1496,11 +1580,13 @@ 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 */ // ----- WPUA bits -------------------- typedef union { @@ -1517,11 +1603,13 @@ typedef union { } __WPUA_bits_t; extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; +#ifndef NO_BIT_DEFINES #define WPUA0 WPUA_bits.WPUA0 #define WPUA1 WPUA_bits.WPUA1 #define WPUA2 WPUA_bits.WPUA2 #define WPUA4 WPUA_bits.WPUA4 #define WPUA5 WPUA_bits.WPUA5 +#endif /* NO_BIT_DEFINES */ // ----- WPUB bits -------------------- typedef union { @@ -1538,9 +1626,11 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB4 WPUB_bits.WPUB4 #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f716.h b/device/include/pic/pic16f716.h index 10de6181..c1267c43 100644 --- a/device/include/pic/pic16f716.h +++ b/device/include/pic/pic16f716.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 // @@ -267,6 +267,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 @@ -276,6 +277,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -292,9 +294,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -311,6 +315,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 @@ -319,6 +324,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 */ // ----- ECCPAS bits -------------------- typedef union { @@ -335,6 +341,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 @@ -342,6 +349,7 @@ extern volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; #define ECCPAS0 ECCPAS_bits.ECCPAS0 #define ECCPAS1 ECCPAS_bits.ECCPAS1 #define ECCPASE ECCPAS_bits.ECCPASE +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -358,6 +366,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -366,6 +375,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 { @@ -382,6 +392,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 @@ -390,6 +401,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -426,10 +438,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOD PCON_bits.NOT_BOD #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -446,10 +460,12 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -466,10 +482,12 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -486,12 +504,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 */ // ----- PORTB bits -------------------- typedef union { @@ -508,8 +528,10 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define DT1CK PORTB_bits.DT1CK #define DCCP PORTB_bits.DCCP +#endif /* NO_BIT_DEFINES */ // ----- PWM1CON bits -------------------- typedef union { @@ -526,6 +548,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 @@ -534,6 +557,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 { @@ -550,6 +574,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 @@ -558,6 +583,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 { @@ -584,6 +610,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 T1SYNC T1CON_bits.T1SYNC @@ -591,6 +618,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -607,6 +635,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 @@ -614,6 +643,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 { @@ -630,12 +660,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 */ // ----- TRISB bits -------------------- typedef union { @@ -652,7 +684,9 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TT1CK TRISB_bits.TT1CK #define TCCP TRISB_bits.TCCP +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f72.h b/device/include/pic/pic16f72.h index b41df748..8f986197 100644 --- a/device/include/pic/pic16f72.h +++ b/device/include/pic/pic16f72.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 // @@ -275,6 +275,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 @@ -284,6 +285,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -300,9 +302,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -319,12 +323,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -351,6 +357,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define TMR0IF INTCON_bits.TMR0IF @@ -361,6 +368,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 { @@ -377,6 +385,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 @@ -385,6 +394,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -411,9 +421,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -430,11 +442,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -451,11 +465,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -472,7 +488,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -489,12 +507,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 */ // ----- PORTB bits -------------------- typedef union { @@ -511,6 +531,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -519,6 +540,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -535,6 +557,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 @@ -543,6 +566,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 */ // ----- SSPCON bits -------------------- typedef union { @@ -559,6 +583,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -567,6 +592,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -633,6 +659,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -653,6 +680,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -669,6 +697,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 @@ -677,6 +706,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 { @@ -703,6 +733,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 @@ -710,6 +741,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -726,6 +758,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 @@ -733,6 +766,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 { @@ -749,12 +783,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 */ // ----- TRISB bits -------------------- typedef union { @@ -771,6 +807,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -779,6 +816,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -795,6 +833,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 @@ -803,5 +842,6 @@ 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 */ #endif diff --git a/device/include/pic/pic16f73.h b/device/include/pic/pic16f73.h index 6d4e5c75..cab5bc0e 100644 --- a/device/include/pic/pic16f73.h +++ b/device/include/pic/pic16f73.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 // @@ -305,6 +305,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 @@ -314,6 +315,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -330,9 +332,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -349,12 +353,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -371,12 +377,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -393,6 +401,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -401,6 +410,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 { @@ -417,6 +427,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 @@ -425,6 +436,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -451,9 +463,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -470,6 +484,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -477,6 +492,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -493,7 +509,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -510,6 +528,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -517,6 +536,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -533,7 +553,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -550,7 +572,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -567,12 +591,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 */ // ----- PORTB bits -------------------- typedef union { @@ -589,6 +615,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -597,6 +624,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -613,6 +641,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 @@ -621,6 +650,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -667,6 +697,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -678,6 +709,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -694,6 +726,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -702,6 +735,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -768,6 +802,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -788,6 +823,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -804,6 +840,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 @@ -812,6 +849,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 { @@ -838,6 +876,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 +884,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -861,6 +901,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 +909,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 +926,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 */ // ----- TRISB bits -------------------- typedef union { @@ -906,6 +950,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -914,6 +959,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -930,6 +976,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 @@ -938,6 +985,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -974,6 +1022,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -984,5 +1033,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f737.h b/device/include/pic/pic16f737.h index 23fe3b5e..bf37da60 100644 --- a/device/include/pic/pic16f737.h +++ b/device/include/pic/pic16f737.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 // @@ -414,6 +414,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -424,6 +425,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -440,6 +442,7 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 @@ -448,6 +451,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define VCFG1 ADCON1_bits.VCFG1 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON2 bits -------------------- typedef union { @@ -464,9 +468,11 @@ typedef union { } __ADCON2_bits_t; extern volatile __ADCON2_bits_t __at(ADCON2_ADDR) ADCON2_bits; +#ifndef NO_BIT_DEFINES #define ACQT0 ADCON2_bits.ACQT0 #define ACQT1 ADCON2_bits.ACQT1 #define ACQT2 ADCON2_bits.ACQT2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -483,12 +489,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -505,12 +513,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CCP3CON bits -------------------- typedef union { @@ -527,12 +537,14 @@ typedef union { } __CCP3CON_bits_t; extern volatile __CCP3CON_bits_t __at(CCP3CON_ADDR) CCP3CON_bits; +#ifndef NO_BIT_DEFINES #define CCP3M0 CCP3CON_bits.CCP3M0 #define CCP3M1 CCP3CON_bits.CCP3M1 #define CCP3M2 CCP3CON_bits.CCP3M2 #define CCP3M3 CCP3CON_bits.CCP3M3 #define CCP3Y CCP3CON_bits.CCP3Y #define CCP3X CCP3CON_bits.CCP3X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -549,6 +561,7 @@ 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 @@ -557,6 +570,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -573,6 +587,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -580,6 +595,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -606,6 +622,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define INT0IF INTCON_bits.INT0IF @@ -618,6 +635,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- LVDCON bits -------------------- typedef union { @@ -634,12 +652,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDL3 LVDCON_bits.LVDL3 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -656,6 +676,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 @@ -664,6 +685,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -680,6 +702,7 @@ typedef union { } __OSCCON_bits_t; extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; +#ifndef NO_BIT_DEFINES #define SCS0 OSCCON_bits.SCS0 #define SCS1 OSCCON_bits.SCS1 #define IOFS OSCCON_bits.IOFS @@ -687,6 +710,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 { @@ -703,12 +727,14 @@ 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 #define TUN5 OSCTUNE_bits.TUN5 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -735,10 +761,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -755,6 +783,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -763,6 +792,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -779,12 +809,14 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define CCP3IE PIE2_bits.CCP3IE #define BCLIE PIE2_bits.BCLIE #define LVDIE PIE2_bits.LVDIE #define CMIE PIE2_bits.CMIE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -801,6 +833,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -809,6 +842,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -825,12 +859,14 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define CCP3IF PIR2_bits.CCP3IF #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF #define CMIF PIR2_bits.CMIF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -847,7 +883,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -864,12 +902,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 */ // ----- PORTB bits -------------------- typedef union { @@ -886,6 +926,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -894,6 +935,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -910,6 +952,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 @@ -918,6 +961,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 */ // ----- PORTD bits -------------------- typedef union { @@ -934,6 +978,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -942,6 +987,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -958,9 +1004,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -1007,6 +1055,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -1019,6 +1068,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1035,6 +1085,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1043,6 +1094,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -1059,6 +1111,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -1067,6 +1120,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1133,6 +1187,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1153,6 +1208,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1169,6 +1225,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 @@ -1177,6 +1234,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 { @@ -1213,6 +1271,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 @@ -1222,6 +1281,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1RUN T1CON_bits.T1RUN +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1238,6 +1298,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 @@ -1245,6 +1306,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 { @@ -1261,12 +1323,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1283,6 +1347,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1291,6 +1356,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1307,6 +1373,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 @@ -1315,6 +1382,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1331,6 +1399,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1339,6 +1408,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1355,6 +1425,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1363,6 +1434,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1399,6 +1471,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1409,6 +1482,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1435,11 +1509,13 @@ 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 SWDTE WDTCON_bits.SWDTE #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 diff --git a/device/include/pic/pic16f74.h b/device/include/pic/pic16f74.h index 4857492b..7974f18b 100644 --- a/device/include/pic/pic16f74.h +++ b/device/include/pic/pic16f74.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 // @@ -314,6 +314,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 @@ -323,6 +324,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -339,9 +341,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -358,12 +362,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -380,12 +386,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -402,6 +410,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -410,6 +419,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 { @@ -426,6 +436,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 @@ -434,6 +445,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -460,9 +472,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -479,6 +493,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -487,6 +502,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -503,7 +519,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -520,6 +538,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -528,6 +547,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -544,7 +564,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -561,7 +583,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -578,12 +602,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 */ // ----- PORTB bits -------------------- typedef union { @@ -600,6 +626,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -608,6 +635,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -624,6 +652,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 @@ -632,6 +661,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 */ // ----- PORTD bits -------------------- typedef union { @@ -648,6 +678,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -656,6 +687,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -672,9 +704,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -721,6 +755,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -732,6 +767,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -748,6 +784,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -756,6 +793,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -822,6 +860,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -842,6 +881,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -858,6 +898,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 @@ -866,6 +907,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 { @@ -892,6 +934,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 @@ -899,6 +942,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -915,6 +959,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 @@ -922,6 +967,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 { @@ -938,12 +984,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 */ // ----- TRISB bits -------------------- typedef union { @@ -960,6 +1008,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -968,6 +1017,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -984,6 +1034,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 @@ -992,6 +1043,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1008,6 +1060,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1016,6 +1069,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1032,6 +1086,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1039,6 +1094,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1075,6 +1131,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1085,5 +1142,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f76.h b/device/include/pic/pic16f76.h index 6b2b381b..ce30e3a1 100644 --- a/device/include/pic/pic16f76.h +++ b/device/include/pic/pic16f76.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 // @@ -304,6 +304,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 @@ -313,6 +314,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -329,9 +331,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -348,12 +352,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -370,12 +376,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -392,6 +400,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -400,6 +409,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 { @@ -416,6 +426,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 @@ -424,6 +435,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -450,9 +462,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -469,6 +483,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -476,6 +491,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -492,7 +508,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -509,6 +527,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -516,6 +535,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -532,7 +552,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -549,7 +571,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -566,12 +590,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 */ // ----- PORTB bits -------------------- typedef union { @@ -588,6 +614,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -596,6 +623,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -612,6 +640,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 @@ -620,6 +649,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -666,6 +696,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -677,6 +708,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -693,6 +725,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -701,6 +734,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -767,6 +801,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -787,6 +822,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -803,6 +839,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 @@ -811,6 +848,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 +875,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 @@ -844,6 +883,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -860,6 +900,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 @@ -867,6 +908,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 { @@ -883,12 +925,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 */ // ----- TRISB bits -------------------- typedef union { @@ -905,6 +949,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -913,6 +958,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -929,6 +975,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 @@ -937,6 +984,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -973,6 +1021,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -983,5 +1032,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f767.h b/device/include/pic/pic16f767.h index 2aab8cc1..7720888c 100644 --- a/device/include/pic/pic16f767.h +++ b/device/include/pic/pic16f767.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 // @@ -410,6 +410,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -420,6 +421,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -436,6 +438,7 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 @@ -444,6 +447,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define VCFG1 ADCON1_bits.VCFG1 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON2 bits -------------------- typedef union { @@ -460,9 +464,11 @@ typedef union { } __ADCON2_bits_t; extern volatile __ADCON2_bits_t __at(ADCON2_ADDR) ADCON2_bits; +#ifndef NO_BIT_DEFINES #define ACQT0 ADCON2_bits.ACQT0 #define ACQT1 ADCON2_bits.ACQT1 #define ACQT2 ADCON2_bits.ACQT2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -479,12 +485,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -501,12 +509,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CCP3CON bits -------------------- typedef union { @@ -523,12 +533,14 @@ typedef union { } __CCP3CON_bits_t; extern volatile __CCP3CON_bits_t __at(CCP3CON_ADDR) CCP3CON_bits; +#ifndef NO_BIT_DEFINES #define CCP3M0 CCP3CON_bits.CCP3M0 #define CCP3M1 CCP3CON_bits.CCP3M1 #define CCP3M2 CCP3CON_bits.CCP3M2 #define CCP3M3 CCP3CON_bits.CCP3M3 #define CCP3Y CCP3CON_bits.CCP3Y #define CCP3X CCP3CON_bits.CCP3X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -545,6 +557,7 @@ 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 @@ -553,6 +566,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -569,6 +583,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -576,6 +591,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -602,6 +618,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define INT0IF INTCON_bits.INT0IF @@ -614,6 +631,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- LVDCON bits -------------------- typedef union { @@ -630,12 +648,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDL3 LVDCON_bits.LVDL3 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -652,6 +672,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 @@ -660,6 +681,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -676,6 +698,7 @@ typedef union { } __OSCCON_bits_t; extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; +#ifndef NO_BIT_DEFINES #define SCS0 OSCCON_bits.SCS0 #define SCS1 OSCCON_bits.SCS1 #define IOFS OSCCON_bits.IOFS @@ -683,6 +706,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 { @@ -699,12 +723,14 @@ 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 #define TUN5 OSCTUNE_bits.TUN5 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -731,10 +757,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -751,6 +779,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -759,6 +788,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -775,12 +805,14 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define CCP3IE PIE2_bits.CCP3IE #define BCLIE PIE2_bits.BCLIE #define LVDIE PIE2_bits.LVDIE #define CMIE PIE2_bits.CMIE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -797,6 +829,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -805,6 +838,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -821,12 +855,14 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define CCP3IF PIR2_bits.CCP3IF #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF #define CMIF PIR2_bits.CMIF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -843,7 +879,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -860,12 +898,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 */ // ----- PORTB bits -------------------- typedef union { @@ -882,6 +922,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -890,6 +931,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -906,6 +948,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 @@ -914,6 +957,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 */ // ----- PORTE bits -------------------- typedef union { @@ -930,9 +974,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -979,6 +1025,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -991,6 +1038,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1007,6 +1055,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1015,6 +1064,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -1031,6 +1081,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -1039,6 +1090,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1105,6 +1157,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1125,6 +1178,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1141,6 +1195,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 @@ -1149,6 +1204,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 { @@ -1185,6 +1241,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 @@ -1194,6 +1251,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1RUN T1CON_bits.T1RUN +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1210,6 +1268,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 @@ -1217,6 +1276,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 { @@ -1233,12 +1293,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1255,6 +1317,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1263,6 +1326,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1279,6 +1343,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 @@ -1287,6 +1352,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 */ // ----- TRISE bits -------------------- typedef union { @@ -1303,6 +1369,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1311,6 +1378,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1347,6 +1415,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1357,6 +1426,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1383,11 +1453,13 @@ 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 SWDTE WDTCON_bits.SWDTE #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 diff --git a/device/include/pic/pic16f77.h b/device/include/pic/pic16f77.h index 56911c48..46622f2a 100644 --- a/device/include/pic/pic16f77.h +++ b/device/include/pic/pic16f77.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 // @@ -314,6 +314,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 @@ -323,6 +324,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -339,9 +341,11 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -358,12 +362,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -380,12 +386,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -402,6 +410,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -410,6 +419,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 { @@ -426,6 +436,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 @@ -434,6 +445,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -460,9 +472,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -479,6 +493,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -487,6 +502,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -503,7 +519,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -520,6 +538,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -528,6 +547,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -544,7 +564,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -561,7 +583,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -578,12 +602,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 */ // ----- PORTB bits -------------------- typedef union { @@ -600,6 +626,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -608,6 +635,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -624,6 +652,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 @@ -632,6 +661,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 */ // ----- PORTD bits -------------------- typedef union { @@ -648,6 +678,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -656,6 +687,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -672,9 +704,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -721,6 +755,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -732,6 +767,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -748,6 +784,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -756,6 +793,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -822,6 +860,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -842,6 +881,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -858,6 +898,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 @@ -866,6 +907,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 { @@ -892,6 +934,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 @@ -899,6 +942,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -915,6 +959,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 @@ -922,6 +967,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 { @@ -938,12 +984,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 */ // ----- TRISB bits -------------------- typedef union { @@ -960,6 +1008,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -968,6 +1017,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -984,6 +1034,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 @@ -992,6 +1043,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1008,6 +1060,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1016,6 +1069,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1032,6 +1086,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1039,6 +1094,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1075,6 +1131,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1085,5 +1142,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f777.h b/device/include/pic/pic16f777.h index 294d73b0..dac5d557 100644 --- a/device/include/pic/pic16f777.h +++ b/device/include/pic/pic16f777.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 // @@ -413,6 +413,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 CHS3 ADCON0_bits.CHS3 #define GO ADCON0_bits.GO @@ -423,6 +424,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -439,6 +441,7 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 @@ -447,6 +450,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define VCFG1 ADCON1_bits.VCFG1 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON2 bits -------------------- typedef union { @@ -463,9 +467,11 @@ typedef union { } __ADCON2_bits_t; extern volatile __ADCON2_bits_t __at(ADCON2_ADDR) ADCON2_bits; +#ifndef NO_BIT_DEFINES #define ACQT0 ADCON2_bits.ACQT0 #define ACQT1 ADCON2_bits.ACQT1 #define ACQT2 ADCON2_bits.ACQT2 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -482,12 +488,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -504,12 +512,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CCP3CON bits -------------------- typedef union { @@ -526,12 +536,14 @@ typedef union { } __CCP3CON_bits_t; extern volatile __CCP3CON_bits_t __at(CCP3CON_ADDR) CCP3CON_bits; +#ifndef NO_BIT_DEFINES #define CCP3M0 CCP3CON_bits.CCP3M0 #define CCP3M1 CCP3CON_bits.CCP3M1 #define CCP3M2 CCP3CON_bits.CCP3M2 #define CCP3M3 CCP3CON_bits.CCP3M3 #define CCP3Y CCP3CON_bits.CCP3Y #define CCP3X CCP3CON_bits.CCP3X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -548,6 +560,7 @@ 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 @@ -556,6 +569,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -572,6 +586,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -579,6 +594,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -605,6 +621,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define INT0IF INTCON_bits.INT0IF @@ -617,6 +634,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- LVDCON bits -------------------- typedef union { @@ -633,12 +651,14 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDL3 LVDCON_bits.LVDL3 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -655,6 +675,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 @@ -663,6 +684,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -679,6 +701,7 @@ typedef union { } __OSCCON_bits_t; extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; +#ifndef NO_BIT_DEFINES #define SCS0 OSCCON_bits.SCS0 #define SCS1 OSCCON_bits.SCS1 #define IOFS OSCCON_bits.IOFS @@ -686,6 +709,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 { @@ -702,12 +726,14 @@ 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 #define TUN5 OSCTUNE_bits.TUN5 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -734,10 +760,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -754,6 +782,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -762,6 +791,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -778,12 +808,14 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define CCP3IE PIE2_bits.CCP3IE #define BCLIE PIE2_bits.BCLIE #define LVDIE PIE2_bits.LVDIE #define CMIE PIE2_bits.CMIE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -800,6 +832,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -808,6 +841,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -824,12 +858,14 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define CCP3IF PIR2_bits.CCP3IF #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF #define CMIF PIR2_bits.CMIF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PMCON1 bits -------------------- typedef union { @@ -846,7 +882,9 @@ typedef union { } __PMCON1_bits_t; extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +#ifndef NO_BIT_DEFINES #define RD PMCON1_bits.RD +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -863,12 +901,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 */ // ----- PORTB bits -------------------- typedef union { @@ -885,6 +925,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -893,6 +934,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -909,6 +951,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 @@ -917,6 +960,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 */ // ----- PORTD bits -------------------- typedef union { @@ -933,6 +977,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -941,6 +986,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -957,9 +1003,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -1006,6 +1054,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -1018,6 +1067,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1034,6 +1084,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1042,6 +1093,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -1058,6 +1110,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -1066,6 +1119,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1132,6 +1186,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1152,6 +1207,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1168,6 +1224,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 @@ -1176,6 +1233,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 { @@ -1212,6 +1270,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 @@ -1221,6 +1280,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1RUN T1CON_bits.T1RUN +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1237,6 +1297,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 @@ -1244,6 +1305,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 { @@ -1260,12 +1322,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1282,6 +1346,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1290,6 +1355,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1306,6 +1372,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 @@ -1314,6 +1381,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1330,6 +1398,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1338,6 +1407,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1354,6 +1424,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1362,6 +1433,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1398,6 +1470,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1408,6 +1481,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1434,11 +1508,13 @@ 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 SWDTE WDTCON_bits.SWDTE #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 diff --git a/device/include/pic/pic16f785.h b/device/include/pic/pic16f785.h index feffba4c..28beb839 100644 --- a/device/include/pic/pic16f785.h +++ b/device/include/pic/pic16f785.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 // @@ -390,6 +390,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 @@ -400,6 +401,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS3 ADCON0_bits.CHS3 #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -416,9 +418,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 */ // ----- ANSEL1 bits -------------------- typedef union { @@ -435,10 +439,12 @@ typedef union { } __ANSEL1_bits_t; extern volatile __ANSEL1_bits_t __at(ANSEL1_ADDR) ANSEL1_bits; +#ifndef NO_BIT_DEFINES #define ANS8 ANSEL1_bits.ANS8 #define ANS9 ANSEL1_bits.ANS9 #define ANS10 ANSEL1_bits.ANS10 #define ANS11 ANSEL1_bits.ANS11 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -455,12 +461,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define DC1B0 CCP1CON_bits.DC1B0 #define DC1B1 CCP1CON_bits.DC1B1 +#endif /* NO_BIT_DEFINES */ // ----- CM1CON0 bits -------------------- typedef union { @@ -477,6 +485,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -485,6 +494,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -501,6 +511,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -509,6 +520,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -535,11 +547,13 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define T1GSS CM2CON1_bits.T1GSS #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT #define OPAON CM2CON1_bits.OPAON +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -556,10 +570,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 { @@ -576,6 +592,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 @@ -584,6 +601,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 { @@ -600,12 +618,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 { @@ -622,12 +642,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 { @@ -644,6 +666,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 @@ -652,6 +675,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 { @@ -668,6 +692,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 @@ -675,6 +700,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 { @@ -701,6 +727,7 @@ 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 ANS0 OSCTUNE_bits.ANS0 #define TUN1 OSCTUNE_bits.TUN1 @@ -714,6 +741,7 @@ extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define ANS5 OSCTUNE_bits.ANS5 #define ANS6 OSCTUNE_bits.ANS6 #define ANS7 OSCTUNE_bits.ANS7 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -740,11 +768,13 @@ 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_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBODEN PCON_bits.SBODEN #define SBOREN PCON_bits.SBOREN +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -771,6 +801,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 @@ -781,6 +812,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 { @@ -807,6 +839,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 @@ -817,6 +850,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 { @@ -833,12 +867,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 */ // ----- PORTB bits -------------------- typedef union { @@ -855,6 +891,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -863,6 +900,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -879,6 +917,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 @@ -887,6 +926,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 */ // ----- PWMCLK bits -------------------- typedef union { @@ -913,6 +953,7 @@ typedef union { } __PWMCLK_bits_t; extern volatile __PWMCLK_bits_t __at(PWMCLK_ADDR) PWMCLK_bits; +#ifndef NO_BIT_DEFINES #define PER0 PWMCLK_bits.PER0 #define PH0 PWMCLK_bits.PH0 #define PER1 PWMCLK_bits.PER1 @@ -929,6 +970,7 @@ extern volatile __PWMCLK_bits_t __at(PWMCLK_ADDR) PWMCLK_bits; #define C2EN PWMCLK_bits.C2EN #define PWMASE PWMCLK_bits.PWMASE #define POL PWMCLK_bits.POL +#endif /* NO_BIT_DEFINES */ // ----- PWMCON0 bits -------------------- typedef union { @@ -945,6 +987,7 @@ typedef union { } __PWMCON0_bits_t; extern volatile __PWMCON0_bits_t __at(PWMCON0_ADDR) PWMCON0_bits; +#ifndef NO_BIT_DEFINES #define PH1EN PWMCON0_bits.PH1EN #define PH2EN PWMCON0_bits.PH2EN #define SYNC0 PWMCON0_bits.SYNC0 @@ -953,6 +996,7 @@ extern volatile __PWMCON0_bits_t __at(PWMCON0_ADDR) PWMCON0_bits; #define BLANK2 PWMCON0_bits.BLANK2 #define PASEN PWMCON0_bits.PASEN #define PRSEN PWMCON0_bits.PRSEN +#endif /* NO_BIT_DEFINES */ // ----- PWMCON1 bits -------------------- typedef union { @@ -969,6 +1013,7 @@ typedef union { } __PWMCON1_bits_t; extern volatile __PWMCON1_bits_t __at(PWMCON1_ADDR) PWMCON1_bits; +#ifndef NO_BIT_DEFINES #define CMDLY0 PWMCON1_bits.CMDLY0 #define CMDLY1 PWMCON1_bits.CMDLY1 #define CMDLY2 PWMCON1_bits.CMDLY2 @@ -976,6 +1021,7 @@ extern volatile __PWMCON1_bits_t __at(PWMCON1_ADDR) PWMCON1_bits; #define CMDLY4 PWMCON1_bits.CMDLY4 #define COMOD0 PWMCON1_bits.COMOD0 #define COMOD1 PWMCON1_bits.COMOD1 +#endif /* NO_BIT_DEFINES */ // ----- REFCON bits -------------------- typedef union { @@ -992,11 +1038,13 @@ typedef union { } __REFCON_bits_t; extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; +#ifndef NO_BIT_DEFINES #define CVROE REFCON_bits.CVROE #define VROE REFCON_bits.VROE #define VREN REFCON_bits.VREN #define VRBB REFCON_bits.VRBB #define BGST REFCON_bits.BGST +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1013,6 +1061,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 @@ -1021,6 +1070,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 { @@ -1047,6 +1097,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 @@ -1056,6 +1107,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define TMR1GE T1CON_bits.TMR1GE #define T1GE T1CON_bits.T1GE #define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1072,6 +1124,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 @@ -1079,6 +1132,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 { @@ -1095,12 +1149,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1117,6 +1173,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1125,6 +1182,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1141,6 +1199,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 @@ -1149,6 +1208,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 { @@ -1165,6 +1225,7 @@ 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 @@ -1172,6 +1233,7 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define C2VREN VRCON_bits.C2VREN #define C1VREN VRCON_bits.C1VREN +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1188,11 +1250,13 @@ 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 */ // ----- WPUA bits -------------------- typedef union { @@ -1209,11 +1273,13 @@ typedef union { } __WPUA_bits_t; extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; +#ifndef NO_BIT_DEFINES #define WPUA0 WPUA_bits.WPUA0 #define WPUA1 WPUA_bits.WPUA1 #define WPUA2 WPUA_bits.WPUA2 #define WPUA3 WPUA_bits.WPUA3 #define WPUA4 WPUA_bits.WPUA4 #define WPUA5 WPUA_bits.WPUA5 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f818.h b/device/include/pic/pic16f818.h index 6eefb35b..808c9586 100644 --- a/device/include/pic/pic16f818.h +++ b/device/include/pic/pic16f818.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 // @@ -308,6 +308,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 @@ -317,6 +318,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -333,12 +335,14 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -355,12 +359,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -377,12 +383,14 @@ 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 #define FREE EECON1_bits.FREE #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -399,6 +407,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define TMR0IF INTCON_bits.TMR0IF @@ -407,6 +416,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -423,6 +433,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 @@ -431,6 +442,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -447,10 +459,12 @@ typedef union { } __OSCCON_bits_t; extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; +#ifndef NO_BIT_DEFINES #define IOFS OSCCON_bits.IOFS #define IRCF0 OSCCON_bits.IRCF0 #define IRCF1 OSCCON_bits.IRCF1 #define IRCF2 OSCCON_bits.IRCF2 +#endif /* NO_BIT_DEFINES */ // ----- OSCTUNE bits -------------------- typedef union { @@ -467,12 +481,14 @@ 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 #define TUN5 OSCTUNE_bits.TUN5 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -499,9 +515,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -518,11 +536,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -539,7 +559,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -556,11 +578,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -577,7 +601,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -594,12 +620,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 */ // ----- PORTB bits -------------------- typedef union { @@ -616,6 +644,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -624,6 +653,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -640,6 +670,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -648,6 +679,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -714,6 +746,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -734,6 +767,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -750,6 +784,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 @@ -758,6 +793,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 { @@ -784,6 +820,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 @@ -791,6 +828,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -807,6 +845,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 @@ -814,6 +853,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 { @@ -830,12 +870,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 */ // ----- TRISB bits -------------------- typedef union { @@ -852,6 +894,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -860,5 +903,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f819.h b/device/include/pic/pic16f819.h index 59e09306..071d8dde 100644 --- a/device/include/pic/pic16f819.h +++ b/device/include/pic/pic16f819.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 // @@ -309,6 +309,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 @@ -318,6 +319,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -334,12 +336,14 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -356,12 +360,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -378,12 +384,14 @@ 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 #define FREE EECON1_bits.FREE #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -400,6 +408,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define TMR0IF INTCON_bits.TMR0IF @@ -408,6 +417,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -424,6 +434,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 @@ -432,6 +443,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -448,10 +460,12 @@ typedef union { } __OSCCON_bits_t; extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; +#ifndef NO_BIT_DEFINES #define IOFS OSCCON_bits.IOFS #define IRCF0 OSCCON_bits.IRCF0 #define IRCF1 OSCCON_bits.IRCF1 #define IRCF2 OSCCON_bits.IRCF2 +#endif /* NO_BIT_DEFINES */ // ----- OSCTUNE bits -------------------- typedef union { @@ -468,12 +482,14 @@ 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 #define TUN5 OSCTUNE_bits.TUN5 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -500,9 +516,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -519,11 +537,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -540,7 +560,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -557,11 +579,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -578,7 +602,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -595,12 +621,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 */ // ----- PORTB bits -------------------- typedef union { @@ -617,6 +645,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -625,6 +654,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -641,6 +671,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -649,6 +680,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -715,6 +747,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -735,6 +768,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -751,6 +785,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 @@ -759,6 +794,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 { @@ -785,6 +821,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 @@ -792,6 +829,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -808,6 +846,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 @@ -815,6 +854,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 { @@ -831,12 +871,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 */ // ----- TRISB bits -------------------- typedef union { @@ -853,6 +895,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -861,5 +904,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f84.h b/device/include/pic/pic16f84.h index b92918dd..984096c6 100644 --- a/device/include/pic/pic16f84.h +++ b/device/include/pic/pic16f84.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 // @@ -171,11 +171,13 @@ 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 #define EEIF EECON1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -192,6 +194,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -200,6 +203,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define T0IE INTCON_bits.T0IE #define EEIE INTCON_bits.EEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -216,6 +220,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 @@ -224,6 +229,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -240,12 +246,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 */ // ----- PORTB bits -------------------- typedef union { @@ -262,6 +270,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -270,6 +279,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -286,6 +296,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 @@ -294,6 +305,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 */ // ----- TRISA bits -------------------- typedef union { @@ -310,12 +322,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 */ // ----- TRISB bits -------------------- typedef union { @@ -332,6 +346,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -340,5 +355,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f84a.h b/device/include/pic/pic16f84a.h index eea59b60..3ddb87e5 100644 --- a/device/include/pic/pic16f84a.h +++ b/device/include/pic/pic16f84a.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 // @@ -169,11 +169,13 @@ 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 #define EEIF EECON1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -190,6 +192,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -198,6 +201,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define T0IE INTCON_bits.T0IE #define EEIE INTCON_bits.EEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -214,6 +218,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 @@ -222,6 +227,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -238,12 +244,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 */ // ----- PORTB bits -------------------- typedef union { @@ -260,6 +268,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -268,6 +277,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -284,6 +294,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 @@ -292,6 +303,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 */ // ----- TRISA bits -------------------- typedef union { @@ -308,12 +320,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 */ // ----- TRISB bits -------------------- typedef union { @@ -330,6 +344,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -338,5 +353,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f87.h b/device/include/pic/pic16f87.h index c9462acf..002305f3 100644 --- a/device/include/pic/pic16f87.h +++ b/device/include/pic/pic16f87.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 // @@ -318,12 +318,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -340,6 +342,7 @@ 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 @@ -348,6 +351,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -364,6 +368,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -371,6 +376,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -387,12 +393,14 @@ 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 #define FREE EECON1_bits.FREE #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -409,6 +417,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define TMR0IF INTCON_bits.TMR0IF @@ -417,6 +426,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -433,6 +443,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 @@ -441,6 +452,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -457,6 +469,7 @@ typedef union { } __OSCCON_bits_t; extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; +#ifndef NO_BIT_DEFINES #define SCS0 OSCCON_bits.SCS0 #define SCS1 OSCCON_bits.SCS1 #define IOFS OSCCON_bits.IOFS @@ -464,6 +477,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 { @@ -480,12 +494,14 @@ 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 #define TUN5 OSCTUNE_bits.TUN5 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -512,9 +528,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -531,12 +549,14 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -553,9 +573,11 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE #define CMIE PIE2_bits.CMIE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -572,12 +594,14 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -594,9 +618,11 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -613,12 +639,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 */ // ----- PORTB bits -------------------- typedef union { @@ -635,6 +663,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -643,6 +672,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -689,6 +719,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -701,6 +732,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -717,6 +749,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -725,6 +758,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -791,6 +825,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -811,6 +846,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -827,6 +863,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 @@ -835,6 +872,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 { @@ -861,6 +899,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 @@ -869,6 +908,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1RUN T1CON_bits.T1RUN +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -885,6 +925,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 @@ -892,6 +933,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 { @@ -908,12 +950,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 */ // ----- TRISB bits -------------------- typedef union { @@ -930,6 +974,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -938,6 +983,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -974,6 +1020,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -984,6 +1031,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1010,11 +1058,13 @@ 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 SWDTE WDTCON_bits.SWDTE #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 diff --git a/device/include/pic/pic16f870.h b/device/include/pic/pic16f870.h index e0b93a93..e58ef983 100644 --- a/device/include/pic/pic16f870.h +++ b/device/include/pic/pic16f870.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 // @@ -298,6 +298,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 @@ -307,6 +308,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -323,11 +325,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -344,12 +348,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -366,11 +372,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -387,6 +395,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -395,6 +404,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 { @@ -411,6 +421,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 @@ -419,6 +430,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -445,9 +457,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -464,12 +478,14 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -486,7 +502,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -503,12 +521,14 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -525,7 +545,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -542,12 +564,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 */ // ----- PORTB bits -------------------- typedef union { @@ -564,6 +588,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -572,6 +597,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -588,6 +614,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 @@ -596,6 +623,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -642,6 +670,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -654,6 +683,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -670,6 +700,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 @@ -678,6 +709,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 { @@ -714,6 +746,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 @@ -722,6 +755,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -738,6 +772,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 @@ -745,6 +780,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 { @@ -761,12 +797,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 */ // ----- TRISB bits -------------------- typedef union { @@ -783,6 +821,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -791,6 +830,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -807,6 +847,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 @@ -815,6 +856,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -851,6 +893,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -861,5 +904,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f871.h b/device/include/pic/pic16f871.h index d58d181b..454cbdb7 100644 --- a/device/include/pic/pic16f871.h +++ b/device/include/pic/pic16f871.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 // @@ -309,6 +309,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 @@ -318,6 +319,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -334,11 +336,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -355,12 +359,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -377,11 +383,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -398,6 +406,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -406,6 +415,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 { @@ -422,6 +432,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 @@ -430,6 +441,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -456,9 +468,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -475,6 +489,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -482,6 +497,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -498,7 +514,9 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -515,6 +533,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -522,6 +541,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -538,7 +558,9 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -555,12 +577,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 */ // ----- PORTB bits -------------------- typedef union { @@ -577,6 +601,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -585,6 +610,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -601,6 +627,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 @@ -609,6 +636,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 */ // ----- PORTD bits -------------------- typedef union { @@ -625,6 +653,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -633,6 +662,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -649,9 +679,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -698,6 +730,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -710,6 +743,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -726,6 +760,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 @@ -734,6 +769,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 { @@ -770,6 +806,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 @@ -778,6 +815,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -794,6 +832,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 @@ -801,6 +840,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 { @@ -817,12 +857,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 */ // ----- TRISB bits -------------------- typedef union { @@ -839,6 +881,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -847,6 +890,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -863,6 +907,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 @@ -871,6 +916,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 */ // ----- TRISD bits -------------------- typedef union { @@ -887,6 +933,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -895,6 +942,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -911,6 +959,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -918,6 +967,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -954,6 +1004,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -964,5 +1015,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f872.h b/device/include/pic/pic16f872.h index 7ad8c32c..6b5a227d 100644 --- a/device/include/pic/pic16f872.h +++ b/device/include/pic/pic16f872.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 // @@ -305,6 +305,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 @@ -314,6 +315,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -330,11 +332,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -351,12 +355,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -373,11 +379,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -404,6 +412,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -414,6 +423,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -430,6 +440,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 @@ -438,6 +449,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -464,9 +476,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -483,11 +497,13 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -504,8 +520,10 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -522,11 +540,13 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -543,8 +563,10 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -561,12 +583,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 */ // ----- PORTB bits -------------------- typedef union { @@ -583,6 +607,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -591,6 +616,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -607,6 +633,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 @@ -615,6 +642,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 */ // ----- SSPCON bits -------------------- typedef union { @@ -631,6 +659,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -639,6 +668,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -655,6 +685,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -663,6 +694,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -729,6 +761,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -749,6 +782,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -765,6 +799,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 @@ -773,6 +808,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 { @@ -809,6 +845,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 @@ -817,6 +854,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -833,6 +871,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 @@ -840,6 +879,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 { @@ -856,12 +896,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 */ // ----- TRISB bits -------------------- typedef union { @@ -878,6 +920,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -886,6 +929,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -902,6 +946,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 @@ -910,5 +955,6 @@ 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 */ #endif diff --git a/device/include/pic/pic16f873.h b/device/include/pic/pic16f873.h index 17ad6e3d..ef69e4b7 100644 --- a/device/include/pic/pic16f873.h +++ b/device/include/pic/pic16f873.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 // @@ -325,6 +325,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 @@ -334,6 +335,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -350,11 +352,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -371,12 +375,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -393,12 +399,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -415,11 +423,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -436,6 +446,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -444,6 +455,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 { @@ -460,6 +472,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 @@ -468,6 +481,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -494,9 +508,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -513,6 +529,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -520,6 +537,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -536,9 +554,11 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -555,6 +575,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -562,6 +583,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -578,10 +600,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -598,12 +622,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 */ // ----- PORTB bits -------------------- typedef union { @@ -620,6 +646,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -628,6 +655,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -644,6 +672,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 @@ -652,6 +681,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -698,6 +728,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -710,6 +741,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -726,6 +758,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -734,6 +767,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -750,6 +784,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -758,6 +793,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -824,6 +860,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -844,6 +881,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -860,6 +898,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 @@ -868,6 +907,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 { @@ -904,6 +944,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 @@ -912,6 +953,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -928,6 +970,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 @@ -935,6 +978,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 { @@ -951,12 +995,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 */ // ----- TRISB bits -------------------- typedef union { @@ -973,6 +1019,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -981,6 +1028,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -997,6 +1045,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 @@ -1005,6 +1054,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -1041,6 +1091,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1051,5 +1102,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f873a.h b/device/include/pic/pic16f873a.h index 710e2375..db386a4c 100644 --- a/device/include/pic/pic16f873a.h +++ b/device/include/pic/pic16f873a.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 // @@ -334,6 +334,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 @@ -343,6 +344,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -359,12 +361,14 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -381,12 +385,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -403,12 +409,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -425,6 +433,7 @@ 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 @@ -433,6 +442,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -449,6 +459,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -456,6 +467,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -472,11 +484,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -503,6 +517,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -513,6 +528,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -529,6 +545,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 @@ -537,6 +554,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -563,9 +581,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -582,6 +602,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -589,6 +610,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -605,10 +627,12 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE #define CMIE PIE2_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -625,6 +649,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -632,6 +657,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -648,10 +674,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -668,12 +696,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 */ // ----- PORTB bits -------------------- typedef union { @@ -690,6 +720,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -698,6 +729,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -714,6 +746,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 @@ -722,6 +755,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -768,6 +802,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -780,6 +815,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -796,6 +832,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -804,6 +841,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -820,6 +858,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -828,6 +867,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -894,6 +934,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -914,6 +955,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -930,6 +972,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 @@ -938,6 +981,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 { @@ -974,6 +1018,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 @@ -982,6 +1027,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -998,6 +1044,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 @@ -1005,6 +1052,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 { @@ -1021,12 +1069,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1043,6 +1093,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1051,6 +1102,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1067,6 +1119,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 @@ -1075,6 +1128,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -1111,6 +1165,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1121,5 +1176,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f874.h b/device/include/pic/pic16f874.h index ea11a7c0..4463a81b 100644 --- a/device/include/pic/pic16f874.h +++ b/device/include/pic/pic16f874.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 ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -362,11 +364,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -383,12 +387,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -405,12 +411,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -427,11 +435,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -448,6 +458,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -456,6 +467,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 { @@ -472,6 +484,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 @@ -480,6 +493,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -506,9 +520,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -525,6 +541,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -533,6 +550,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -549,9 +567,11 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -568,6 +588,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -576,6 +597,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -592,9 +614,11 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -611,12 +635,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 */ // ----- PORTB bits -------------------- typedef union { @@ -633,6 +659,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -641,6 +668,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -657,6 +685,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 @@ -665,6 +694,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 */ // ----- PORTD bits -------------------- typedef union { @@ -681,6 +711,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -689,6 +720,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -705,9 +737,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -754,6 +788,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -766,6 +801,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -782,6 +818,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -790,6 +827,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -806,6 +844,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -814,6 +853,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -880,6 +920,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -900,6 +941,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -916,6 +958,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 @@ -924,6 +967,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 { @@ -960,6 +1004,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 @@ -968,6 +1013,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -984,6 +1030,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 @@ -991,6 +1038,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 { @@ -1007,12 +1055,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1029,6 +1079,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1037,6 +1088,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1053,6 +1105,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 @@ -1061,6 +1114,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1077,6 +1131,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1085,6 +1140,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1101,6 +1157,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1108,6 +1165,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1144,6 +1202,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1154,5 +1213,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f874a.h b/device/include/pic/pic16f874a.h index 47b19f9c..794aef22 100644 --- a/device/include/pic/pic16f874a.h +++ b/device/include/pic/pic16f874a.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 // @@ -345,6 +345,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 @@ -354,6 +355,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -370,12 +372,14 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -392,12 +396,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -414,12 +420,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -436,6 +444,7 @@ 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 @@ -444,6 +453,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -460,6 +470,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -467,6 +478,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -483,11 +495,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -514,6 +528,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -524,6 +539,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -540,6 +556,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 @@ -548,6 +565,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -574,9 +592,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -593,6 +613,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -601,6 +622,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -617,10 +639,12 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE #define CMIE PIE2_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -637,6 +661,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -645,6 +670,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -661,10 +687,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -681,12 +709,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 */ // ----- PORTB bits -------------------- typedef union { @@ -703,6 +733,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -711,6 +742,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -727,6 +759,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 @@ -735,6 +768,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 */ // ----- PORTD bits -------------------- typedef union { @@ -751,6 +785,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -759,6 +794,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -775,9 +811,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -824,6 +862,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -836,6 +875,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -852,6 +892,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -860,6 +901,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -876,6 +918,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -884,6 +927,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -950,6 +994,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -970,6 +1015,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -986,6 +1032,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 @@ -994,6 +1041,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 { @@ -1030,6 +1078,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 @@ -1038,6 +1087,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1054,6 +1104,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 @@ -1061,6 +1112,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 { @@ -1077,12 +1129,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1099,6 +1153,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1107,6 +1162,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1123,6 +1179,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 @@ -1131,6 +1188,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1147,6 +1205,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1155,6 +1214,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1171,6 +1231,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1178,6 +1239,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1214,6 +1276,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1224,5 +1287,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f876.h b/device/include/pic/pic16f876.h index 50e86d75..b52a3a1c 100644 --- a/device/include/pic/pic16f876.h +++ b/device/include/pic/pic16f876.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 // @@ -327,6 +327,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 @@ -336,6 +337,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -352,11 +354,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -373,12 +377,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -395,12 +401,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -417,11 +425,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -438,6 +448,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -446,6 +457,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 { @@ -462,6 +474,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 @@ -470,6 +483,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -496,9 +510,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -515,6 +531,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -522,6 +539,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -538,9 +556,11 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -557,6 +577,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -564,6 +585,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -580,9 +602,11 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -599,12 +623,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 */ // ----- PORTB bits -------------------- typedef union { @@ -621,6 +647,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -629,6 +656,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -645,6 +673,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 @@ -653,6 +682,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -699,6 +729,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -711,6 +742,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -727,6 +759,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -735,6 +768,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -751,6 +785,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -759,6 +794,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -825,6 +861,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -845,6 +882,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -861,6 +899,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 @@ -869,6 +908,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 { @@ -905,6 +945,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 @@ -913,6 +954,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -929,6 +971,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 @@ -936,6 +979,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 { @@ -952,12 +996,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 */ // ----- TRISB bits -------------------- typedef union { @@ -974,6 +1020,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -982,6 +1029,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -998,6 +1046,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 @@ -1006,6 +1055,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -1042,6 +1092,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1052,5 +1103,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f876a.h b/device/include/pic/pic16f876a.h index de5c3e70..5b8c0a31 100644 --- a/device/include/pic/pic16f876a.h +++ b/device/include/pic/pic16f876a.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 // @@ -334,6 +334,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 @@ -343,6 +344,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -359,12 +361,14 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -381,12 +385,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -403,12 +409,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -425,6 +433,7 @@ 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 @@ -433,6 +442,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -449,6 +459,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -456,6 +467,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -472,11 +484,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -503,6 +517,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -513,6 +528,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -529,6 +545,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 @@ -537,6 +554,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -563,9 +581,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -582,6 +602,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -589,6 +610,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -605,10 +627,12 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE #define CMIE PIE2_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -625,6 +649,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -632,6 +657,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -648,10 +674,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -668,12 +696,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 */ // ----- PORTB bits -------------------- typedef union { @@ -690,6 +720,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -698,6 +729,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -714,6 +746,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 @@ -722,6 +755,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -768,6 +802,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -780,6 +815,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -796,6 +832,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -804,6 +841,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -820,6 +858,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -828,6 +867,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -894,6 +934,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -914,6 +955,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -930,6 +972,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 @@ -938,6 +981,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 { @@ -974,6 +1018,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 @@ -982,6 +1027,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -998,6 +1044,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 @@ -1005,6 +1052,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 { @@ -1021,12 +1069,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1043,6 +1093,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1051,6 +1102,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1067,6 +1119,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 @@ -1075,6 +1128,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 */ // ----- TXSTA bits -------------------- typedef union { @@ -1111,6 +1165,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1121,5 +1176,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f877.h b/device/include/pic/pic16f877.h index 6805f234..5c487e65 100644 --- a/device/include/pic/pic16f877.h +++ b/device/include/pic/pic16f877.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 // @@ -336,6 +336,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 @@ -345,6 +346,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -361,11 +363,13 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -382,12 +386,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -404,12 +410,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -426,11 +434,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -447,6 +457,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -455,6 +466,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 { @@ -471,6 +483,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 @@ -479,6 +492,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -505,9 +519,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -524,6 +540,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -532,6 +549,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -548,9 +566,11 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -567,6 +587,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -575,6 +596,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -591,9 +613,11 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -610,12 +634,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 */ // ----- PORTB bits -------------------- typedef union { @@ -632,6 +658,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -640,6 +667,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -656,6 +684,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 @@ -664,6 +693,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 */ // ----- PORTD bits -------------------- typedef union { @@ -680,6 +710,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -688,6 +719,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -704,9 +736,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -753,6 +787,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -765,6 +800,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -781,6 +817,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -789,6 +826,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -805,6 +843,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -813,6 +852,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -879,6 +919,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -899,6 +940,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -915,6 +957,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 @@ -923,6 +966,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 { @@ -959,6 +1003,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 @@ -967,6 +1012,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -983,6 +1029,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 @@ -990,6 +1037,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 { @@ -1006,12 +1054,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1028,6 +1078,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1036,6 +1087,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1052,6 +1104,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 @@ -1060,6 +1113,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1076,6 +1130,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1084,6 +1139,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1100,6 +1156,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1107,6 +1164,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1143,6 +1201,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1153,5 +1212,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f877a.h b/device/include/pic/pic16f877a.h index b100c1b0..d462c59f 100644 --- a/device/include/pic/pic16f877a.h +++ b/device/include/pic/pic16f877a.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 // @@ -345,6 +345,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 @@ -354,6 +355,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -370,12 +372,14 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define PCFG0 ADCON1_bits.PCFG0 #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -392,12 +396,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -414,12 +420,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -436,6 +444,7 @@ 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 @@ -444,6 +453,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -460,6 +470,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -467,6 +478,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -483,11 +495,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -514,6 +528,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -524,6 +539,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -540,6 +556,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 @@ -548,6 +565,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -574,9 +592,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -593,6 +613,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -601,6 +622,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define PSPIE PIE1_bits.PSPIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -617,10 +639,12 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define BCLIE PIE2_bits.BCLIE #define EEIE PIE2_bits.EEIE #define CMIE PIE2_bits.CMIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -637,6 +661,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -645,6 +670,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define PSPIF PIR1_bits.PSPIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -661,10 +687,12 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -681,12 +709,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 */ // ----- PORTB bits -------------------- typedef union { @@ -703,6 +733,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -711,6 +742,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -727,6 +759,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 @@ -735,6 +768,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 */ // ----- PORTD bits -------------------- typedef union { @@ -751,6 +785,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -759,6 +794,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -775,9 +811,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -824,6 +862,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -836,6 +875,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -852,6 +892,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -860,6 +901,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -876,6 +918,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -884,6 +927,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -950,6 +994,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -970,6 +1015,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -986,6 +1032,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 @@ -994,6 +1041,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 { @@ -1030,6 +1078,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 @@ -1038,6 +1087,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1054,6 +1104,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 @@ -1061,6 +1112,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 { @@ -1077,12 +1129,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1099,6 +1153,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1107,6 +1162,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1123,6 +1179,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 @@ -1131,6 +1188,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1147,6 +1205,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1155,6 +1214,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1171,6 +1231,7 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 @@ -1178,6 +1239,7 @@ extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; #define IBOV TRISE_bits.IBOV #define OBF TRISE_bits.OBF #define IBF TRISE_bits.IBF +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1214,6 +1276,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1224,5 +1287,6 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f88.h b/device/include/pic/pic16f88.h index 5acd3f1a..ec613fe3 100644 --- a/device/include/pic/pic16f88.h +++ b/device/include/pic/pic16f88.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 // @@ -349,6 +349,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 @@ -358,6 +359,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS2 ADCON0_bits.CHS2 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -374,10 +376,12 @@ typedef union { } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +#ifndef NO_BIT_DEFINES #define VCFG0 ADCON1_bits.VCFG0 #define VCFG1 ADCON1_bits.VCFG1 #define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -394,12 +398,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON bits -------------------- typedef union { @@ -416,6 +422,7 @@ 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 @@ -424,6 +431,7 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define C2INV CMCON_bits.C2INV #define C1OUT CMCON_bits.C1OUT #define C2OUT CMCON_bits.C2OUT +#endif /* NO_BIT_DEFINES */ // ----- CVRCON bits -------------------- typedef union { @@ -440,6 +448,7 @@ typedef union { } __CVRCON_bits_t; extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; +#ifndef NO_BIT_DEFINES #define CVR0 CVRCON_bits.CVR0 #define CVR1 CVRCON_bits.CVR1 #define CVR2 CVRCON_bits.CVR2 @@ -447,6 +456,7 @@ extern volatile __CVRCON_bits_t __at(CVRCON_ADDR) CVRCON_bits; #define CVRR CVRCON_bits.CVRR #define CVROE CVRCON_bits.CVROE #define CVREN CVRCON_bits.CVREN +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -463,12 +473,14 @@ 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 #define FREE EECON1_bits.FREE #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -485,6 +497,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define TMR0IF INTCON_bits.TMR0IF @@ -493,6 +506,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -509,6 +523,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 @@ -517,6 +532,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -533,6 +549,7 @@ typedef union { } __OSCCON_bits_t; extern volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; +#ifndef NO_BIT_DEFINES #define SCS0 OSCCON_bits.SCS0 #define SCS1 OSCCON_bits.SCS1 #define IOFS OSCCON_bits.IOFS @@ -540,6 +557,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 { @@ -556,12 +574,14 @@ 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 #define TUN5 OSCTUNE_bits.TUN5 +#endif /* NO_BIT_DEFINES */ // ----- PCON bits -------------------- typedef union { @@ -588,9 +608,11 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -607,6 +629,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -614,6 +637,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -630,9 +654,11 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define EEIE PIE2_bits.EEIE #define CMIE PIE2_bits.CMIE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -649,6 +675,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -656,6 +683,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -672,9 +700,11 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -691,12 +721,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 */ // ----- PORTB bits -------------------- typedef union { @@ -713,6 +745,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -721,6 +754,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -767,6 +801,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -779,6 +814,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -795,6 +831,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -803,6 +840,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -869,6 +907,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -889,6 +928,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -905,6 +945,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 @@ -913,6 +954,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 { @@ -939,6 +981,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 @@ -947,6 +990,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1RUN T1CON_bits.T1RUN +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -963,6 +1007,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 @@ -970,6 +1015,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 { @@ -986,12 +1032,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1008,6 +1056,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1016,6 +1065,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1052,6 +1102,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1062,6 +1113,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1088,11 +1140,13 @@ 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 SWDTE WDTCON_bits.SWDTE #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 diff --git a/device/include/pic/pic16f886.h b/device/include/pic/pic16f886.h index 7ed04f88..cc93e34f 100644 --- a/device/include/pic/pic16f886.h +++ b/device/include/pic/pic16f886.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 // @@ -69,6 +69,8 @@ #define SSPCON2_ADDR 0x0091 #define PR2_ADDR 0x0092 #define SSPADD_ADDR 0x0093 +#define SSPMSK_ADDR 0x0093 +#define MSK_ADDR 0x0093 #define SSPSTAT_ADDR 0x0094 #define WPUB_ADDR 0x0095 #define IOCB_ADDR 0x0096 @@ -86,6 +88,7 @@ #define CM2CON0_ADDR 0x0108 #define CM2CON1_ADDR 0x0109 #define EEDATA_ADDR 0x010C +#define EEDAT_ADDR 0x010C #define EEADR_ADDR 0x010D #define EEDATH_ADDR 0x010E #define EEADRH_ADDR 0x010F @@ -197,6 +200,8 @@ extern __sfr __at (OSCTUNE_ADDR) OSCTUNE; extern __sfr __at (SSPCON2_ADDR) SSPCON2; extern __sfr __at (PR2_ADDR) PR2; extern __sfr __at (SSPADD_ADDR) SSPADD; +extern __sfr __at (SSPMSK_ADDR) SSPMSK; +extern __sfr __at (MSK_ADDR) MSK; extern __sfr __at (SSPSTAT_ADDR) SSPSTAT; extern __sfr __at (WPUB_ADDR) WPUB; extern __sfr __at (IOCB_ADDR) IOCB; @@ -217,6 +222,7 @@ extern __sfr __at (CM2CON0_ADDR) CM2CON0; extern __sfr __at (CM2CON1_ADDR) CM2CON1; extern __sfr __at (EEDATA_ADDR) EEDATA; +extern __sfr __at (EEDAT_ADDR) EEDAT; extern __sfr __at (EEADR_ADDR) EEADR; extern __sfr __at (EEDATH_ADDR) EEDATH; extern __sfr __at (EEADRH_ADDR) EEADRH; @@ -374,6 +380,8 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- Configuration Word1 ------------------------------------------------ +#define _DEBUG_ON 0x1FFF +#define _DEBUG_OFF 0x3FFF #define _LVP_ON 0x3FFF #define _LVP_OFF 0x2FFF #define _FCMEN_ON 0x3FFF @@ -454,6 +462,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 @@ -464,6 +473,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS3 ADCON0_bits.CHS3 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -472,17 +482,19 @@ typedef union { unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char VCFG1:1; unsigned char VCFG0:1; + unsigned char VCFG1:1; unsigned char :1; unsigned char ADFM:1; }; } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; -#define VCFG1 ADCON1_bits.VCFG1 +#ifndef NO_BIT_DEFINES #define VCFG0 ADCON1_bits.VCFG0 +#define VCFG1 ADCON1_bits.VCFG1 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ANSEL bits -------------------- typedef union { @@ -499,11 +511,13 @@ 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 #define ANS3 ANSEL_bits.ANS3 #define ANS4 ANSEL_bits.ANS4 +#endif /* NO_BIT_DEFINES */ // ----- ANSELH bits -------------------- typedef union { @@ -520,12 +534,14 @@ typedef union { } __ANSELH_bits_t; extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; +#ifndef NO_BIT_DEFINES #define ANS8 ANSELH_bits.ANS8 #define ANS9 ANSELH_bits.ANS9 #define ANS10 ANSELH_bits.ANS10 #define ANS11 ANSELH_bits.ANS11 #define ANS12 ANSELH_bits.ANS12 #define ANS13 ANSELH_bits.ANS13 +#endif /* NO_BIT_DEFINES */ // ----- BAUDCTL bits -------------------- typedef union { @@ -542,12 +558,14 @@ typedef union { } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; +#ifndef NO_BIT_DEFINES #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -574,6 +592,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 @@ -584,6 +603,7 @@ extern volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; #define CCP1X CCP1CON_bits.CCP1X #define P1M0 CCP1CON_bits.P1M0 #define P1M1 CCP1CON_bits.P1M1 +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -610,6 +630,7 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 @@ -618,6 +639,7 @@ extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; #define DC2B0 CCP2CON_bits.DC2B0 #define CCP2X CCP2CON_bits.CCP2X #define DC2B1 CCP2CON_bits.DC2B1 +#endif /* NO_BIT_DEFINES */ // ----- CM1CON0 bits -------------------- typedef union { @@ -634,6 +656,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -641,6 +664,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -657,6 +681,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -664,6 +689,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -680,12 +706,14 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define T1GSS CM2CON1_bits.T1GSS #define C2RSEL CM2CON1_bits.C2RSEL #define C1RSEL CM2CON1_bits.C1RSEL #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT +#endif /* NO_BIT_DEFINES */ // ----- ECCPAS bits -------------------- typedef union { @@ -702,6 +730,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 @@ -710,6 +739,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 { @@ -726,11 +756,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -757,6 +789,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -767,6 +800,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- IOCB bits -------------------- typedef union { @@ -783,6 +817,7 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB0 IOCB_bits.IOCB0 #define IOCB1 IOCB_bits.IOCB1 #define IOCB2 IOCB_bits.IOCB2 @@ -791,6 +826,7 @@ extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -807,6 +843,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 @@ -815,6 +852,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -831,6 +869,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 @@ -838,6 +877,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 { @@ -854,11 +894,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 { @@ -885,11 +927,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -906,6 +950,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -913,6 +958,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -929,6 +975,7 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define ULPWUIE PIE2_bits.ULPWUIE #define BCLIE PIE2_bits.BCLIE @@ -936,6 +983,7 @@ extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -952,6 +1000,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -959,6 +1008,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -970,18 +1020,20 @@ typedef union { unsigned char EEIF:1; unsigned char C1IF:1; unsigned char C2IF:1; - unsigned char OSPIF:1; + unsigned char OSFIF:1; }; } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define ULPWUIF PIR2_bits.ULPWUIF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF -#define OSPIF PIR2_bits.OSPIF +#define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -998,12 +1050,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 */ // ----- PORTB bits -------------------- typedef union { @@ -1020,6 +1074,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -1028,6 +1083,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -1044,6 +1100,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 @@ -1052,6 +1109,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 */ // ----- PORTE bits -------------------- typedef union { @@ -1068,9 +1126,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- PSTRCON bits -------------------- typedef union { @@ -1087,11 +1147,13 @@ typedef union { } __PSTRCON_bits_t; extern volatile __PSTRCON_bits_t __at(PSTRCON_ADDR) PSTRCON_bits; +#ifndef NO_BIT_DEFINES #define STRA PSTRCON_bits.STRA #define STRB PSTRCON_bits.STRB #define STRC PSTRCON_bits.STRC #define STRD PSTRCON_bits.STRD #define STRSYNC PSTRCON_bits.STRSYNC +#endif /* NO_BIT_DEFINES */ // ----- PWM1CON bits -------------------- typedef union { @@ -1108,6 +1170,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 @@ -1116,6 +1179,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -1162,6 +1226,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -1174,6 +1239,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SPBRG bits -------------------- typedef union { @@ -1190,6 +1256,7 @@ typedef union { } __SPBRG_bits_t; extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; +#ifndef NO_BIT_DEFINES #define BRG0 SPBRG_bits.BRG0 #define BRG1 SPBRG_bits.BRG1 #define BRG2 SPBRG_bits.BRG2 @@ -1198,6 +1265,7 @@ extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; #define BRG5 SPBRG_bits.BRG5 #define BRG6 SPBRG_bits.BRG6 #define BRG7 SPBRG_bits.BRG7 +#endif /* NO_BIT_DEFINES */ // ----- SPBRGH bits -------------------- typedef union { @@ -1214,6 +1282,7 @@ typedef union { } __SPBRGH_bits_t; extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; +#ifndef NO_BIT_DEFINES #define BRG8 SPBRGH_bits.BRG8 #define BRG9 SPBRGH_bits.BRG9 #define BRG10 SPBRGH_bits.BRG10 @@ -1222,6 +1291,7 @@ extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; #define BRG13 SPBRGH_bits.BRG13 #define BRG14 SPBRGH_bits.BRG14 #define BRG15 SPBRGH_bits.BRG15 +#endif /* NO_BIT_DEFINES */ // ----- SRCON bits -------------------- typedef union { @@ -1238,6 +1308,7 @@ typedef union { } __SRCON_bits_t; extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; +#ifndef NO_BIT_DEFINES #define FVREN SRCON_bits.FVREN #define PULSR SRCON_bits.PULSR #define PULSS SRCON_bits.PULSS @@ -1245,6 +1316,7 @@ extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; #define C1SEN SRCON_bits.C1SEN #define SR0 SRCON_bits.SR0 #define SR1 SRCON_bits.SR1 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1261,6 +1333,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1269,6 +1342,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -1285,6 +1359,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -1293,6 +1368,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1359,6 +1435,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1379,6 +1456,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1395,6 +1473,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 @@ -1403,6 +1482,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 { @@ -1413,8 +1493,8 @@ typedef union { unsigned char T1OSCEN:1; unsigned char T1CKPS0:1; unsigned char T1CKPS1:1; - unsigned char :1; - unsigned char :1; + unsigned char TMR1GE:1; + unsigned char T1GINV:1; }; struct { unsigned char :1; @@ -1439,6 +1519,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 @@ -1447,6 +1528,9 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#define TMR1GE T1CON_bits.TMR1GE +#define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1463,6 +1547,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 @@ -1470,6 +1555,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 { @@ -1486,12 +1572,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1508,6 +1596,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1516,6 +1605,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1532,6 +1622,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 @@ -1540,6 +1631,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 */ // ----- TRISE bits -------------------- typedef union { @@ -1556,9 +1648,11 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1566,7 +1660,7 @@ typedef union { unsigned char TX9D:1; unsigned char TRMT:1; unsigned char BRGH:1; - unsigned char :1; + unsigned char SENDB:1; unsigned char SYNC:1; unsigned char TXEN:1; unsigned char TX9:1; @@ -1595,16 +1689,19 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH +#define SENDB TXSTA_bits.SENDB #define SYNC TXSTA_bits.SYNC #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -1621,6 +1718,7 @@ 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 @@ -1629,6 +1727,7 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1645,11 +1744,13 @@ 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 */ // ----- WPUB bits -------------------- typedef union { @@ -1666,6 +1767,7 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB0 WPUB_bits.WPUB0 #define WPUB1 WPUB_bits.WPUB1 #define WPUB2 WPUB_bits.WPUB2 @@ -1674,5 +1776,6 @@ extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f887.h b/device/include/pic/pic16f887.h index 3f6b398e..54442143 100644 --- a/device/include/pic/pic16f887.h +++ b/device/include/pic/pic16f887.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 // @@ -71,6 +71,8 @@ #define SSPCON2_ADDR 0x0091 #define PR2_ADDR 0x0092 #define SSPADD_ADDR 0x0093 +#define SSPMSK_ADDR 0x0093 +#define MSK_ADDR 0x0093 #define SSPSTAT_ADDR 0x0094 #define WPUB_ADDR 0x0095 #define IOCB_ADDR 0x0096 @@ -88,6 +90,7 @@ #define CM2CON0_ADDR 0x0108 #define CM2CON1_ADDR 0x0109 #define EEDATA_ADDR 0x010C +#define EEDAT_ADDR 0x010C #define EEADR_ADDR 0x010D #define EEDATH_ADDR 0x010E #define EEADRH_ADDR 0x010F @@ -199,6 +202,8 @@ extern __sfr __at (OSCTUNE_ADDR) OSCTUNE; extern __sfr __at (SSPCON2_ADDR) SSPCON2; extern __sfr __at (PR2_ADDR) PR2; extern __sfr __at (SSPADD_ADDR) SSPADD; +extern __sfr __at (SSPMSK_ADDR) SSPMSK; +extern __sfr __at (MSK_ADDR) MSK; extern __sfr __at (SSPSTAT_ADDR) SSPSTAT; extern __sfr __at (WPUB_ADDR) WPUB; extern __sfr __at (IOCB_ADDR) IOCB; @@ -219,6 +224,7 @@ extern __sfr __at (CM2CON0_ADDR) CM2CON0; extern __sfr __at (CM2CON1_ADDR) CM2CON1; extern __sfr __at (EEDATA_ADDR) EEDATA; +extern __sfr __at (EEDAT_ADDR) EEDAT; extern __sfr __at (EEADR_ADDR) EEADR; extern __sfr __at (EEDATH_ADDR) EEDATH; extern __sfr __at (EEADRH_ADDR) EEADRH; @@ -376,6 +382,8 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- Configuration Word1 ------------------------------------------------ +#define _DEBUG_ON 0x1FFF +#define _DEBUG_OFF 0x3FFF #define _LVP_ON 0x3FFF #define _LVP_OFF 0x2FFF #define _FCMEN_ON 0x3FFF @@ -456,6 +464,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 @@ -466,6 +475,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define CHS3 ADCON0_bits.CHS3 #define ADCS0 ADCON0_bits.ADCS0 #define ADCS1 ADCON0_bits.ADCS1 +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -474,17 +484,19 @@ typedef union { unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char VCFG1:1; unsigned char VCFG0:1; + unsigned char VCFG1:1; unsigned char :1; unsigned char ADFM:1; }; } __ADCON1_bits_t; extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; -#define VCFG1 ADCON1_bits.VCFG1 +#ifndef NO_BIT_DEFINES #define VCFG0 ADCON1_bits.VCFG0 +#define VCFG1 ADCON1_bits.VCFG1 #define ADFM ADCON1_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ANSEL bits -------------------- typedef union { @@ -501,6 +513,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 @@ -509,6 +522,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 */ // ----- ANSELH bits -------------------- typedef union { @@ -525,12 +539,14 @@ typedef union { } __ANSELH_bits_t; extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; +#ifndef NO_BIT_DEFINES #define ANS8 ANSELH_bits.ANS8 #define ANS9 ANSELH_bits.ANS9 #define ANS10 ANSELH_bits.ANS10 #define ANS11 ANSELH_bits.ANS11 #define ANS12 ANSELH_bits.ANS12 #define ANS13 ANSELH_bits.ANS13 +#endif /* NO_BIT_DEFINES */ // ----- BAUDCTL bits -------------------- typedef union { @@ -547,12 +563,14 @@ typedef union { } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; +#ifndef NO_BIT_DEFINES #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -579,6 +597,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 @@ -589,6 +608,7 @@ extern volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; #define CCP1X CCP1CON_bits.CCP1X #define P1M0 CCP1CON_bits.P1M0 #define P1M1 CCP1CON_bits.P1M1 +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -615,6 +635,7 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 @@ -623,6 +644,7 @@ extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; #define DC2B0 CCP2CON_bits.DC2B0 #define CCP2X CCP2CON_bits.CCP2X #define DC2B1 CCP2CON_bits.DC2B1 +#endif /* NO_BIT_DEFINES */ // ----- CM1CON0 bits -------------------- typedef union { @@ -639,6 +661,7 @@ typedef union { } __CM1CON0_bits_t; extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +#ifndef NO_BIT_DEFINES #define C1CH0 CM1CON0_bits.C1CH0 #define C1CH1 CM1CON0_bits.C1CH1 #define C1R CM1CON0_bits.C1R @@ -646,6 +669,7 @@ extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; #define C1OE CM1CON0_bits.C1OE #define C1OUT CM1CON0_bits.C1OUT #define C1ON CM1CON0_bits.C1ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON0 bits -------------------- typedef union { @@ -662,6 +686,7 @@ typedef union { } __CM2CON0_bits_t; extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +#ifndef NO_BIT_DEFINES #define C2CH0 CM2CON0_bits.C2CH0 #define C2CH1 CM2CON0_bits.C2CH1 #define C2R CM2CON0_bits.C2R @@ -669,6 +694,7 @@ extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; #define C2OE CM2CON0_bits.C2OE #define C2OUT CM2CON0_bits.C2OUT #define C2ON CM2CON0_bits.C2ON +#endif /* NO_BIT_DEFINES */ // ----- CM2CON1 bits -------------------- typedef union { @@ -685,12 +711,14 @@ typedef union { } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +#ifndef NO_BIT_DEFINES #define C2SYNC CM2CON1_bits.C2SYNC #define T1GSS CM2CON1_bits.T1GSS #define C2RSEL CM2CON1_bits.C2RSEL #define C1RSEL CM2CON1_bits.C1RSEL #define MC2OUT CM2CON1_bits.MC2OUT #define MC1OUT CM2CON1_bits.MC1OUT +#endif /* NO_BIT_DEFINES */ // ----- ECCPAS bits -------------------- typedef union { @@ -707,6 +735,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 @@ -715,6 +744,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 { @@ -731,11 +761,13 @@ 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 #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -762,6 +794,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -772,6 +805,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- IOCB bits -------------------- typedef union { @@ -788,6 +822,7 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB0 IOCB_bits.IOCB0 #define IOCB1 IOCB_bits.IOCB1 #define IOCB2 IOCB_bits.IOCB2 @@ -796,6 +831,7 @@ extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -812,6 +848,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 @@ -820,6 +857,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -836,6 +874,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 @@ -843,6 +882,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 { @@ -859,11 +899,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 { @@ -890,11 +932,13 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -911,6 +955,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -918,6 +963,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -934,6 +980,7 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define ULPWUIE PIE2_bits.ULPWUIE #define BCLIE PIE2_bits.BCLIE @@ -941,6 +988,7 @@ extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -957,6 +1005,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -964,6 +1013,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define TXIF PIR1_bits.TXIF #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -975,18 +1025,20 @@ typedef union { unsigned char EEIF:1; unsigned char C1IF:1; unsigned char C2IF:1; - unsigned char OSPIF:1; + unsigned char OSFIF:1; }; } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define ULPWUIF PIR2_bits.ULPWUIF #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF -#define OSPIF PIR2_bits.OSPIF +#define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -1003,12 +1055,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 */ // ----- PORTB bits -------------------- typedef union { @@ -1025,6 +1079,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -1033,6 +1088,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -1049,6 +1105,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 @@ -1057,6 +1114,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 */ // ----- PORTD bits -------------------- typedef union { @@ -1073,6 +1131,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -1081,6 +1140,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -1097,9 +1157,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- PSTRCON bits -------------------- typedef union { @@ -1116,11 +1178,13 @@ typedef union { } __PSTRCON_bits_t; extern volatile __PSTRCON_bits_t __at(PSTRCON_ADDR) PSTRCON_bits; +#ifndef NO_BIT_DEFINES #define STRA PSTRCON_bits.STRA #define STRB PSTRCON_bits.STRB #define STRC PSTRCON_bits.STRC #define STRD PSTRCON_bits.STRD #define STRSYNC PSTRCON_bits.STRSYNC +#endif /* NO_BIT_DEFINES */ // ----- PWM1CON bits -------------------- typedef union { @@ -1137,6 +1201,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 @@ -1145,6 +1210,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 */ // ----- RCSTA bits -------------------- typedef union { @@ -1191,6 +1257,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -1203,6 +1270,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SPBRG bits -------------------- typedef union { @@ -1219,6 +1287,7 @@ typedef union { } __SPBRG_bits_t; extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; +#ifndef NO_BIT_DEFINES #define BRG0 SPBRG_bits.BRG0 #define BRG1 SPBRG_bits.BRG1 #define BRG2 SPBRG_bits.BRG2 @@ -1227,6 +1296,7 @@ extern volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; #define BRG5 SPBRG_bits.BRG5 #define BRG6 SPBRG_bits.BRG6 #define BRG7 SPBRG_bits.BRG7 +#endif /* NO_BIT_DEFINES */ // ----- SPBRGH bits -------------------- typedef union { @@ -1243,6 +1313,7 @@ typedef union { } __SPBRGH_bits_t; extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; +#ifndef NO_BIT_DEFINES #define BRG8 SPBRGH_bits.BRG8 #define BRG9 SPBRGH_bits.BRG9 #define BRG10 SPBRGH_bits.BRG10 @@ -1251,6 +1322,7 @@ extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; #define BRG13 SPBRGH_bits.BRG13 #define BRG14 SPBRGH_bits.BRG14 #define BRG15 SPBRGH_bits.BRG15 +#endif /* NO_BIT_DEFINES */ // ----- SRCON bits -------------------- typedef union { @@ -1267,6 +1339,7 @@ typedef union { } __SRCON_bits_t; extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; +#ifndef NO_BIT_DEFINES #define FVREN SRCON_bits.FVREN #define PULSR SRCON_bits.PULSR #define PULSS SRCON_bits.PULSS @@ -1274,6 +1347,7 @@ extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; #define C1SEN SRCON_bits.C1SEN #define SR0 SRCON_bits.SR0 #define SR1 SRCON_bits.SR1 +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1290,6 +1364,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1298,6 +1373,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPCON2 bits -------------------- typedef union { @@ -1314,6 +1390,7 @@ typedef union { } __SSPCON2_bits_t; extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; +#ifndef NO_BIT_DEFINES #define SEN SSPCON2_bits.SEN #define RSEN SSPCON2_bits.RSEN #define PEN SSPCON2_bits.PEN @@ -1322,6 +1399,7 @@ extern volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; #define ACKDT SSPCON2_bits.ACKDT #define ACKSTAT SSPCON2_bits.ACKSTAT #define GCEN SSPCON2_bits.GCEN +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1388,6 +1466,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1408,6 +1487,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1424,6 +1504,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 @@ -1432,6 +1513,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 { @@ -1442,8 +1524,8 @@ typedef union { unsigned char T1OSCEN:1; unsigned char T1CKPS0:1; unsigned char T1CKPS1:1; - unsigned char :1; - unsigned char :1; + unsigned char TMR1GE:1; + unsigned char T1GINV:1; }; struct { unsigned char :1; @@ -1468,6 +1550,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 @@ -1476,6 +1559,9 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 #define T1CKPS1 T1CON_bits.T1CKPS1 +#define TMR1GE T1CON_bits.TMR1GE +#define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1492,6 +1578,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 @@ -1499,6 +1586,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 { @@ -1515,12 +1603,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1537,6 +1627,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1545,6 +1636,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1561,6 +1653,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 @@ -1569,6 +1662,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 */ // ----- TRISD bits -------------------- typedef union { @@ -1585,6 +1679,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -1593,6 +1688,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -1609,9 +1705,11 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1619,7 +1717,7 @@ typedef union { unsigned char TX9D:1; unsigned char TRMT:1; unsigned char BRGH:1; - unsigned char :1; + unsigned char SENDB:1; unsigned char SYNC:1; unsigned char TXEN:1; unsigned char TX9:1; @@ -1648,16 +1746,19 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT #define BRGH TXSTA_bits.BRGH +#define SENDB TXSTA_bits.SENDB #define SYNC TXSTA_bits.SYNC #define TXEN TXSTA_bits.TXEN #define TX9 TXSTA_bits.TX9 #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -1674,6 +1775,7 @@ 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 @@ -1682,6 +1784,7 @@ extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VRR VRCON_bits.VRR #define VROE VRCON_bits.VROE #define VREN VRCON_bits.VREN +#endif /* NO_BIT_DEFINES */ // ----- WDTCON bits -------------------- typedef union { @@ -1698,11 +1801,13 @@ 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 */ // ----- WPUB bits -------------------- typedef union { @@ -1719,6 +1824,7 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB0 WPUB_bits.WPUB0 #define WPUB1 WPUB_bits.WPUB1 #define WPUB2 WPUB_bits.WPUB2 @@ -1727,5 +1833,6 @@ extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f913.h b/device/include/pic/pic16f913.h index c8e832b1..5d4e9231 100644 --- a/device/include/pic/pic16f913.h +++ b/device/include/pic/pic16f913.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 // @@ -473,6 +473,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 NOT_DONE ADCON0_bits.NOT_DONE #define GO_DONE ADCON0_bits.GO_DONE @@ -482,6 +483,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG0 ADCON0_bits.VCFG0 #define VCFG1 ADCON0_bits.VCFG1 #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -498,9 +500,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 { @@ -527,6 +531,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 AN0 ANSEL_bits.AN0 #define ANS1 ANSEL_bits.ANS1 @@ -537,6 +542,7 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define AN3 ANSEL_bits.AN3 #define ANS4 ANSEL_bits.ANS4 #define AN4 ANSEL_bits.AN4 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -553,12 +559,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON0 bits -------------------- typedef union { @@ -575,6 +583,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 @@ -583,6 +592,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 { @@ -599,8 +609,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 */ // ----- EEADRH bits -------------------- typedef union { @@ -617,11 +629,13 @@ typedef union { } __EEADRH_bits_t; extern volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; +#ifndef NO_BIT_DEFINES #define EEADRH0 EEADRH_bits.EEADRH0 #define EEADRH1 EEADRH_bits.EEADRH1 #define EEADRH2 EEADRH_bits.EEADRH2 #define EEADRH3 EEADRH_bits.EEADRH3 #define EEADRH4 EEADRH_bits.EEADRH4 +#endif /* NO_BIT_DEFINES */ // ----- EEADRL bits -------------------- typedef union { @@ -638,6 +652,7 @@ typedef union { } __EEADRL_bits_t; extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; +#ifndef NO_BIT_DEFINES #define EEADRL0 EEADRL_bits.EEADRL0 #define EEADRL1 EEADRL_bits.EEADRL1 #define EEADRL2 EEADRL_bits.EEADRL2 @@ -646,6 +661,7 @@ extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; #define EEADRL5 EEADRL_bits.EEADRL5 #define EEADRL6 EEADRL_bits.EEADRL6 #define EEADRL7 EEADRL_bits.EEADRL7 +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -672,6 +688,7 @@ 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 EERD EECON1_bits.EERD #define WR EECON1_bits.WR @@ -679,6 +696,7 @@ extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; #define WREN EECON1_bits.WREN #define WRERR EECON1_bits.WRERR #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -705,6 +723,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -715,6 +734,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- IOC bits -------------------- typedef union { @@ -731,10 +751,12 @@ typedef union { } __IOC_bits_t; extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +#ifndef NO_BIT_DEFINES #define IOC4 IOC_bits.IOC4 #define IOC5 IOC_bits.IOC5 #define IOC6 IOC_bits.IOC6 #define IOC7 IOC_bits.IOC7 +#endif /* NO_BIT_DEFINES */ // ----- IOCB bits -------------------- typedef union { @@ -751,10 +773,12 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- LCDCON bits -------------------- typedef union { @@ -771,6 +795,7 @@ typedef union { } __LCDCON_bits_t; extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; +#ifndef NO_BIT_DEFINES #define LMUX0 LCDCON_bits.LMUX0 #define LMUX1 LCDCON_bits.LMUX1 #define CS0 LCDCON_bits.CS0 @@ -779,6 +804,7 @@ extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; #define WERR LCDCON_bits.WERR #define SLPEN LCDCON_bits.SLPEN #define LCDEN LCDCON_bits.LCDEN +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA0 bits -------------------- typedef union { @@ -805,6 +831,7 @@ typedef union { } __LCDDATA0_bits_t; extern volatile __LCDDATA0_bits_t __at(LCDDATA0_ADDR) LCDDATA0_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM0 LCDDATA0_bits.SEG0COM0 #define S0C0 LCDDATA0_bits.S0C0 #define SEG1COM0 LCDDATA0_bits.SEG1COM0 @@ -821,6 +848,7 @@ extern volatile __LCDDATA0_bits_t __at(LCDDATA0_ADDR) LCDDATA0_bits; #define S6C0 LCDDATA0_bits.S6C0 #define SEG7COM0 LCDDATA0_bits.SEG7COM0 #define S7C0 LCDDATA0_bits.S7C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA1 bits -------------------- typedef union { @@ -847,6 +875,7 @@ typedef union { } __LCDDATA1_bits_t; extern volatile __LCDDATA1_bits_t __at(LCDDATA1_ADDR) LCDDATA1_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM0 LCDDATA1_bits.SEG8COM0 #define S8C0 LCDDATA1_bits.S8C0 #define SEG9COM0 LCDDATA1_bits.SEG9COM0 @@ -863,6 +892,7 @@ extern volatile __LCDDATA1_bits_t __at(LCDDATA1_ADDR) LCDDATA1_bits; #define S14C0 LCDDATA1_bits.S14C0 #define SEG15COM0 LCDDATA1_bits.SEG15COM0 #define S15C0 LCDDATA1_bits.S15C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA10 bits -------------------- typedef union { @@ -889,6 +919,7 @@ typedef union { } __LCDDATA10_bits_t; extern volatile __LCDDATA10_bits_t __at(LCDDATA10_ADDR) LCDDATA10_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM3 LCDDATA10_bits.SEG8COM3 #define S8C3 LCDDATA10_bits.S8C3 #define SEG9COM3 LCDDATA10_bits.SEG9COM3 @@ -905,6 +936,7 @@ extern volatile __LCDDATA10_bits_t __at(LCDDATA10_ADDR) LCDDATA10_bits; #define S14C3 LCDDATA10_bits.S14C3 #define SEG15COM3 LCDDATA10_bits.SEG15COM3 #define S15C3 LCDDATA10_bits.S15C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA3 bits -------------------- typedef union { @@ -931,6 +963,7 @@ typedef union { } __LCDDATA3_bits_t; extern volatile __LCDDATA3_bits_t __at(LCDDATA3_ADDR) LCDDATA3_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM1 LCDDATA3_bits.SEG0COM1 #define S0C1 LCDDATA3_bits.S0C1 #define SEG1COM1 LCDDATA3_bits.SEG1COM1 @@ -947,6 +980,7 @@ extern volatile __LCDDATA3_bits_t __at(LCDDATA3_ADDR) LCDDATA3_bits; #define S6C1 LCDDATA3_bits.S6C1 #define SEG7COM1 LCDDATA3_bits.SEG7COM1 #define S7C1 LCDDATA3_bits.S7C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA4 bits -------------------- typedef union { @@ -973,6 +1007,7 @@ typedef union { } __LCDDATA4_bits_t; extern volatile __LCDDATA4_bits_t __at(LCDDATA4_ADDR) LCDDATA4_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM1 LCDDATA4_bits.SEG8COM1 #define S8C1 LCDDATA4_bits.S8C1 #define SEG9COM1 LCDDATA4_bits.SEG9COM1 @@ -989,6 +1024,7 @@ extern volatile __LCDDATA4_bits_t __at(LCDDATA4_ADDR) LCDDATA4_bits; #define S14C1 LCDDATA4_bits.S14C1 #define SEG15COM1 LCDDATA4_bits.SEG15COM1 #define S15C1 LCDDATA4_bits.S15C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA6 bits -------------------- typedef union { @@ -1015,6 +1051,7 @@ typedef union { } __LCDDATA6_bits_t; extern volatile __LCDDATA6_bits_t __at(LCDDATA6_ADDR) LCDDATA6_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM2 LCDDATA6_bits.SEG0COM2 #define S0C2 LCDDATA6_bits.S0C2 #define SEG1COM2 LCDDATA6_bits.SEG1COM2 @@ -1031,6 +1068,7 @@ extern volatile __LCDDATA6_bits_t __at(LCDDATA6_ADDR) LCDDATA6_bits; #define S6C2 LCDDATA6_bits.S6C2 #define SEG7COM2 LCDDATA6_bits.SEG7COM2 #define S7C2 LCDDATA6_bits.S7C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA7 bits -------------------- typedef union { @@ -1057,6 +1095,7 @@ typedef union { } __LCDDATA7_bits_t; extern volatile __LCDDATA7_bits_t __at(LCDDATA7_ADDR) LCDDATA7_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM2 LCDDATA7_bits.SEG8COM2 #define S8C2 LCDDATA7_bits.S8C2 #define SEG9COM2 LCDDATA7_bits.SEG9COM2 @@ -1073,6 +1112,7 @@ extern volatile __LCDDATA7_bits_t __at(LCDDATA7_ADDR) LCDDATA7_bits; #define S14C2 LCDDATA7_bits.S14C2 #define SEG15COM2 LCDDATA7_bits.SEG15COM2 #define S15C2 LCDDATA7_bits.S15C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA9 bits -------------------- typedef union { @@ -1099,6 +1139,7 @@ typedef union { } __LCDDATA9_bits_t; extern volatile __LCDDATA9_bits_t __at(LCDDATA9_ADDR) LCDDATA9_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM3 LCDDATA9_bits.SEG0COM3 #define S0C3 LCDDATA9_bits.S0C3 #define SEG1COM3 LCDDATA9_bits.SEG1COM3 @@ -1115,6 +1156,7 @@ extern volatile __LCDDATA9_bits_t __at(LCDDATA9_ADDR) LCDDATA9_bits; #define S6C3 LCDDATA9_bits.S6C3 #define SEG7COM3 LCDDATA9_bits.SEG7COM3 #define S7C3 LCDDATA9_bits.S7C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDPS bits -------------------- typedef union { @@ -1131,6 +1173,7 @@ typedef union { } __LCDPS_bits_t; extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; +#ifndef NO_BIT_DEFINES #define LP0 LCDPS_bits.LP0 #define LP1 LCDPS_bits.LP1 #define LP2 LCDPS_bits.LP2 @@ -1139,6 +1182,7 @@ extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; #define LCDA LCDPS_bits.LCDA #define BIASMD LCDPS_bits.BIASMD #define WFT LCDPS_bits.WFT +#endif /* NO_BIT_DEFINES */ // ----- LCDSE0 bits -------------------- typedef union { @@ -1165,6 +1209,7 @@ typedef union { } __LCDSE0_bits_t; extern volatile __LCDSE0_bits_t __at(LCDSE0_ADDR) LCDSE0_bits; +#ifndef NO_BIT_DEFINES #define SE0 LCDSE0_bits.SE0 #define SEGEN0 LCDSE0_bits.SEGEN0 #define SE1 LCDSE0_bits.SE1 @@ -1181,6 +1226,7 @@ extern volatile __LCDSE0_bits_t __at(LCDSE0_ADDR) LCDSE0_bits; #define SEGEN6 LCDSE0_bits.SEGEN6 #define SE7 LCDSE0_bits.SE7 #define SEGEN7 LCDSE0_bits.SEGEN7 +#endif /* NO_BIT_DEFINES */ // ----- LCDSE1 bits -------------------- typedef union { @@ -1207,6 +1253,7 @@ typedef union { } __LCDSE1_bits_t; extern volatile __LCDSE1_bits_t __at(LCDSE1_ADDR) LCDSE1_bits; +#ifndef NO_BIT_DEFINES #define SE8 LCDSE1_bits.SE8 #define SEGEN8 LCDSE1_bits.SEGEN8 #define SE9 LCDSE1_bits.SE9 @@ -1223,6 +1270,7 @@ extern volatile __LCDSE1_bits_t __at(LCDSE1_ADDR) LCDSE1_bits; #define SEGEN14 LCDSE1_bits.SEGEN14 #define SE15 LCDSE1_bits.SE15 #define SEGEN15 LCDSE1_bits.SEGEN15 +#endif /* NO_BIT_DEFINES */ // ----- LVDCON bits -------------------- typedef union { @@ -1239,11 +1287,13 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -1260,6 +1310,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 @@ -1268,6 +1319,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -1284,6 +1336,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 @@ -1291,6 +1344,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 { @@ -1307,11 +1361,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 { @@ -1338,10 +1394,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -1358,6 +1416,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -1366,6 +1425,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -1382,11 +1442,13 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define LVDIE PIE2_bits.LVDIE #define LCDIE PIE2_bits.LCDIE #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -1403,6 +1465,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -1411,6 +1474,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -1427,11 +1491,13 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define LVDIF PIR2_bits.LVDIF #define LCDIF PIR2_bits.LCDIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -1448,12 +1514,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 */ // ----- PORTB bits -------------------- typedef union { @@ -1470,6 +1538,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -1478,6 +1547,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -1494,6 +1564,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 @@ -1502,6 +1573,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 */ // ----- PORTE bits -------------------- typedef union { @@ -1518,9 +1590,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -1567,6 +1641,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -1579,6 +1654,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1595,6 +1671,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1603,6 +1680,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1669,6 +1747,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1689,6 +1768,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1705,6 +1785,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 @@ -1713,6 +1794,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 { @@ -1749,6 +1831,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 @@ -1759,6 +1842,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1GE T1CON_bits.T1GE #define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1775,6 +1859,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 @@ -1782,6 +1867,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 { @@ -1798,12 +1884,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1820,6 +1908,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1828,6 +1917,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1844,6 +1934,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 @@ -1852,6 +1943,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 */ // ----- TRISE bits -------------------- typedef union { @@ -1868,9 +1960,11 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1907,6 +2001,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1917,6 +2012,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -1933,12 +2029,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 { @@ -1965,12 +2063,14 @@ 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 SWDTE WDTCON_bits.SWDTE #define WDTPS0 WDTCON_bits.WDTPS0 #define WDTPS1 WDTCON_bits.WDTPS1 #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +#endif /* NO_BIT_DEFINES */ // ----- WPU bits -------------------- typedef union { @@ -1987,6 +2087,7 @@ typedef union { } __WPU_bits_t; extern volatile __WPU_bits_t __at(WPU_ADDR) WPU_bits; +#ifndef NO_BIT_DEFINES #define WPU0 WPU_bits.WPU0 #define WPU1 WPU_bits.WPU1 #define WPU2 WPU_bits.WPU2 @@ -1995,6 +2096,7 @@ extern volatile __WPU_bits_t __at(WPU_ADDR) WPU_bits; #define WPU5 WPU_bits.WPU5 #define WPU6 WPU_bits.WPU6 #define WPU7 WPU_bits.WPU7 +#endif /* NO_BIT_DEFINES */ // ----- WPUB bits -------------------- typedef union { @@ -2011,6 +2113,7 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB0 WPUB_bits.WPUB0 #define WPUB1 WPUB_bits.WPUB1 #define WPUB2 WPUB_bits.WPUB2 @@ -2019,5 +2122,6 @@ extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f914.h b/device/include/pic/pic16f914.h index 7382d5ef..cf401b54 100644 --- a/device/include/pic/pic16f914.h +++ b/device/include/pic/pic16f914.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 // @@ -509,6 +509,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 NOT_DONE ADCON0_bits.NOT_DONE #define GO_DONE ADCON0_bits.GO_DONE @@ -518,6 +519,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG0 ADCON0_bits.VCFG0 #define VCFG1 ADCON0_bits.VCFG1 #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -534,9 +536,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 { @@ -563,6 +567,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 AN0 ANSEL_bits.AN0 #define ANS1 ANSEL_bits.ANS1 @@ -579,6 +584,7 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define AN6 ANSEL_bits.AN6 #define ANS7 ANSEL_bits.ANS7 #define AN7 ANSEL_bits.AN7 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -595,12 +601,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -617,12 +625,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CMCON0 bits -------------------- typedef union { @@ -639,6 +649,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 @@ -647,6 +658,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 { @@ -663,8 +675,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 */ // ----- EEADRH bits -------------------- typedef union { @@ -681,11 +695,13 @@ typedef union { } __EEADRH_bits_t; extern volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; +#ifndef NO_BIT_DEFINES #define EEADRH0 EEADRH_bits.EEADRH0 #define EEADRH1 EEADRH_bits.EEADRH1 #define EEADRH2 EEADRH_bits.EEADRH2 #define EEADRH3 EEADRH_bits.EEADRH3 #define EEADRH4 EEADRH_bits.EEADRH4 +#endif /* NO_BIT_DEFINES */ // ----- EEADRL bits -------------------- typedef union { @@ -702,6 +718,7 @@ typedef union { } __EEADRL_bits_t; extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; +#ifndef NO_BIT_DEFINES #define EEADRL0 EEADRL_bits.EEADRL0 #define EEADRL1 EEADRL_bits.EEADRL1 #define EEADRL2 EEADRL_bits.EEADRL2 @@ -710,6 +727,7 @@ extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; #define EEADRL5 EEADRL_bits.EEADRL5 #define EEADRL6 EEADRL_bits.EEADRL6 #define EEADRL7 EEADRL_bits.EEADRL7 +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -736,6 +754,7 @@ 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 EERD EECON1_bits.EERD #define WR EECON1_bits.WR @@ -743,6 +762,7 @@ extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; #define WREN EECON1_bits.WREN #define WRERR EECON1_bits.WRERR #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -769,6 +789,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -779,6 +800,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- IOC bits -------------------- typedef union { @@ -795,10 +817,12 @@ typedef union { } __IOC_bits_t; extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +#ifndef NO_BIT_DEFINES #define IOC4 IOC_bits.IOC4 #define IOC5 IOC_bits.IOC5 #define IOC6 IOC_bits.IOC6 #define IOC7 IOC_bits.IOC7 +#endif /* NO_BIT_DEFINES */ // ----- IOCB bits -------------------- typedef union { @@ -815,10 +839,12 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- LCDCON bits -------------------- typedef union { @@ -835,6 +861,7 @@ typedef union { } __LCDCON_bits_t; extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; +#ifndef NO_BIT_DEFINES #define LMUX0 LCDCON_bits.LMUX0 #define LMUX1 LCDCON_bits.LMUX1 #define CS0 LCDCON_bits.CS0 @@ -843,6 +870,7 @@ extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; #define WERR LCDCON_bits.WERR #define SLPEN LCDCON_bits.SLPEN #define LCDEN LCDCON_bits.LCDEN +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA0 bits -------------------- typedef union { @@ -869,6 +897,7 @@ typedef union { } __LCDDATA0_bits_t; extern volatile __LCDDATA0_bits_t __at(LCDDATA0_ADDR) LCDDATA0_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM0 LCDDATA0_bits.SEG0COM0 #define S0C0 LCDDATA0_bits.S0C0 #define SEG1COM0 LCDDATA0_bits.SEG1COM0 @@ -885,6 +914,7 @@ extern volatile __LCDDATA0_bits_t __at(LCDDATA0_ADDR) LCDDATA0_bits; #define S6C0 LCDDATA0_bits.S6C0 #define SEG7COM0 LCDDATA0_bits.SEG7COM0 #define S7C0 LCDDATA0_bits.S7C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA1 bits -------------------- typedef union { @@ -911,6 +941,7 @@ typedef union { } __LCDDATA1_bits_t; extern volatile __LCDDATA1_bits_t __at(LCDDATA1_ADDR) LCDDATA1_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM0 LCDDATA1_bits.SEG8COM0 #define S8C0 LCDDATA1_bits.S8C0 #define SEG9COM0 LCDDATA1_bits.SEG9COM0 @@ -927,6 +958,7 @@ extern volatile __LCDDATA1_bits_t __at(LCDDATA1_ADDR) LCDDATA1_bits; #define S14C0 LCDDATA1_bits.S14C0 #define SEG15COM0 LCDDATA1_bits.SEG15COM0 #define S15C0 LCDDATA1_bits.S15C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA10 bits -------------------- typedef union { @@ -953,6 +985,7 @@ typedef union { } __LCDDATA10_bits_t; extern volatile __LCDDATA10_bits_t __at(LCDDATA10_ADDR) LCDDATA10_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM3 LCDDATA10_bits.SEG8COM3 #define S8C3 LCDDATA10_bits.S8C3 #define SEG9COM3 LCDDATA10_bits.SEG9COM3 @@ -969,6 +1002,7 @@ extern volatile __LCDDATA10_bits_t __at(LCDDATA10_ADDR) LCDDATA10_bits; #define S14C3 LCDDATA10_bits.S14C3 #define SEG15COM3 LCDDATA10_bits.SEG15COM3 #define S15C3 LCDDATA10_bits.S15C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA11 bits -------------------- typedef union { @@ -995,6 +1029,7 @@ typedef union { } __LCDDATA11_bits_t; extern volatile __LCDDATA11_bits_t __at(LCDDATA11_ADDR) LCDDATA11_bits; +#ifndef NO_BIT_DEFINES #define SEG16COM3 LCDDATA11_bits.SEG16COM3 #define S16C3 LCDDATA11_bits.S16C3 #define SEG17COM3 LCDDATA11_bits.SEG17COM3 @@ -1011,6 +1046,7 @@ extern volatile __LCDDATA11_bits_t __at(LCDDATA11_ADDR) LCDDATA11_bits; #define S22C3 LCDDATA11_bits.S22C3 #define SEG23COM3 LCDDATA11_bits.SEG23COM3 #define S23C3 LCDDATA11_bits.S23C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA2 bits -------------------- typedef union { @@ -1037,6 +1073,7 @@ typedef union { } __LCDDATA2_bits_t; extern volatile __LCDDATA2_bits_t __at(LCDDATA2_ADDR) LCDDATA2_bits; +#ifndef NO_BIT_DEFINES #define SEG16COM0 LCDDATA2_bits.SEG16COM0 #define S16C0 LCDDATA2_bits.S16C0 #define SEG17COM0 LCDDATA2_bits.SEG17COM0 @@ -1053,6 +1090,7 @@ extern volatile __LCDDATA2_bits_t __at(LCDDATA2_ADDR) LCDDATA2_bits; #define S22C0 LCDDATA2_bits.S22C0 #define SEG23COM0 LCDDATA2_bits.SEG23COM0 #define S23C0 LCDDATA2_bits.S23C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA3 bits -------------------- typedef union { @@ -1079,6 +1117,7 @@ typedef union { } __LCDDATA3_bits_t; extern volatile __LCDDATA3_bits_t __at(LCDDATA3_ADDR) LCDDATA3_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM1 LCDDATA3_bits.SEG0COM1 #define S0C1 LCDDATA3_bits.S0C1 #define SEG1COM1 LCDDATA3_bits.SEG1COM1 @@ -1095,6 +1134,7 @@ extern volatile __LCDDATA3_bits_t __at(LCDDATA3_ADDR) LCDDATA3_bits; #define S6C1 LCDDATA3_bits.S6C1 #define SEG7COM1 LCDDATA3_bits.SEG7COM1 #define S7C1 LCDDATA3_bits.S7C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA4 bits -------------------- typedef union { @@ -1121,6 +1161,7 @@ typedef union { } __LCDDATA4_bits_t; extern volatile __LCDDATA4_bits_t __at(LCDDATA4_ADDR) LCDDATA4_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM1 LCDDATA4_bits.SEG8COM1 #define S8C1 LCDDATA4_bits.S8C1 #define SEG9COM1 LCDDATA4_bits.SEG9COM1 @@ -1137,6 +1178,7 @@ extern volatile __LCDDATA4_bits_t __at(LCDDATA4_ADDR) LCDDATA4_bits; #define S14C1 LCDDATA4_bits.S14C1 #define SEG15COM1 LCDDATA4_bits.SEG15COM1 #define S15C1 LCDDATA4_bits.S15C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA5 bits -------------------- typedef union { @@ -1163,6 +1205,7 @@ typedef union { } __LCDDATA5_bits_t; extern volatile __LCDDATA5_bits_t __at(LCDDATA5_ADDR) LCDDATA5_bits; +#ifndef NO_BIT_DEFINES #define SEG16COM1 LCDDATA5_bits.SEG16COM1 #define S16C1 LCDDATA5_bits.S16C1 #define SEG17COM1 LCDDATA5_bits.SEG17COM1 @@ -1179,6 +1222,7 @@ extern volatile __LCDDATA5_bits_t __at(LCDDATA5_ADDR) LCDDATA5_bits; #define S22C1 LCDDATA5_bits.S22C1 #define SEG23COM1 LCDDATA5_bits.SEG23COM1 #define S23C1 LCDDATA5_bits.S23C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA6 bits -------------------- typedef union { @@ -1205,6 +1249,7 @@ typedef union { } __LCDDATA6_bits_t; extern volatile __LCDDATA6_bits_t __at(LCDDATA6_ADDR) LCDDATA6_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM2 LCDDATA6_bits.SEG0COM2 #define S0C2 LCDDATA6_bits.S0C2 #define SEG1COM2 LCDDATA6_bits.SEG1COM2 @@ -1221,6 +1266,7 @@ extern volatile __LCDDATA6_bits_t __at(LCDDATA6_ADDR) LCDDATA6_bits; #define S6C2 LCDDATA6_bits.S6C2 #define SEG7COM2 LCDDATA6_bits.SEG7COM2 #define S7C2 LCDDATA6_bits.S7C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA7 bits -------------------- typedef union { @@ -1247,6 +1293,7 @@ typedef union { } __LCDDATA7_bits_t; extern volatile __LCDDATA7_bits_t __at(LCDDATA7_ADDR) LCDDATA7_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM2 LCDDATA7_bits.SEG8COM2 #define S8C2 LCDDATA7_bits.S8C2 #define SEG9COM2 LCDDATA7_bits.SEG9COM2 @@ -1263,6 +1310,7 @@ extern volatile __LCDDATA7_bits_t __at(LCDDATA7_ADDR) LCDDATA7_bits; #define S14C2 LCDDATA7_bits.S14C2 #define SEG15COM2 LCDDATA7_bits.SEG15COM2 #define S15C2 LCDDATA7_bits.S15C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA8 bits -------------------- typedef union { @@ -1289,6 +1337,7 @@ typedef union { } __LCDDATA8_bits_t; extern volatile __LCDDATA8_bits_t __at(LCDDATA8_ADDR) LCDDATA8_bits; +#ifndef NO_BIT_DEFINES #define SEG16COM2 LCDDATA8_bits.SEG16COM2 #define S16C2 LCDDATA8_bits.S16C2 #define SEG17COM2 LCDDATA8_bits.SEG17COM2 @@ -1305,6 +1354,7 @@ extern volatile __LCDDATA8_bits_t __at(LCDDATA8_ADDR) LCDDATA8_bits; #define S22C2 LCDDATA8_bits.S22C2 #define SEG23COM2 LCDDATA8_bits.SEG23COM2 #define S23C2 LCDDATA8_bits.S23C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA9 bits -------------------- typedef union { @@ -1331,6 +1381,7 @@ typedef union { } __LCDDATA9_bits_t; extern volatile __LCDDATA9_bits_t __at(LCDDATA9_ADDR) LCDDATA9_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM3 LCDDATA9_bits.SEG0COM3 #define S0C3 LCDDATA9_bits.S0C3 #define SEG1COM3 LCDDATA9_bits.SEG1COM3 @@ -1347,6 +1398,7 @@ extern volatile __LCDDATA9_bits_t __at(LCDDATA9_ADDR) LCDDATA9_bits; #define S6C3 LCDDATA9_bits.S6C3 #define SEG7COM3 LCDDATA9_bits.SEG7COM3 #define S7C3 LCDDATA9_bits.S7C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDPS bits -------------------- typedef union { @@ -1363,6 +1415,7 @@ typedef union { } __LCDPS_bits_t; extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; +#ifndef NO_BIT_DEFINES #define LP0 LCDPS_bits.LP0 #define LP1 LCDPS_bits.LP1 #define LP2 LCDPS_bits.LP2 @@ -1371,6 +1424,7 @@ extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; #define LCDA LCDPS_bits.LCDA #define BIASMD LCDPS_bits.BIASMD #define WFT LCDPS_bits.WFT +#endif /* NO_BIT_DEFINES */ // ----- LCDSE0 bits -------------------- typedef union { @@ -1397,6 +1451,7 @@ typedef union { } __LCDSE0_bits_t; extern volatile __LCDSE0_bits_t __at(LCDSE0_ADDR) LCDSE0_bits; +#ifndef NO_BIT_DEFINES #define SE0 LCDSE0_bits.SE0 #define SEGEN0 LCDSE0_bits.SEGEN0 #define SE1 LCDSE0_bits.SE1 @@ -1413,6 +1468,7 @@ extern volatile __LCDSE0_bits_t __at(LCDSE0_ADDR) LCDSE0_bits; #define SEGEN6 LCDSE0_bits.SEGEN6 #define SE7 LCDSE0_bits.SE7 #define SEGEN7 LCDSE0_bits.SEGEN7 +#endif /* NO_BIT_DEFINES */ // ----- LCDSE1 bits -------------------- typedef union { @@ -1439,6 +1495,7 @@ typedef union { } __LCDSE1_bits_t; extern volatile __LCDSE1_bits_t __at(LCDSE1_ADDR) LCDSE1_bits; +#ifndef NO_BIT_DEFINES #define SE8 LCDSE1_bits.SE8 #define SEGEN8 LCDSE1_bits.SEGEN8 #define SE9 LCDSE1_bits.SE9 @@ -1455,6 +1512,7 @@ extern volatile __LCDSE1_bits_t __at(LCDSE1_ADDR) LCDSE1_bits; #define SEGEN14 LCDSE1_bits.SEGEN14 #define SE15 LCDSE1_bits.SE15 #define SEGEN15 LCDSE1_bits.SEGEN15 +#endif /* NO_BIT_DEFINES */ // ----- LCDSE2 bits -------------------- typedef union { @@ -1481,6 +1539,7 @@ typedef union { } __LCDSE2_bits_t; extern volatile __LCDSE2_bits_t __at(LCDSE2_ADDR) LCDSE2_bits; +#ifndef NO_BIT_DEFINES #define SE16 LCDSE2_bits.SE16 #define SEGEN16 LCDSE2_bits.SEGEN16 #define SE17 LCDSE2_bits.SE17 @@ -1497,6 +1556,7 @@ extern volatile __LCDSE2_bits_t __at(LCDSE2_ADDR) LCDSE2_bits; #define SEGEN22 LCDSE2_bits.SEGEN22 #define SE23 LCDSE2_bits.SE23 #define SEGEN23 LCDSE2_bits.SEGEN23 +#endif /* NO_BIT_DEFINES */ // ----- LVDCON bits -------------------- typedef union { @@ -1513,11 +1573,13 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -1534,6 +1596,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 @@ -1542,6 +1605,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -1558,6 +1622,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 @@ -1565,6 +1630,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 { @@ -1581,11 +1647,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 { @@ -1612,10 +1680,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -1632,6 +1702,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -1640,6 +1711,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -1656,12 +1728,14 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define LVDIE PIE2_bits.LVDIE #define LCDIE PIE2_bits.LCDIE #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -1678,6 +1752,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -1686,6 +1761,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -1702,12 +1778,14 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define LVDIF PIR2_bits.LVDIF #define LCDIF PIR2_bits.LCDIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -1724,12 +1802,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 */ // ----- PORTB bits -------------------- typedef union { @@ -1746,6 +1826,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -1754,6 +1835,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -1770,6 +1852,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 @@ -1778,6 +1861,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 */ // ----- PORTD bits -------------------- typedef union { @@ -1794,6 +1878,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -1802,6 +1887,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -1818,9 +1904,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -1867,6 +1955,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -1879,6 +1968,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1895,6 +1985,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1903,6 +1994,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1969,6 +2061,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1989,6 +2082,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -2005,6 +2099,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 @@ -2013,6 +2108,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 { @@ -2049,6 +2145,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 @@ -2059,6 +2156,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1GE T1CON_bits.T1GE #define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -2075,6 +2173,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 @@ -2082,6 +2181,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 { @@ -2098,12 +2198,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 */ // ----- TRISB bits -------------------- typedef union { @@ -2120,6 +2222,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -2128,6 +2231,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -2144,6 +2248,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 @@ -2152,6 +2257,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 */ // ----- TRISD bits -------------------- typedef union { @@ -2168,6 +2274,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -2176,6 +2283,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -2192,9 +2300,11 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -2231,6 +2341,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -2241,6 +2352,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -2257,12 +2369,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 { @@ -2289,12 +2403,14 @@ 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 SWDTE WDTCON_bits.SWDTE #define WDTPS0 WDTCON_bits.WDTPS0 #define WDTPS1 WDTCON_bits.WDTPS1 #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +#endif /* NO_BIT_DEFINES */ // ----- WPU bits -------------------- typedef union { @@ -2311,6 +2427,7 @@ typedef union { } __WPU_bits_t; extern volatile __WPU_bits_t __at(WPU_ADDR) WPU_bits; +#ifndef NO_BIT_DEFINES #define WPU0 WPU_bits.WPU0 #define WPU1 WPU_bits.WPU1 #define WPU2 WPU_bits.WPU2 @@ -2319,6 +2436,7 @@ extern volatile __WPU_bits_t __at(WPU_ADDR) WPU_bits; #define WPU5 WPU_bits.WPU5 #define WPU6 WPU_bits.WPU6 #define WPU7 WPU_bits.WPU7 +#endif /* NO_BIT_DEFINES */ // ----- WPUB bits -------------------- typedef union { @@ -2335,6 +2453,7 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB0 WPUB_bits.WPUB0 #define WPUB1 WPUB_bits.WPUB1 #define WPUB2 WPUB_bits.WPUB2 @@ -2343,5 +2462,6 @@ extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f916.h b/device/include/pic/pic16f916.h index dd973339..bf41e59b 100644 --- a/device/include/pic/pic16f916.h +++ b/device/include/pic/pic16f916.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 // @@ -474,6 +474,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 NOT_DONE ADCON0_bits.NOT_DONE #define GO_DONE ADCON0_bits.GO_DONE @@ -483,6 +484,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG0 ADCON0_bits.VCFG0 #define VCFG1 ADCON0_bits.VCFG1 #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -499,9 +501,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 { @@ -528,6 +532,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 AN0 ANSEL_bits.AN0 #define ANS1 ANSEL_bits.ANS1 @@ -538,6 +543,7 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define AN3 ANSEL_bits.AN3 #define ANS4 ANSEL_bits.ANS4 #define AN4 ANSEL_bits.AN4 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -554,12 +560,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CMCON0 bits -------------------- typedef union { @@ -576,6 +584,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 @@ -584,6 +593,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 { @@ -600,8 +610,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 */ // ----- EEADRH bits -------------------- typedef union { @@ -618,11 +630,13 @@ typedef union { } __EEADRH_bits_t; extern volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; +#ifndef NO_BIT_DEFINES #define EEADRH0 EEADRH_bits.EEADRH0 #define EEADRH1 EEADRH_bits.EEADRH1 #define EEADRH2 EEADRH_bits.EEADRH2 #define EEADRH3 EEADRH_bits.EEADRH3 #define EEADRH4 EEADRH_bits.EEADRH4 +#endif /* NO_BIT_DEFINES */ // ----- EEADRL bits -------------------- typedef union { @@ -639,6 +653,7 @@ typedef union { } __EEADRL_bits_t; extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; +#ifndef NO_BIT_DEFINES #define EEADRL0 EEADRL_bits.EEADRL0 #define EEADRL1 EEADRL_bits.EEADRL1 #define EEADRL2 EEADRL_bits.EEADRL2 @@ -647,6 +662,7 @@ extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; #define EEADRL5 EEADRL_bits.EEADRL5 #define EEADRL6 EEADRL_bits.EEADRL6 #define EEADRL7 EEADRL_bits.EEADRL7 +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -673,6 +689,7 @@ 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 EERD EECON1_bits.EERD #define WR EECON1_bits.WR @@ -680,6 +697,7 @@ extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; #define WREN EECON1_bits.WREN #define WRERR EECON1_bits.WRERR #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -706,6 +724,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -716,6 +735,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- IOC bits -------------------- typedef union { @@ -732,10 +752,12 @@ typedef union { } __IOC_bits_t; extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +#ifndef NO_BIT_DEFINES #define IOC4 IOC_bits.IOC4 #define IOC5 IOC_bits.IOC5 #define IOC6 IOC_bits.IOC6 #define IOC7 IOC_bits.IOC7 +#endif /* NO_BIT_DEFINES */ // ----- IOCB bits -------------------- typedef union { @@ -752,10 +774,12 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- LCDCON bits -------------------- typedef union { @@ -772,6 +796,7 @@ typedef union { } __LCDCON_bits_t; extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; +#ifndef NO_BIT_DEFINES #define LMUX0 LCDCON_bits.LMUX0 #define LMUX1 LCDCON_bits.LMUX1 #define CS0 LCDCON_bits.CS0 @@ -780,6 +805,7 @@ extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; #define WERR LCDCON_bits.WERR #define SLPEN LCDCON_bits.SLPEN #define LCDEN LCDCON_bits.LCDEN +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA0 bits -------------------- typedef union { @@ -806,6 +832,7 @@ typedef union { } __LCDDATA0_bits_t; extern volatile __LCDDATA0_bits_t __at(LCDDATA0_ADDR) LCDDATA0_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM0 LCDDATA0_bits.SEG0COM0 #define S0C0 LCDDATA0_bits.S0C0 #define SEG1COM0 LCDDATA0_bits.SEG1COM0 @@ -822,6 +849,7 @@ extern volatile __LCDDATA0_bits_t __at(LCDDATA0_ADDR) LCDDATA0_bits; #define S6C0 LCDDATA0_bits.S6C0 #define SEG7COM0 LCDDATA0_bits.SEG7COM0 #define S7C0 LCDDATA0_bits.S7C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA1 bits -------------------- typedef union { @@ -848,6 +876,7 @@ typedef union { } __LCDDATA1_bits_t; extern volatile __LCDDATA1_bits_t __at(LCDDATA1_ADDR) LCDDATA1_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM0 LCDDATA1_bits.SEG8COM0 #define S8C0 LCDDATA1_bits.S8C0 #define SEG9COM0 LCDDATA1_bits.SEG9COM0 @@ -864,6 +893,7 @@ extern volatile __LCDDATA1_bits_t __at(LCDDATA1_ADDR) LCDDATA1_bits; #define S14C0 LCDDATA1_bits.S14C0 #define SEG15COM0 LCDDATA1_bits.SEG15COM0 #define S15C0 LCDDATA1_bits.S15C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA10 bits -------------------- typedef union { @@ -890,6 +920,7 @@ typedef union { } __LCDDATA10_bits_t; extern volatile __LCDDATA10_bits_t __at(LCDDATA10_ADDR) LCDDATA10_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM3 LCDDATA10_bits.SEG8COM3 #define S8C3 LCDDATA10_bits.S8C3 #define SEG9COM3 LCDDATA10_bits.SEG9COM3 @@ -906,6 +937,7 @@ extern volatile __LCDDATA10_bits_t __at(LCDDATA10_ADDR) LCDDATA10_bits; #define S14C3 LCDDATA10_bits.S14C3 #define SEG15COM3 LCDDATA10_bits.SEG15COM3 #define S15C3 LCDDATA10_bits.S15C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA3 bits -------------------- typedef union { @@ -932,6 +964,7 @@ typedef union { } __LCDDATA3_bits_t; extern volatile __LCDDATA3_bits_t __at(LCDDATA3_ADDR) LCDDATA3_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM1 LCDDATA3_bits.SEG0COM1 #define S0C1 LCDDATA3_bits.S0C1 #define SEG1COM1 LCDDATA3_bits.SEG1COM1 @@ -948,6 +981,7 @@ extern volatile __LCDDATA3_bits_t __at(LCDDATA3_ADDR) LCDDATA3_bits; #define S6C1 LCDDATA3_bits.S6C1 #define SEG7COM1 LCDDATA3_bits.SEG7COM1 #define S7C1 LCDDATA3_bits.S7C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA4 bits -------------------- typedef union { @@ -974,6 +1008,7 @@ typedef union { } __LCDDATA4_bits_t; extern volatile __LCDDATA4_bits_t __at(LCDDATA4_ADDR) LCDDATA4_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM1 LCDDATA4_bits.SEG8COM1 #define S8C1 LCDDATA4_bits.S8C1 #define SEG9COM1 LCDDATA4_bits.SEG9COM1 @@ -990,6 +1025,7 @@ extern volatile __LCDDATA4_bits_t __at(LCDDATA4_ADDR) LCDDATA4_bits; #define S14C1 LCDDATA4_bits.S14C1 #define SEG15COM1 LCDDATA4_bits.SEG15COM1 #define S15C1 LCDDATA4_bits.S15C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA6 bits -------------------- typedef union { @@ -1016,6 +1052,7 @@ typedef union { } __LCDDATA6_bits_t; extern volatile __LCDDATA6_bits_t __at(LCDDATA6_ADDR) LCDDATA6_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM2 LCDDATA6_bits.SEG0COM2 #define S0C2 LCDDATA6_bits.S0C2 #define SEG1COM2 LCDDATA6_bits.SEG1COM2 @@ -1032,6 +1069,7 @@ extern volatile __LCDDATA6_bits_t __at(LCDDATA6_ADDR) LCDDATA6_bits; #define S6C2 LCDDATA6_bits.S6C2 #define SEG7COM2 LCDDATA6_bits.SEG7COM2 #define S7C2 LCDDATA6_bits.S7C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA7 bits -------------------- typedef union { @@ -1058,6 +1096,7 @@ typedef union { } __LCDDATA7_bits_t; extern volatile __LCDDATA7_bits_t __at(LCDDATA7_ADDR) LCDDATA7_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM2 LCDDATA7_bits.SEG8COM2 #define S8C2 LCDDATA7_bits.S8C2 #define SEG9COM2 LCDDATA7_bits.SEG9COM2 @@ -1074,6 +1113,7 @@ extern volatile __LCDDATA7_bits_t __at(LCDDATA7_ADDR) LCDDATA7_bits; #define S14C2 LCDDATA7_bits.S14C2 #define SEG15COM2 LCDDATA7_bits.SEG15COM2 #define S15C2 LCDDATA7_bits.S15C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA9 bits -------------------- typedef union { @@ -1100,6 +1140,7 @@ typedef union { } __LCDDATA9_bits_t; extern volatile __LCDDATA9_bits_t __at(LCDDATA9_ADDR) LCDDATA9_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM3 LCDDATA9_bits.SEG0COM3 #define S0C3 LCDDATA9_bits.S0C3 #define SEG1COM3 LCDDATA9_bits.SEG1COM3 @@ -1116,6 +1157,7 @@ extern volatile __LCDDATA9_bits_t __at(LCDDATA9_ADDR) LCDDATA9_bits; #define S6C3 LCDDATA9_bits.S6C3 #define SEG7COM3 LCDDATA9_bits.SEG7COM3 #define S7C3 LCDDATA9_bits.S7C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDPS bits -------------------- typedef union { @@ -1132,6 +1174,7 @@ typedef union { } __LCDPS_bits_t; extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; +#ifndef NO_BIT_DEFINES #define LP0 LCDPS_bits.LP0 #define LP1 LCDPS_bits.LP1 #define LP2 LCDPS_bits.LP2 @@ -1140,6 +1183,7 @@ extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; #define LCDA LCDPS_bits.LCDA #define BIASMD LCDPS_bits.BIASMD #define WFT LCDPS_bits.WFT +#endif /* NO_BIT_DEFINES */ // ----- LCDSE0 bits -------------------- typedef union { @@ -1166,6 +1210,7 @@ typedef union { } __LCDSE0_bits_t; extern volatile __LCDSE0_bits_t __at(LCDSE0_ADDR) LCDSE0_bits; +#ifndef NO_BIT_DEFINES #define SE0 LCDSE0_bits.SE0 #define SEGEN0 LCDSE0_bits.SEGEN0 #define SE1 LCDSE0_bits.SE1 @@ -1182,6 +1227,7 @@ extern volatile __LCDSE0_bits_t __at(LCDSE0_ADDR) LCDSE0_bits; #define SEGEN6 LCDSE0_bits.SEGEN6 #define SE7 LCDSE0_bits.SE7 #define SEGEN7 LCDSE0_bits.SEGEN7 +#endif /* NO_BIT_DEFINES */ // ----- LCDSE1 bits -------------------- typedef union { @@ -1208,6 +1254,7 @@ typedef union { } __LCDSE1_bits_t; extern volatile __LCDSE1_bits_t __at(LCDSE1_ADDR) LCDSE1_bits; +#ifndef NO_BIT_DEFINES #define SE8 LCDSE1_bits.SE8 #define SEGEN8 LCDSE1_bits.SEGEN8 #define SE9 LCDSE1_bits.SE9 @@ -1224,6 +1271,7 @@ extern volatile __LCDSE1_bits_t __at(LCDSE1_ADDR) LCDSE1_bits; #define SEGEN14 LCDSE1_bits.SEGEN14 #define SE15 LCDSE1_bits.SE15 #define SEGEN15 LCDSE1_bits.SEGEN15 +#endif /* NO_BIT_DEFINES */ // ----- LVDCON bits -------------------- typedef union { @@ -1240,11 +1288,13 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -1261,6 +1311,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 @@ -1269,6 +1320,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -1285,6 +1337,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 @@ -1292,6 +1345,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 { @@ -1308,11 +1362,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 { @@ -1339,10 +1395,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -1359,6 +1417,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -1367,6 +1426,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -1383,11 +1443,13 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define LVDIE PIE2_bits.LVDIE #define LCDIE PIE2_bits.LCDIE #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -1404,6 +1466,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -1412,6 +1475,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -1428,11 +1492,13 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define LVDIF PIR2_bits.LVDIF #define LCDIF PIR2_bits.LCDIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -1449,12 +1515,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 */ // ----- PORTB bits -------------------- typedef union { @@ -1471,6 +1539,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -1479,6 +1548,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -1495,6 +1565,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 @@ -1503,6 +1574,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 */ // ----- PORTE bits -------------------- typedef union { @@ -1519,9 +1591,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -1568,6 +1642,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -1580,6 +1655,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1596,6 +1672,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1604,6 +1681,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1670,6 +1748,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1690,6 +1769,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -1706,6 +1786,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 @@ -1714,6 +1795,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 { @@ -1750,6 +1832,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 @@ -1760,6 +1843,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1GE T1CON_bits.T1GE #define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -1776,6 +1860,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 @@ -1783,6 +1868,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 { @@ -1799,12 +1885,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 */ // ----- TRISB bits -------------------- typedef union { @@ -1821,6 +1909,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -1829,6 +1918,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -1845,6 +1935,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 @@ -1853,6 +1944,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 */ // ----- TRISE bits -------------------- typedef union { @@ -1869,9 +1961,11 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -1908,6 +2002,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -1918,6 +2013,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -1934,12 +2030,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 { @@ -1966,12 +2064,14 @@ 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 SWDTE WDTCON_bits.SWDTE #define WDTPS0 WDTCON_bits.WDTPS0 #define WDTPS1 WDTCON_bits.WDTPS1 #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +#endif /* NO_BIT_DEFINES */ // ----- WPU bits -------------------- typedef union { @@ -1988,6 +2088,7 @@ typedef union { } __WPU_bits_t; extern volatile __WPU_bits_t __at(WPU_ADDR) WPU_bits; +#ifndef NO_BIT_DEFINES #define WPU0 WPU_bits.WPU0 #define WPU1 WPU_bits.WPU1 #define WPU2 WPU_bits.WPU2 @@ -1996,6 +2097,7 @@ extern volatile __WPU_bits_t __at(WPU_ADDR) WPU_bits; #define WPU5 WPU_bits.WPU5 #define WPU6 WPU_bits.WPU6 #define WPU7 WPU_bits.WPU7 +#endif /* NO_BIT_DEFINES */ // ----- WPUB bits -------------------- typedef union { @@ -2012,6 +2114,7 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB0 WPUB_bits.WPUB0 #define WPUB1 WPUB_bits.WPUB1 #define WPUB2 WPUB_bits.WPUB2 @@ -2020,5 +2123,6 @@ extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/pic16f917.h b/device/include/pic/pic16f917.h index 7c81ac09..417b6937 100644 --- a/device/include/pic/pic16f917.h +++ b/device/include/pic/pic16f917.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 // @@ -509,6 +509,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 NOT_DONE ADCON0_bits.NOT_DONE #define GO_DONE ADCON0_bits.GO_DONE @@ -518,6 +519,7 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG0 ADCON0_bits.VCFG0 #define VCFG1 ADCON0_bits.VCFG1 #define ADFM ADCON0_bits.ADFM +#endif /* NO_BIT_DEFINES */ // ----- ADCON1 bits -------------------- typedef union { @@ -534,9 +536,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 { @@ -563,6 +567,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 AN0 ANSEL_bits.AN0 #define ANS1 ANSEL_bits.ANS1 @@ -579,6 +584,7 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define AN6 ANSEL_bits.AN6 #define ANS7 ANSEL_bits.ANS7 #define AN7 ANSEL_bits.AN7 +#endif /* NO_BIT_DEFINES */ // ----- CCP1CON bits -------------------- typedef union { @@ -595,12 +601,14 @@ 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 #define CCP1M3 CCP1CON_bits.CCP1M3 #define CCP1Y CCP1CON_bits.CCP1Y #define CCP1X CCP1CON_bits.CCP1X +#endif /* NO_BIT_DEFINES */ // ----- CCP2CON bits -------------------- typedef union { @@ -617,12 +625,14 @@ typedef union { } __CCP2CON_bits_t; extern volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; +#ifndef NO_BIT_DEFINES #define CCP2M0 CCP2CON_bits.CCP2M0 #define CCP2M1 CCP2CON_bits.CCP2M1 #define CCP2M2 CCP2CON_bits.CCP2M2 #define CCP2M3 CCP2CON_bits.CCP2M3 #define CCP2Y CCP2CON_bits.CCP2Y #define CCP2X CCP2CON_bits.CCP2X +#endif /* NO_BIT_DEFINES */ // ----- CMCON0 bits -------------------- typedef union { @@ -639,6 +649,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 @@ -647,6 +658,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 { @@ -663,8 +675,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 */ // ----- EEADRH bits -------------------- typedef union { @@ -681,11 +695,13 @@ typedef union { } __EEADRH_bits_t; extern volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; +#ifndef NO_BIT_DEFINES #define EEADRH0 EEADRH_bits.EEADRH0 #define EEADRH1 EEADRH_bits.EEADRH1 #define EEADRH2 EEADRH_bits.EEADRH2 #define EEADRH3 EEADRH_bits.EEADRH3 #define EEADRH4 EEADRH_bits.EEADRH4 +#endif /* NO_BIT_DEFINES */ // ----- EEADRL bits -------------------- typedef union { @@ -702,6 +718,7 @@ typedef union { } __EEADRL_bits_t; extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; +#ifndef NO_BIT_DEFINES #define EEADRL0 EEADRL_bits.EEADRL0 #define EEADRL1 EEADRL_bits.EEADRL1 #define EEADRL2 EEADRL_bits.EEADRL2 @@ -710,6 +727,7 @@ extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; #define EEADRL5 EEADRL_bits.EEADRL5 #define EEADRL6 EEADRL_bits.EEADRL6 #define EEADRL7 EEADRL_bits.EEADRL7 +#endif /* NO_BIT_DEFINES */ // ----- EECON1 bits -------------------- typedef union { @@ -736,6 +754,7 @@ 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 EERD EECON1_bits.EERD #define WR EECON1_bits.WR @@ -743,6 +762,7 @@ extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; #define WREN EECON1_bits.WREN #define WRERR EECON1_bits.WRERR #define EEPGD EECON1_bits.EEPGD +#endif /* NO_BIT_DEFINES */ // ----- INTCON bits -------------------- typedef union { @@ -769,6 +789,7 @@ typedef union { } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +#ifndef NO_BIT_DEFINES #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF @@ -779,6 +800,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +#endif /* NO_BIT_DEFINES */ // ----- IOC bits -------------------- typedef union { @@ -795,10 +817,12 @@ typedef union { } __IOC_bits_t; extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +#ifndef NO_BIT_DEFINES #define IOC4 IOC_bits.IOC4 #define IOC5 IOC_bits.IOC5 #define IOC6 IOC_bits.IOC6 #define IOC7 IOC_bits.IOC7 +#endif /* NO_BIT_DEFINES */ // ----- IOCB bits -------------------- typedef union { @@ -815,10 +839,12 @@ typedef union { } __IOCB_bits_t; extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; +#ifndef NO_BIT_DEFINES #define IOCB4 IOCB_bits.IOCB4 #define IOCB5 IOCB_bits.IOCB5 #define IOCB6 IOCB_bits.IOCB6 #define IOCB7 IOCB_bits.IOCB7 +#endif /* NO_BIT_DEFINES */ // ----- LCDCON bits -------------------- typedef union { @@ -835,6 +861,7 @@ typedef union { } __LCDCON_bits_t; extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; +#ifndef NO_BIT_DEFINES #define LMUX0 LCDCON_bits.LMUX0 #define LMUX1 LCDCON_bits.LMUX1 #define CS0 LCDCON_bits.CS0 @@ -843,6 +870,7 @@ extern volatile __LCDCON_bits_t __at(LCDCON_ADDR) LCDCON_bits; #define WERR LCDCON_bits.WERR #define SLPEN LCDCON_bits.SLPEN #define LCDEN LCDCON_bits.LCDEN +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA0 bits -------------------- typedef union { @@ -869,6 +897,7 @@ typedef union { } __LCDDATA0_bits_t; extern volatile __LCDDATA0_bits_t __at(LCDDATA0_ADDR) LCDDATA0_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM0 LCDDATA0_bits.SEG0COM0 #define S0C0 LCDDATA0_bits.S0C0 #define SEG1COM0 LCDDATA0_bits.SEG1COM0 @@ -885,6 +914,7 @@ extern volatile __LCDDATA0_bits_t __at(LCDDATA0_ADDR) LCDDATA0_bits; #define S6C0 LCDDATA0_bits.S6C0 #define SEG7COM0 LCDDATA0_bits.SEG7COM0 #define S7C0 LCDDATA0_bits.S7C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA1 bits -------------------- typedef union { @@ -911,6 +941,7 @@ typedef union { } __LCDDATA1_bits_t; extern volatile __LCDDATA1_bits_t __at(LCDDATA1_ADDR) LCDDATA1_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM0 LCDDATA1_bits.SEG8COM0 #define S8C0 LCDDATA1_bits.S8C0 #define SEG9COM0 LCDDATA1_bits.SEG9COM0 @@ -927,6 +958,7 @@ extern volatile __LCDDATA1_bits_t __at(LCDDATA1_ADDR) LCDDATA1_bits; #define S14C0 LCDDATA1_bits.S14C0 #define SEG15COM0 LCDDATA1_bits.SEG15COM0 #define S15C0 LCDDATA1_bits.S15C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA10 bits -------------------- typedef union { @@ -953,6 +985,7 @@ typedef union { } __LCDDATA10_bits_t; extern volatile __LCDDATA10_bits_t __at(LCDDATA10_ADDR) LCDDATA10_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM3 LCDDATA10_bits.SEG8COM3 #define S8C3 LCDDATA10_bits.S8C3 #define SEG9COM3 LCDDATA10_bits.SEG9COM3 @@ -969,6 +1002,7 @@ extern volatile __LCDDATA10_bits_t __at(LCDDATA10_ADDR) LCDDATA10_bits; #define S14C3 LCDDATA10_bits.S14C3 #define SEG15COM3 LCDDATA10_bits.SEG15COM3 #define S15C3 LCDDATA10_bits.S15C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA11 bits -------------------- typedef union { @@ -995,6 +1029,7 @@ typedef union { } __LCDDATA11_bits_t; extern volatile __LCDDATA11_bits_t __at(LCDDATA11_ADDR) LCDDATA11_bits; +#ifndef NO_BIT_DEFINES #define SEG16COM3 LCDDATA11_bits.SEG16COM3 #define S16C3 LCDDATA11_bits.S16C3 #define SEG17COM3 LCDDATA11_bits.SEG17COM3 @@ -1011,6 +1046,7 @@ extern volatile __LCDDATA11_bits_t __at(LCDDATA11_ADDR) LCDDATA11_bits; #define S22C3 LCDDATA11_bits.S22C3 #define SEG23COM3 LCDDATA11_bits.SEG23COM3 #define S23C3 LCDDATA11_bits.S23C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA2 bits -------------------- typedef union { @@ -1037,6 +1073,7 @@ typedef union { } __LCDDATA2_bits_t; extern volatile __LCDDATA2_bits_t __at(LCDDATA2_ADDR) LCDDATA2_bits; +#ifndef NO_BIT_DEFINES #define SEG16COM0 LCDDATA2_bits.SEG16COM0 #define S16C0 LCDDATA2_bits.S16C0 #define SEG17COM0 LCDDATA2_bits.SEG17COM0 @@ -1053,6 +1090,7 @@ extern volatile __LCDDATA2_bits_t __at(LCDDATA2_ADDR) LCDDATA2_bits; #define S22C0 LCDDATA2_bits.S22C0 #define SEG23COM0 LCDDATA2_bits.SEG23COM0 #define S23C0 LCDDATA2_bits.S23C0 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA3 bits -------------------- typedef union { @@ -1079,6 +1117,7 @@ typedef union { } __LCDDATA3_bits_t; extern volatile __LCDDATA3_bits_t __at(LCDDATA3_ADDR) LCDDATA3_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM1 LCDDATA3_bits.SEG0COM1 #define S0C1 LCDDATA3_bits.S0C1 #define SEG1COM1 LCDDATA3_bits.SEG1COM1 @@ -1095,6 +1134,7 @@ extern volatile __LCDDATA3_bits_t __at(LCDDATA3_ADDR) LCDDATA3_bits; #define S6C1 LCDDATA3_bits.S6C1 #define SEG7COM1 LCDDATA3_bits.SEG7COM1 #define S7C1 LCDDATA3_bits.S7C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA4 bits -------------------- typedef union { @@ -1121,6 +1161,7 @@ typedef union { } __LCDDATA4_bits_t; extern volatile __LCDDATA4_bits_t __at(LCDDATA4_ADDR) LCDDATA4_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM1 LCDDATA4_bits.SEG8COM1 #define S8C1 LCDDATA4_bits.S8C1 #define SEG9COM1 LCDDATA4_bits.SEG9COM1 @@ -1137,6 +1178,7 @@ extern volatile __LCDDATA4_bits_t __at(LCDDATA4_ADDR) LCDDATA4_bits; #define S14C1 LCDDATA4_bits.S14C1 #define SEG15COM1 LCDDATA4_bits.SEG15COM1 #define S15C1 LCDDATA4_bits.S15C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA5 bits -------------------- typedef union { @@ -1163,6 +1205,7 @@ typedef union { } __LCDDATA5_bits_t; extern volatile __LCDDATA5_bits_t __at(LCDDATA5_ADDR) LCDDATA5_bits; +#ifndef NO_BIT_DEFINES #define SEG16COM1 LCDDATA5_bits.SEG16COM1 #define S16C1 LCDDATA5_bits.S16C1 #define SEG17COM1 LCDDATA5_bits.SEG17COM1 @@ -1179,6 +1222,7 @@ extern volatile __LCDDATA5_bits_t __at(LCDDATA5_ADDR) LCDDATA5_bits; #define S22C1 LCDDATA5_bits.S22C1 #define SEG23COM1 LCDDATA5_bits.SEG23COM1 #define S23C1 LCDDATA5_bits.S23C1 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA6 bits -------------------- typedef union { @@ -1205,6 +1249,7 @@ typedef union { } __LCDDATA6_bits_t; extern volatile __LCDDATA6_bits_t __at(LCDDATA6_ADDR) LCDDATA6_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM2 LCDDATA6_bits.SEG0COM2 #define S0C2 LCDDATA6_bits.S0C2 #define SEG1COM2 LCDDATA6_bits.SEG1COM2 @@ -1221,6 +1266,7 @@ extern volatile __LCDDATA6_bits_t __at(LCDDATA6_ADDR) LCDDATA6_bits; #define S6C2 LCDDATA6_bits.S6C2 #define SEG7COM2 LCDDATA6_bits.SEG7COM2 #define S7C2 LCDDATA6_bits.S7C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA7 bits -------------------- typedef union { @@ -1247,6 +1293,7 @@ typedef union { } __LCDDATA7_bits_t; extern volatile __LCDDATA7_bits_t __at(LCDDATA7_ADDR) LCDDATA7_bits; +#ifndef NO_BIT_DEFINES #define SEG8COM2 LCDDATA7_bits.SEG8COM2 #define S8C2 LCDDATA7_bits.S8C2 #define SEG9COM2 LCDDATA7_bits.SEG9COM2 @@ -1263,6 +1310,7 @@ extern volatile __LCDDATA7_bits_t __at(LCDDATA7_ADDR) LCDDATA7_bits; #define S14C2 LCDDATA7_bits.S14C2 #define SEG15COM2 LCDDATA7_bits.SEG15COM2 #define S15C2 LCDDATA7_bits.S15C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA8 bits -------------------- typedef union { @@ -1289,6 +1337,7 @@ typedef union { } __LCDDATA8_bits_t; extern volatile __LCDDATA8_bits_t __at(LCDDATA8_ADDR) LCDDATA8_bits; +#ifndef NO_BIT_DEFINES #define SEG16COM2 LCDDATA8_bits.SEG16COM2 #define S16C2 LCDDATA8_bits.S16C2 #define SEG17COM2 LCDDATA8_bits.SEG17COM2 @@ -1305,6 +1354,7 @@ extern volatile __LCDDATA8_bits_t __at(LCDDATA8_ADDR) LCDDATA8_bits; #define S22C2 LCDDATA8_bits.S22C2 #define SEG23COM2 LCDDATA8_bits.SEG23COM2 #define S23C2 LCDDATA8_bits.S23C2 +#endif /* NO_BIT_DEFINES */ // ----- LCDDATA9 bits -------------------- typedef union { @@ -1331,6 +1381,7 @@ typedef union { } __LCDDATA9_bits_t; extern volatile __LCDDATA9_bits_t __at(LCDDATA9_ADDR) LCDDATA9_bits; +#ifndef NO_BIT_DEFINES #define SEG0COM3 LCDDATA9_bits.SEG0COM3 #define S0C3 LCDDATA9_bits.S0C3 #define SEG1COM3 LCDDATA9_bits.SEG1COM3 @@ -1347,6 +1398,7 @@ extern volatile __LCDDATA9_bits_t __at(LCDDATA9_ADDR) LCDDATA9_bits; #define S6C3 LCDDATA9_bits.S6C3 #define SEG7COM3 LCDDATA9_bits.SEG7COM3 #define S7C3 LCDDATA9_bits.S7C3 +#endif /* NO_BIT_DEFINES */ // ----- LCDPS bits -------------------- typedef union { @@ -1363,6 +1415,7 @@ typedef union { } __LCDPS_bits_t; extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; +#ifndef NO_BIT_DEFINES #define LP0 LCDPS_bits.LP0 #define LP1 LCDPS_bits.LP1 #define LP2 LCDPS_bits.LP2 @@ -1371,6 +1424,7 @@ extern volatile __LCDPS_bits_t __at(LCDPS_ADDR) LCDPS_bits; #define LCDA LCDPS_bits.LCDA #define BIASMD LCDPS_bits.BIASMD #define WFT LCDPS_bits.WFT +#endif /* NO_BIT_DEFINES */ // ----- LCDSE0 bits -------------------- typedef union { @@ -1397,6 +1451,7 @@ typedef union { } __LCDSE0_bits_t; extern volatile __LCDSE0_bits_t __at(LCDSE0_ADDR) LCDSE0_bits; +#ifndef NO_BIT_DEFINES #define SE0 LCDSE0_bits.SE0 #define SEGEN0 LCDSE0_bits.SEGEN0 #define SE1 LCDSE0_bits.SE1 @@ -1413,6 +1468,7 @@ extern volatile __LCDSE0_bits_t __at(LCDSE0_ADDR) LCDSE0_bits; #define SEGEN6 LCDSE0_bits.SEGEN6 #define SE7 LCDSE0_bits.SE7 #define SEGEN7 LCDSE0_bits.SEGEN7 +#endif /* NO_BIT_DEFINES */ // ----- LCDSE1 bits -------------------- typedef union { @@ -1439,6 +1495,7 @@ typedef union { } __LCDSE1_bits_t; extern volatile __LCDSE1_bits_t __at(LCDSE1_ADDR) LCDSE1_bits; +#ifndef NO_BIT_DEFINES #define SE8 LCDSE1_bits.SE8 #define SEGEN8 LCDSE1_bits.SEGEN8 #define SE9 LCDSE1_bits.SE9 @@ -1455,6 +1512,7 @@ extern volatile __LCDSE1_bits_t __at(LCDSE1_ADDR) LCDSE1_bits; #define SEGEN14 LCDSE1_bits.SEGEN14 #define SE15 LCDSE1_bits.SE15 #define SEGEN15 LCDSE1_bits.SEGEN15 +#endif /* NO_BIT_DEFINES */ // ----- LCDSE2 bits -------------------- typedef union { @@ -1481,6 +1539,7 @@ typedef union { } __LCDSE2_bits_t; extern volatile __LCDSE2_bits_t __at(LCDSE2_ADDR) LCDSE2_bits; +#ifndef NO_BIT_DEFINES #define SE16 LCDSE2_bits.SE16 #define SEGEN16 LCDSE2_bits.SEGEN16 #define SE17 LCDSE2_bits.SE17 @@ -1497,6 +1556,7 @@ extern volatile __LCDSE2_bits_t __at(LCDSE2_ADDR) LCDSE2_bits; #define SEGEN22 LCDSE2_bits.SEGEN22 #define SE23 LCDSE2_bits.SE23 #define SEGEN23 LCDSE2_bits.SEGEN23 +#endif /* NO_BIT_DEFINES */ // ----- LVDCON bits -------------------- typedef union { @@ -1513,11 +1573,13 @@ typedef union { } __LVDCON_bits_t; extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; +#ifndef NO_BIT_DEFINES #define LVDL0 LVDCON_bits.LVDL0 #define LVDL1 LVDCON_bits.LVDL1 #define LVDL2 LVDCON_bits.LVDL2 #define LVDEN LVDCON_bits.LVDEN #define IRVST LVDCON_bits.IRVST +#endif /* NO_BIT_DEFINES */ // ----- OPTION_REG bits -------------------- typedef union { @@ -1534,6 +1596,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 @@ -1542,6 +1605,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_RBPU OPTION_REG_bits.NOT_RBPU +#endif /* NO_BIT_DEFINES */ // ----- OSCCON bits -------------------- typedef union { @@ -1558,6 +1622,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 @@ -1565,6 +1630,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 { @@ -1581,11 +1647,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 { @@ -1612,10 +1680,12 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +#ifndef NO_BIT_DEFINES #define NOT_BO PCON_bits.NOT_BO #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR #define SBOREN PCON_bits.SBOREN +#endif /* NO_BIT_DEFINES */ // ----- PIE1 bits -------------------- typedef union { @@ -1632,6 +1702,7 @@ typedef union { } __PIE1_bits_t; extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IE PIE1_bits.TMR1IE #define TMR2IE PIE1_bits.TMR2IE #define CCP1IE PIE1_bits.CCP1IE @@ -1640,6 +1711,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define RCIE PIE1_bits.RCIE #define ADIE PIE1_bits.ADIE #define EEIE PIE1_bits.EEIE +#endif /* NO_BIT_DEFINES */ // ----- PIE2 bits -------------------- typedef union { @@ -1656,12 +1728,14 @@ typedef union { } __PIE2_bits_t; extern volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IE PIE2_bits.CCP2IE #define LVDIE PIE2_bits.LVDIE #define LCDIE PIE2_bits.LCDIE #define C1IE PIE2_bits.C1IE #define C2IE PIE2_bits.C2IE #define OSFIE PIE2_bits.OSFIE +#endif /* NO_BIT_DEFINES */ // ----- PIR1 bits -------------------- typedef union { @@ -1678,6 +1752,7 @@ typedef union { } __PIR1_bits_t; extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +#ifndef NO_BIT_DEFINES #define TMR1IF PIR1_bits.TMR1IF #define TMR2IF PIR1_bits.TMR2IF #define CCP1IF PIR1_bits.CCP1IF @@ -1686,6 +1761,7 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define RCIF PIR1_bits.RCIF #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +#endif /* NO_BIT_DEFINES */ // ----- PIR2 bits -------------------- typedef union { @@ -1702,12 +1778,14 @@ typedef union { } __PIR2_bits_t; extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +#ifndef NO_BIT_DEFINES #define CCP2IF PIR2_bits.CCP2IF #define LVDIF PIR2_bits.LVDIF #define LCDIF PIR2_bits.LCDIF #define C1IF PIR2_bits.C1IF #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +#endif /* NO_BIT_DEFINES */ // ----- PORTA bits -------------------- typedef union { @@ -1724,12 +1802,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 */ // ----- PORTB bits -------------------- typedef union { @@ -1746,6 +1826,7 @@ typedef union { } __PORTB_bits_t; extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +#ifndef NO_BIT_DEFINES #define RB0 PORTB_bits.RB0 #define RB1 PORTB_bits.RB1 #define RB2 PORTB_bits.RB2 @@ -1754,6 +1835,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; #define RB5 PORTB_bits.RB5 #define RB6 PORTB_bits.RB6 #define RB7 PORTB_bits.RB7 +#endif /* NO_BIT_DEFINES */ // ----- PORTC bits -------------------- typedef union { @@ -1770,6 +1852,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 @@ -1778,6 +1861,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 */ // ----- PORTD bits -------------------- typedef union { @@ -1794,6 +1878,7 @@ typedef union { } __PORTD_bits_t; extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +#ifndef NO_BIT_DEFINES #define RD0 PORTD_bits.RD0 #define RD1 PORTD_bits.RD1 #define RD2 PORTD_bits.RD2 @@ -1802,6 +1887,7 @@ extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; #define RD5 PORTD_bits.RD5 #define RD6 PORTD_bits.RD6 #define RD7 PORTD_bits.RD7 +#endif /* NO_BIT_DEFINES */ // ----- PORTE bits -------------------- typedef union { @@ -1818,9 +1904,11 @@ typedef union { } __PORTE_bits_t; extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; +#ifndef NO_BIT_DEFINES #define RE0 PORTE_bits.RE0 #define RE1 PORTE_bits.RE1 #define RE2 PORTE_bits.RE2 +#endif /* NO_BIT_DEFINES */ // ----- RCSTA bits -------------------- typedef union { @@ -1867,6 +1955,7 @@ typedef union { } __RCSTA_bits_t; extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; +#ifndef NO_BIT_DEFINES #define RX9D RCSTA_bits.RX9D #define RCD8 RCSTA_bits.RCD8 #define OERR RCSTA_bits.OERR @@ -1879,6 +1968,7 @@ extern volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; #define NOT_RC8 RCSTA_bits.NOT_RC8 #define RC8_9 RCSTA_bits.RC8_9 #define SPEN RCSTA_bits.SPEN +#endif /* NO_BIT_DEFINES */ // ----- SSPCON bits -------------------- typedef union { @@ -1895,6 +1985,7 @@ typedef union { } __SSPCON_bits_t; extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; +#ifndef NO_BIT_DEFINES #define SSPM0 SSPCON_bits.SSPM0 #define SSPM1 SSPCON_bits.SSPM1 #define SSPM2 SSPCON_bits.SSPM2 @@ -1903,6 +1994,7 @@ extern volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; #define SSPEN SSPCON_bits.SSPEN #define SSPOV SSPCON_bits.SSPOV #define WCOL SSPCON_bits.WCOL +#endif /* NO_BIT_DEFINES */ // ----- SSPSTAT bits -------------------- typedef union { @@ -1969,6 +2061,7 @@ typedef union { } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; +#ifndef NO_BIT_DEFINES #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA #define R SSPSTAT_bits.R @@ -1989,6 +2082,7 @@ extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP +#endif /* NO_BIT_DEFINES */ // ----- STATUS bits -------------------- typedef union { @@ -2005,6 +2099,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 @@ -2013,6 +2108,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 { @@ -2049,6 +2145,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 @@ -2059,6 +2156,7 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define T1GE T1CON_bits.T1GE #define T1GINV T1CON_bits.T1GINV +#endif /* NO_BIT_DEFINES */ // ----- T2CON bits -------------------- typedef union { @@ -2075,6 +2173,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 @@ -2082,6 +2181,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 { @@ -2098,12 +2198,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 */ // ----- TRISB bits -------------------- typedef union { @@ -2120,6 +2222,7 @@ typedef union { } __TRISB_bits_t; extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +#ifndef NO_BIT_DEFINES #define TRISB0 TRISB_bits.TRISB0 #define TRISB1 TRISB_bits.TRISB1 #define TRISB2 TRISB_bits.TRISB2 @@ -2128,6 +2231,7 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; #define TRISB5 TRISB_bits.TRISB5 #define TRISB6 TRISB_bits.TRISB6 #define TRISB7 TRISB_bits.TRISB7 +#endif /* NO_BIT_DEFINES */ // ----- TRISC bits -------------------- typedef union { @@ -2144,6 +2248,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 @@ -2152,6 +2257,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 */ // ----- TRISD bits -------------------- typedef union { @@ -2168,6 +2274,7 @@ typedef union { } __TRISD_bits_t; extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +#ifndef NO_BIT_DEFINES #define TRISD0 TRISD_bits.TRISD0 #define TRISD1 TRISD_bits.TRISD1 #define TRISD2 TRISD_bits.TRISD2 @@ -2176,6 +2283,7 @@ extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; #define TRISD5 TRISD_bits.TRISD5 #define TRISD6 TRISD_bits.TRISD6 #define TRISD7 TRISD_bits.TRISD7 +#endif /* NO_BIT_DEFINES */ // ----- TRISE bits -------------------- typedef union { @@ -2192,9 +2300,11 @@ typedef union { } __TRISE_bits_t; extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; +#ifndef NO_BIT_DEFINES #define TRISE0 TRISE_bits.TRISE0 #define TRISE1 TRISE_bits.TRISE1 #define TRISE2 TRISE_bits.TRISE2 +#endif /* NO_BIT_DEFINES */ // ----- TXSTA bits -------------------- typedef union { @@ -2231,6 +2341,7 @@ typedef union { } __TXSTA_bits_t; extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; +#ifndef NO_BIT_DEFINES #define TX9D TXSTA_bits.TX9D #define TXD8 TXSTA_bits.TXD8 #define TRMT TXSTA_bits.TRMT @@ -2241,6 +2352,7 @@ extern volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; #define NOT_TX8 TXSTA_bits.NOT_TX8 #define TX8_9 TXSTA_bits.TX8_9 #define CSRC TXSTA_bits.CSRC +#endif /* NO_BIT_DEFINES */ // ----- VRCON bits -------------------- typedef union { @@ -2257,12 +2369,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 { @@ -2289,12 +2403,14 @@ 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 SWDTE WDTCON_bits.SWDTE #define WDTPS0 WDTCON_bits.WDTPS0 #define WDTPS1 WDTCON_bits.WDTPS1 #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +#endif /* NO_BIT_DEFINES */ // ----- WPU bits -------------------- typedef union { @@ -2311,6 +2427,7 @@ typedef union { } __WPU_bits_t; extern volatile __WPU_bits_t __at(WPU_ADDR) WPU_bits; +#ifndef NO_BIT_DEFINES #define WPU0 WPU_bits.WPU0 #define WPU1 WPU_bits.WPU1 #define WPU2 WPU_bits.WPU2 @@ -2319,6 +2436,7 @@ extern volatile __WPU_bits_t __at(WPU_ADDR) WPU_bits; #define WPU5 WPU_bits.WPU5 #define WPU6 WPU_bits.WPU6 #define WPU7 WPU_bits.WPU7 +#endif /* NO_BIT_DEFINES */ // ----- WPUB bits -------------------- typedef union { @@ -2335,6 +2453,7 @@ typedef union { } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; +#ifndef NO_BIT_DEFINES #define WPUB0 WPUB_bits.WPUB0 #define WPUB1 WPUB_bits.WPUB1 #define WPUB2 WPUB_bits.WPUB2 @@ -2343,5 +2462,6 @@ extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB5 WPUB_bits.WPUB5 #define WPUB6 WPUB_bits.WPUB6 #define WPUB7 WPUB_bits.WPUB7 +#endif /* NO_BIT_DEFINES */ #endif diff --git a/device/include/pic/recreate.sh b/device/include/pic/recreate.sh new file mode 100755 index 00000000..b28bb38d --- /dev/null +++ b/device/include/pic/recreate.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# This script can be used to recreate the device library files from +# gputils' .inc files. +# Usage: +# mkdir temp && cd temp && ../recreate.sh +# +# You will need to adjust the paths to SDCC and gputils before running! + +GPUTILS=$HOME/svn/gputils +SDCC=$HOME/svn/plain + +for i in ../pic*.h; do + if [ ! "$i" = "../pic14regs.h" ]; then + DEV=`echo "$i" | sed -e "s:../pic::;s/\.h//"`; + echo "Creating ${DEV}..."; + "${SDCC}/support/scripts/inc2h.pl" "${DEV}" "${GPUTILS}"; + fi +done + diff --git a/support/scripts/inc2h.pl b/support/scripts/inc2h.pl index 5a242e3f..7fa4151c 100755 --- a/support/scripts/inc2h.pl +++ b/support/scripts/inc2h.pl @@ -551,6 +551,7 @@ foreach my $reg (sort keys %bits) #} # emit defines for individual bits + $structs .= "#ifndef NO_BIT_DEFINES\n"; for (my $i=0; $i < 8; $i++) { my @names = @{$bits{$reg}->{oct($i)}}; @@ -558,6 +559,7 @@ foreach my $reg (sort keys %bits) $structs .= sprintf("#define %-20s ${reg}_bits.$field\n", $field); } # foreach } + $structs .= "#endif /* NO_BIT_DEFINES */\n"; $structs .= "\n"; } # foreach -- 2.30.2