From: tecodev Date: Sat, 20 Jan 2007 15:00:18 +0000 (+0000) Subject: * device/lib/pic/libdev/devices.txt: device list for mkall.sh X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d1509cf37c6ba9cc5aa238fcce11824efefc7941;p=fw%2Fsdcc * device/lib/pic/libdev/devices.txt: device list for mkall.sh * device/lib/pic/libdev/mkall.sh: script to rebuild all device libs * device/lib/pic/libdev/pic14ports.txt: device PORT specifications * support/scripts/inc2h.pl: fixed major .inc parsing bugs, applied patch from Robert Tate (#1629249) to add PORTs and TRISs * device/lib/pic/libdev/pic*.c, * device/include/pic/pic*.h: regenerated with enhanced inc2h.pl * device/lib/pic/libdev/Makefile.in: show progress git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4585 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index 57680dc4..ae6d8ac0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-01-20 Raphael Neider + + * device/lib/pic/libdev/devices.txt: device list for mkall.sh + * device/lib/pic/libdev/mkall.sh: script to rebuild all device libs + * device/lib/pic/libdev/pic14ports.txt: device PORT specifications + * support/scripts/inc2h.pl: fixed major .inc parsing bugs, + applied patch from Robert Tate (#1629249) to add PORTs and TRISs + * device/lib/pic/libdev/pic*.c, + * device/include/pic/pic*.h: regenerated with enhanced inc2h.pl + * device/lib/pic/libdev/Makefile.in: show progress + 2007-01-19 Bernhard Held * doc/sdccman.lyx: updated "configure options" for autoconf 2.6 diff --git a/device/include/pic/pic12f629.h b/device/include/pic/pic12f629.h index 4015b5e2..cee2c295 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 V1.7 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -163,7 +163,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- T1CON Bits --------------------------------------------------------- -//----- CMCON Bits -------------------------------------------------------- +//----- COMCON Bits -------------------------------------------------------- //----- OPTION Bits -------------------------------------------------------- @@ -251,6 +251,26 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define CINV CMCON_bits.CINV #define COUT CMCON_bits.COUT +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- GPIO bits -------------------- typedef union { struct { @@ -542,27 +562,13 @@ typedef union { unsigned char :1; unsigned char VREN:1; }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; } __VRCON_bits_t; extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VR0 VRCON_bits.VR0 -#define RD VRCON_bits.RD #define VR1 VRCON_bits.VR1 -#define WR VRCON_bits.WR #define VR2 VRCON_bits.VR2 -#define WREN VRCON_bits.WREN #define VR3 VRCON_bits.VR3 -#define WRERR VRCON_bits.WRERR #define VRR VRCON_bits.VRR #define VREN VRCON_bits.VREN diff --git a/device/include/pic/pic12f635.h b/device/include/pic/pic12f635.h index bf39511c..ce6be3f5 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 V1.7 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -319,6 +319,68 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define C1SYNC CMCON1_bits.C1SYNC #define T1GSS CMCON1_bits.T1GSS +// ----- CRCON bits -------------------- +typedef union { + struct { + unsigned char CRREG0:1; + unsigned char CRREG1:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ENC_DEC:1; + unsigned char GO:1; + }; +} __CRCON_bits_t; +extern volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; + +#define CRREG0 CRCON_bits.CRREG0 +#define CRREG1 CRCON_bits.CRREG1 +#define ENC_DEC CRCON_bits.ENC_DEC +#define GO CRCON_bits.GO + +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + +// ----- GPIO bits -------------------- +typedef union { + struct { + unsigned char GP0:1; + unsigned char GP1:1; + unsigned char GP2:1; + unsigned char GP3:1; + unsigned char GP4:1; + unsigned char GP5:1; + unsigned char :1; + unsigned char :1; + }; +} __GPIO_bits_t; +extern volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; + +#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 + // ----- INTCON bits -------------------- typedef union { struct { @@ -343,6 +405,49 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + +// ----- LVDCON bits -------------------- +typedef union { + struct { + unsigned char LVDL0:1; + unsigned char LVDL1:1; + unsigned char LVDL2:1; + unsigned char :1; + unsigned char PLVDEN:1; + unsigned char IRVST:1; + unsigned char :1; + unsigned char :1; + }; +} __LVDCON_bits_t; +extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; + +#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 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -398,96 +503,6 @@ typedef union { unsigned char TUN2:1; unsigned char TUN3:1; unsigned char TUN4:1; - unsigned char IOCA5:1; - unsigned char ENC_DEC:1; - unsigned char VREN:1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char IOCA3:1; - unsigned char IOCA4:1; - unsigned char VRR:1; - unsigned char :1; - unsigned char GO:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char PLVDEN:1; - unsigned char IRVST:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char VR0:1; - unsigned char VR1:1; - unsigned char VR2:1; - unsigned char VR3:1; - unsigned char WDA4:1; - unsigned char WDA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char CRREG0:1; - unsigned char CRREG1:1; - unsigned char LVDL2:1; - unsigned char RA3:1; - unsigned char WPUDA4:1; - unsigned char WPUDA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char LVDL0:1; - unsigned char LVDL1:1; - unsigned char WDA2:1; - unsigned char GP3:1; - unsigned char RA4:1; - unsigned char RA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char WDA0:1; - unsigned char WDA1:1; - unsigned char WPUDA2:1; - unsigned char :1; - unsigned char GP4:1; - unsigned char GP5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char WPUDA0:1; - unsigned char WPUDA1:1; - unsigned char RA2:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char RA0:1; - unsigned char RA1:1; - unsigned char GP2:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char GP0:1; - unsigned char GP1:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -496,57 +511,10 @@ typedef union { extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define TUN0 OSCTUNE_bits.TUN0 -#define IOCA0 OSCTUNE_bits.IOCA0 -#define RD OSCTUNE_bits.RD -#define VR0 OSCTUNE_bits.VR0 -#define CRREG0 OSCTUNE_bits.CRREG0 -#define LVDL0 OSCTUNE_bits.LVDL0 -#define WDA0 OSCTUNE_bits.WDA0 -#define WPUDA0 OSCTUNE_bits.WPUDA0 -#define RA0 OSCTUNE_bits.RA0 -#define GP0 OSCTUNE_bits.GP0 #define TUN1 OSCTUNE_bits.TUN1 -#define IOCA1 OSCTUNE_bits.IOCA1 -#define WR OSCTUNE_bits.WR -#define VR1 OSCTUNE_bits.VR1 -#define CRREG1 OSCTUNE_bits.CRREG1 -#define LVDL1 OSCTUNE_bits.LVDL1 -#define WDA1 OSCTUNE_bits.WDA1 -#define WPUDA1 OSCTUNE_bits.WPUDA1 -#define RA1 OSCTUNE_bits.RA1 -#define GP1 OSCTUNE_bits.GP1 #define TUN2 OSCTUNE_bits.TUN2 -#define IOCA2 OSCTUNE_bits.IOCA2 -#define WREN OSCTUNE_bits.WREN -#define VR2 OSCTUNE_bits.VR2 -#define LVDL2 OSCTUNE_bits.LVDL2 -#define WDA2 OSCTUNE_bits.WDA2 -#define WPUDA2 OSCTUNE_bits.WPUDA2 -#define RA2 OSCTUNE_bits.RA2 -#define GP2 OSCTUNE_bits.GP2 #define TUN3 OSCTUNE_bits.TUN3 -#define IOCA3 OSCTUNE_bits.IOCA3 -#define WRERR OSCTUNE_bits.WRERR -#define VR3 OSCTUNE_bits.VR3 -#define RA3 OSCTUNE_bits.RA3 -#define GP3 OSCTUNE_bits.GP3 #define TUN4 OSCTUNE_bits.TUN4 -#define IOCA4 OSCTUNE_bits.IOCA4 -#define PLVDEN OSCTUNE_bits.PLVDEN -#define WDA4 OSCTUNE_bits.WDA4 -#define WPUDA4 OSCTUNE_bits.WPUDA4 -#define RA4 OSCTUNE_bits.RA4 -#define GP4 OSCTUNE_bits.GP4 -#define IOCA5 OSCTUNE_bits.IOCA5 -#define VRR OSCTUNE_bits.VRR -#define IRVST OSCTUNE_bits.IRVST -#define WDA5 OSCTUNE_bits.WDA5 -#define WPUDA5 OSCTUNE_bits.WPUDA5 -#define RA5 OSCTUNE_bits.RA5 -#define GP5 OSCTUNE_bits.GP5 -#define ENC_DEC OSCTUNE_bits.ENC_DEC -#define VREN OSCTUNE_bits.VREN -#define GO OSCTUNE_bits.GO // ----- PCON bits -------------------- typedef union { @@ -613,6 +581,28 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define LVDIF PIR1_bits.LVDIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + // ----- STATUS bits -------------------- typedef union { struct { @@ -661,6 +651,49 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define TMR1GE T1CON_bits.TMR1GE #define T1GINV T1CON_bits.T1GINV +// ----- VRCON bits -------------------- +typedef union { + struct { + unsigned char VR0:1; + unsigned char VR1:1; + unsigned char VR2:1; + unsigned char VR3:1; + unsigned char :1; + unsigned char VRR:1; + unsigned char :1; + unsigned char VREN:1; + }; +} __VRCON_bits_t; +extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; + +#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 + +// ----- WDA bits -------------------- +typedef union { + struct { + unsigned char WDA0:1; + unsigned char WDA1:1; + unsigned char WDA2:1; + unsigned char :1; + unsigned char WDA4:1; + unsigned char WDA5:1; + unsigned char :1; + unsigned char :1; + }; +} __WDA_bits_t; +extern volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; + +#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 + // ----- WDTCON bits -------------------- typedef union { struct { @@ -682,4 +715,25 @@ extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +// ----- WPUDA bits -------------------- +typedef union { + struct { + unsigned char WPUDA0:1; + unsigned char WPUDA1:1; + unsigned char WPUDA2:1; + unsigned char :1; + unsigned char WPUDA4:1; + unsigned char WPUDA5:1; + unsigned char :1; + unsigned char :1; + }; +} __WPUDA_bits_t; +extern volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; + +#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 diff --git a/device/include/pic/pic12f675.h b/device/include/pic/pic12f675.h index b12101bd..e2519dd7 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 V1.7 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -172,7 +172,7 @@ extern __sfr __at (ANSEL_ADDR) ANSEL; //----- T1CON Bits --------------------------------------------------------- -//----- CMCON Bits -------------------------------------------------------- +//----- COMCON Bits -------------------------------------------------------- //----- ADCON0 Bits -------------------------------------------------------- @@ -288,6 +288,29 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#define ANS0 ANSEL_bits.ANS0 +#define ANS1 ANSEL_bits.ANS1 +#define ANS2 ANSEL_bits.ANS2 +#define ANS3 ANSEL_bits.ANS3 +#define ADCS0 ANSEL_bits.ADCS0 +#define ADCS1 ANSEL_bits.ADCS1 +#define ADCS2 ANSEL_bits.ADCS2 + // ----- CMCON bits -------------------- typedef union { struct { @@ -310,6 +333,26 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define CINV CMCON_bits.CINV #define COUT CMCON_bits.COUT +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- GPIO bits -------------------- typedef union { struct { @@ -596,50 +639,19 @@ typedef union { unsigned char VR1:1; unsigned char VR2:1; unsigned char VR3:1; - unsigned char ADCS0:1; - unsigned char VRR:1; - unsigned char ADCS2:1; - unsigned char VREN:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char :1; - unsigned char ADCS1:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char ANS0:1; - unsigned char ANS1:1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char :1; - unsigned char :1; unsigned char :1; + unsigned char VRR:1; unsigned char :1; + unsigned char VREN:1; }; } __VRCON_bits_t; extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VR0 VRCON_bits.VR0 -#define RD VRCON_bits.RD -#define ANS0 VRCON_bits.ANS0 #define VR1 VRCON_bits.VR1 -#define WR VRCON_bits.WR -#define ANS1 VRCON_bits.ANS1 #define VR2 VRCON_bits.VR2 -#define WREN VRCON_bits.WREN -#define ANS2 VRCON_bits.ANS2 #define VR3 VRCON_bits.VR3 -#define WRERR VRCON_bits.WRERR -#define ANS3 VRCON_bits.ANS3 -#define ADCS0 VRCON_bits.ADCS0 #define VRR VRCON_bits.VRR -#define ADCS1 VRCON_bits.ADCS1 -#define ADCS2 VRCON_bits.ADCS2 #define VREN VRCON_bits.VREN #endif diff --git a/device/include/pic/pic12f683.h b/device/include/pic/pic12f683.h index d7c217e2..d80e585d 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 V1.7 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -193,10 +193,10 @@ extern __sfr __at (ANSEL_ADDR) ANSEL; //----- WDTCON Bits -------------------------------------------------------- -//----- CMCON0 Bits ------------------------------------------------------- +//----- COMCON0 Bits ------------------------------------------------------- -//----- CMCON1 Bits ------------------------------------------------------- +//----- COMCON1 Bits ------------------------------------------------------- //----- ADCON0 Bits -------------------------------------------------------- @@ -273,13 +273,13 @@ extern __sfr __at (ANSEL_ADDR) ANSEL; #define _HS_OSC 0x3FFA #define _EC_OSC 0x3FFB #define _INTRC_OSC_NOCLKOUT 0x3FFC -#define _INTOSCIO 0x3FFC #define _INTRC_OSC_CLKOUT 0x3FFD -#define _INTOSC 0x3FFD +#define _INTOSCIO 0x3FFD +#define _INTOSC 0x3FFC #define _EXTRC_OSC_NOCLKOUT 0x3FFE -#define _EXTRCIO 0x3FFE #define _EXTRC_OSC_CLKOUT 0x3FFF -#define _EXTRC 0x3FFF +#define _EXTRCIO 0x3FFF +#define _EXTRC 0x3FFE // LIST @@ -328,6 +328,29 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#define ANS0 ANSEL_bits.ANS0 +#define ANS1 ANSEL_bits.ANS1 +#define ANS2 ANSEL_bits.ANS2 +#define ANS3 ANSEL_bits.ANS3 +#define ADCS0 ANSEL_bits.ADCS0 +#define ADCS1 ANSEL_bits.ADCS1 +#define ADCS2 ANSEL_bits.ADCS2 + // ----- CCP1CON bits -------------------- typedef union { struct { @@ -390,6 +413,26 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define CMSYNC CMCON1_bits.CMSYNC #define T1GSS CMCON1_bits.T1GSS +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- INTCON bits -------------------- typedef union { struct { @@ -414,6 +457,50 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOC bits -------------------- +typedef union { + struct { + unsigned char IOC0:1; + unsigned char IOC1:1; + unsigned char IOC2:1; + unsigned char IOC3:1; + unsigned char IOC4:1; + unsigned char IOC5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOC_bits_t; +extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; + +#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 + +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -469,26 +556,6 @@ typedef union { unsigned char TUN2:1; unsigned char TUN3:1; unsigned char TUN4:1; - unsigned char IOC5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOC0:1; - unsigned char IOC1:1; - unsigned char IOC2:1; - unsigned char IOC3:1; - unsigned char IOC4:1; - unsigned char IOCA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char IOCA3:1; - unsigned char IOCA4:1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -497,22 +564,10 @@ typedef union { extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define TUN0 OSCTUNE_bits.TUN0 -#define IOC0 OSCTUNE_bits.IOC0 -#define IOCA0 OSCTUNE_bits.IOCA0 #define TUN1 OSCTUNE_bits.TUN1 -#define IOC1 OSCTUNE_bits.IOC1 -#define IOCA1 OSCTUNE_bits.IOCA1 #define TUN2 OSCTUNE_bits.TUN2 -#define IOC2 OSCTUNE_bits.IOC2 -#define IOCA2 OSCTUNE_bits.IOCA2 #define TUN3 OSCTUNE_bits.TUN3 -#define IOC3 OSCTUNE_bits.IOC3 -#define IOCA3 OSCTUNE_bits.IOCA3 #define TUN4 OSCTUNE_bits.TUN4 -#define IOC4 OSCTUNE_bits.IOC4 -#define IOCA4 OSCTUNE_bits.IOCA4 -#define IOC5 OSCTUNE_bits.IOC5 -#define IOCA5 OSCTUNE_bits.IOCA5 // ----- PCON bits -------------------- typedef union { @@ -682,50 +737,19 @@ typedef union { unsigned char VR1:1; unsigned char VR2:1; unsigned char VR3:1; - unsigned char ADCS0:1; - unsigned char VRR:1; - unsigned char ADCS2:1; - unsigned char VREN:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char :1; - unsigned char ADCS1:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char ANS0:1; - unsigned char ANS1:1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char :1; - unsigned char :1; unsigned char :1; + unsigned char VRR:1; unsigned char :1; + unsigned char VREN:1; }; } __VRCON_bits_t; extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VR0 VRCON_bits.VR0 -#define RD VRCON_bits.RD -#define ANS0 VRCON_bits.ANS0 #define VR1 VRCON_bits.VR1 -#define WR VRCON_bits.WR -#define ANS1 VRCON_bits.ANS1 #define VR2 VRCON_bits.VR2 -#define WREN VRCON_bits.WREN -#define ANS2 VRCON_bits.ANS2 #define VR3 VRCON_bits.VR3 -#define WRERR VRCON_bits.WRERR -#define ANS3 VRCON_bits.ANS3 -#define ADCS0 VRCON_bits.ADCS0 #define VRR VRCON_bits.VRR -#define ADCS1 VRCON_bits.ADCS1 -#define ADCS2 VRCON_bits.ADCS2 #define VREN VRCON_bits.VREN // ----- WDTCON bits -------------------- diff --git a/device/include/pic/pic14regs.h b/device/include/pic/pic14regs.h index 9cee5b2e..e69de29b 100644 --- a/device/include/pic/pic14regs.h +++ b/device/include/pic/pic14regs.h @@ -1,22 +0,0 @@ -#ifndef __DEVICE_INCLUDE_PIC14REGS_H__ -#define __DEVICE_INCLUDE_PIC14REGS_H__ 1 - -#if defined(SDCC_PROCESSOR) - #ifndef _CONCAT - #undef _CONCAT2 - #define _CONCAT(a,b) _CONCAT2(a,b) - #define _CONCAT2(a,b) a ## b - #endif - - /* May not paste proc ## .h as pic16f877.h is no valid - * preprocessor token. So this is a bit fragile... */ - #define INC_PIC(proc) <_CONCAT(pic,proc).h> - - #include INC_PIC(SDCC_PROCESSOR) -#else - /* SDCC_PROCESSOR undefined */ - #warning SDCC_PROCESSOR undefined, no processor-specific header included. -#endif - -#endif /* __DEVICE_INCLUDE_PIC14REGS_H__ */ - diff --git a/device/include/pic/pic16c432.h b/device/include/pic/pic16c432.h index 9d9b500e..e95c58e9 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -41,7 +41,7 @@ #define TRISB_ADDR 0x0086 #define PIE1_ADDR 0x008C #define PCON_ADDR 0x008E -#define LININTF_ADDR 0x0090 +#define LINPRT_ADDR 0x0090 #define VRCON_ADDR 0x009F // @@ -116,7 +116,7 @@ extern __sfr __at (TRISA_ADDR) TRISA; extern __sfr __at (TRISB_ADDR) TRISB; extern __sfr __at (PIE1_ADDR) PIE1; extern __sfr __at (PCON_ADDR) PCON; -extern __sfr __at (LININTF_ADDR) LININTF; +extern __sfr __at (LINPRT_ADDR) LINPRT; extern __sfr __at (VRCON_ADDR) VRCON; //----- STATUS Bits -------------------------------------------------------- @@ -145,7 +145,7 @@ extern __sfr __at (VRCON_ADDR) VRCON; //----- VRCON Bits --------------------------------------------------------- -//----- LININTF Bits ---------------------------------------------------------- +//----- LINPRT Bits ---------------------------------------------------------- //========================================================================== @@ -228,7 +228,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE -// ----- LININTF bits -------------------- +// ----- LINPRT bits -------------------- typedef union { struct { unsigned char LINVDD:1; @@ -240,11 +240,11 @@ typedef union { unsigned char :1; unsigned char :1; }; -} __LININTF_bits_t; -extern volatile __LININTF_bits_t __at(LININTF_ADDR) LININTF_bits; +} __LINPRT_bits_t; +extern volatile __LINPRT_bits_t __at(LINPRT_ADDR) LINPRT_bits; -#define LINVDD LININTF_bits.LINVDD -#define LINTX LININTF_bits.LINTX +#define LINVDD LINPRT_bits.LINVDD +#define LINTX LINPRT_bits.LINTX // ----- OPTION_REG bits -------------------- typedef union { @@ -350,6 +350,30 @@ extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; #define LINRX PORTA_bits.LINRX +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -374,6 +398,30 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- VRCON bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c433.h b/device/include/pic/pic16c433.h index c9ac278c..94c6bc33 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // diff --git a/device/include/pic/pic16c554.h b/device/include/pic/pic16c554.h index a97ef4cb..011b5e2d 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -213,6 +213,52 @@ extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; #define NOT_POR PCON_bits.NOT_POR +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -237,4 +283,50 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c557.h b/device/include/pic/pic16c557.h index fead5033..0ed1e2f8 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -219,6 +219,76 @@ extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; #define NOT_POR PCON_bits.NOT_POR +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -243,4 +313,74 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + #endif diff --git a/device/include/pic/pic16c558.h b/device/include/pic/pic16c558.h index c822505f..70d05c3b 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -215,6 +215,52 @@ extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; #define NOT_POR PCON_bits.NOT_POR +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -239,4 +285,50 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c62.h b/device/include/pic/pic16c62.h index ca82dfb8..34f5873d 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -333,6 +333,76 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CCP1IF PIR1_bits.CCP1IF #define SSPIF PIR1_bits.SSPIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -521,4 +591,74 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + #endif diff --git a/device/include/pic/pic16c620.h b/device/include/pic/pic16c620.h index a6770b6f..31db1685 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -305,6 +305,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -329,6 +375,52 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- VRCON bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c620a.h b/device/include/pic/pic16c620a.h index 5d068d05..9b1bef56 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -311,6 +311,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -335,6 +381,52 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- VRCON bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c621.h b/device/include/pic/pic16c621.h index 3b80fffa..07fb4a6c 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -306,6 +306,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -330,6 +376,52 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- VRCON bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c621a.h b/device/include/pic/pic16c621a.h index 81911f5c..c2064b78 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -307,6 +307,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -331,6 +377,52 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- VRCON bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c622.h b/device/include/pic/pic16c622.h index 8cba128f..e03a4b3b 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -306,6 +306,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -330,6 +376,52 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- VRCON bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c622a.h b/device/include/pic/pic16c622a.h index c415652d..5a4a2909 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -307,6 +307,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -331,6 +377,52 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- VRCON bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c63a.h b/device/include/pic/pic16c63a.h index 70fc8b26..d611fcd2 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -442,6 +442,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define CCP2IF PIR2_bits.CCP2IF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -689,6 +759,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c65b.h b/device/include/pic/pic16c65b.h index 560346b1..efdca384 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -454,6 +454,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define CCP2IF PIR2_bits.CCP2IF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -701,6 +814,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c71.h b/device/include/pic/pic16c71.h index 9cb48513..0163f0c9 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -266,6 +266,52 @@ extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; #define INTEDG OPTION_REG_bits.INTEDG #define NOT_RBPU OPTION_REG_bits.NOT_RBPU +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -290,4 +336,50 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c710.h b/device/include/pic/pic16c710.h index aebe5ee6..129e4c24 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -302,6 +302,52 @@ extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -326,4 +372,50 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c711.h b/device/include/pic/pic16c711.h index 40f930b7..42064aff 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -302,6 +302,52 @@ extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; #define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -326,4 +372,50 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c715.h b/device/include/pic/pic16c715.h index 067e60f5..d13c37dd 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -352,6 +352,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define ADIF PIR1_bits.ADIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -376,4 +422,50 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c717.h b/device/include/pic/pic16c717.h index c026017c..58b32c07 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -203,7 +203,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- @@ -563,6 +563,52 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- REFCON bits -------------------- typedef union { struct { @@ -797,4 +843,50 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c72.h b/device/include/pic/pic16c72.h index 62ba6069..36fe8d95 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -426,6 +426,76 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define SSPIF PIR1_bits.SSPIF #define ADIF PIR1_bits.ADIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -603,4 +673,74 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + #endif diff --git a/device/include/pic/pic16c73b.h b/device/include/pic/pic16c73b.h index 31153747..d29df737 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -520,6 +520,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define CCP2IF PIR2_bits.CCP2IF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -767,6 +837,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c745.h b/device/include/pic/pic16c745.h index 1b7fea0c..94ce8fef 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -282,7 +282,7 @@ extern __sfr __at (BD2IAL_ADDR) BD2IAL; //----- UCTRL Bits --------------------------------------------------------- -//----- UEP0/UEP1/UEP2 Bits ------------------------------------------------ +//----- UEPn Bits --------------------------------------------------------- //----- Buffer descriptor Bits --------------------------------------------- @@ -585,6 +585,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define CCP2IF PIR2_bits.CCP2IF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -722,6 +792,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { @@ -813,7 +953,7 @@ extern volatile __UEIE_bits_t __at(UEIE_ADDR) UEIE_bits; #define OWN_ERR UEIE_bits.OWN_ERR #define BTS_ERR UEIE_bits.BTS_ERR -// ----- UEP2 bits -------------------- +// ----- UEP0 bits -------------------- typedef union { struct { unsigned char EP_STALL:1; @@ -845,22 +985,22 @@ typedef union { unsigned char :1; unsigned char :1; }; -} __UEP2_bits_t; -extern volatile __UEP2_bits_t __at(UEP2_ADDR) UEP2_bits; - -#define EP_STALL UEP2_bits.EP_STALL -#define EP_IN_EN UEP2_bits.EP_IN_EN -#define EP_OUT_EN UEP2_bits.EP_OUT_EN -#define BSTALL UEP2_bits.BSTALL -#define PID0 UEP2_bits.PID0 -#define EP_CTL_DIS UEP2_bits.EP_CTL_DIS -#define DTS UEP2_bits.DTS -#define PID1 UEP2_bits.PID1 -#define PID2 UEP2_bits.PID2 -#define PID3 UEP2_bits.PID3 -#define DATA01 UEP2_bits.DATA01 -#define UOWN UEP2_bits.UOWN -#define OWN UEP2_bits.OWN +} __UEP0_bits_t; +extern volatile __UEP0_bits_t __at(UEP0_ADDR) UEP0_bits; + +#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 +#define BSTALL UEP0_bits.BSTALL +#define PID0 UEP0_bits.PID0 +#define EP_CTL_DIS UEP0_bits.EP_CTL_DIS +#define DTS UEP0_bits.DTS +#define PID1 UEP0_bits.PID1 +#define PID2 UEP0_bits.PID2 +#define PID3 UEP0_bits.PID3 +#define DATA01 UEP0_bits.DATA01 +#define UOWN UEP0_bits.UOWN +#define OWN UEP0_bits.OWN // ----- UIE bits -------------------- typedef union { diff --git a/device/include/pic/pic16c74b.h b/device/include/pic/pic16c74b.h index b8091c3c..90b99c96 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -532,6 +532,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define CCP2IF PIR2_bits.CCP2IF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -779,6 +892,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c765.h b/device/include/pic/pic16c765.h index b78e39dc..a8eb4100 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -292,7 +292,7 @@ extern __sfr __at (BD2IAL_ADDR) BD2IAL; //----- UCTRL Bits --------------------------------------------------------- -//----- UEP0/UEP1/UEP2 Bits ------------------------------------------------ +//----- UEPn Bits --------------------------------------------------------- //----- Buffer descriptor Bits --------------------------------------------- @@ -597,6 +597,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define CCP2IF PIR2_bits.CCP2IF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -734,6 +847,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { @@ -848,7 +1055,7 @@ extern volatile __UEIE_bits_t __at(UEIE_ADDR) UEIE_bits; #define OWN_ERR UEIE_bits.OWN_ERR #define BTS_ERR UEIE_bits.BTS_ERR -// ----- UEP2 bits -------------------- +// ----- UEP0 bits -------------------- typedef union { struct { unsigned char EP_STALL:1; @@ -880,22 +1087,22 @@ typedef union { unsigned char :1; unsigned char :1; }; -} __UEP2_bits_t; -extern volatile __UEP2_bits_t __at(UEP2_ADDR) UEP2_bits; - -#define EP_STALL UEP2_bits.EP_STALL -#define EP_IN_EN UEP2_bits.EP_IN_EN -#define EP_OUT_EN UEP2_bits.EP_OUT_EN -#define BSTALL UEP2_bits.BSTALL -#define PID0 UEP2_bits.PID0 -#define EP_CTL_DIS UEP2_bits.EP_CTL_DIS -#define DTS UEP2_bits.DTS -#define PID1 UEP2_bits.PID1 -#define PID2 UEP2_bits.PID2 -#define PID3 UEP2_bits.PID3 -#define DATA01 UEP2_bits.DATA01 -#define UOWN UEP2_bits.UOWN -#define OWN UEP2_bits.OWN +} __UEP0_bits_t; +extern volatile __UEP0_bits_t __at(UEP0_ADDR) UEP0_bits; + +#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 +#define BSTALL UEP0_bits.BSTALL +#define PID0 UEP0_bits.PID0 +#define EP_CTL_DIS UEP0_bits.EP_CTL_DIS +#define DTS UEP0_bits.DTS +#define PID1 UEP0_bits.PID1 +#define PID2 UEP0_bits.PID2 +#define PID3 UEP0_bits.PID3 +#define DATA01 UEP0_bits.DATA01 +#define UOWN UEP0_bits.UOWN +#define OWN UEP0_bits.OWN // ----- UIE bits -------------------- typedef union { diff --git a/device/include/pic/pic16c770.h b/device/include/pic/pic16c770.h index 0717b6c8..3066a3c3 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -203,7 +203,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- @@ -563,6 +563,52 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- REFCON bits -------------------- typedef union { struct { @@ -797,4 +843,50 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c771.h b/device/include/pic/pic16c771.h index 53a7bf56..e9c5449b 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -202,7 +202,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- @@ -563,6 +563,52 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- REFCON bits -------------------- typedef union { struct { @@ -797,4 +843,50 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c773.h b/device/include/pic/pic16c773.h index 1bc173d4..4037658e 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -210,7 +210,7 @@ extern __sfr __at (ADCON1_ADDR) ADCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -576,6 +576,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -879,6 +949,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c774.h b/device/include/pic/pic16c774.h index 0763d1d5..77f2efc5 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -218,7 +218,7 @@ extern __sfr __at (ADCON1_ADDR) ADCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- TRISE Bits --------------------------------------------------------- @@ -586,6 +586,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define BCLIF PIR2_bits.BCLIF #define LVDIF PIR2_bits.LVDIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -889,6 +1002,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c781.h b/device/include/pic/pic16c781.h index f3e77d64..2e9c3d88 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -179,7 +179,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -218,7 +218,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- OPACON Bits ------------------------------------------------------- -//----- DACON0 Bits -------------------------------------------------------- +//----- DACON Bits -------------------------------------------------------- //----- PMCON1 Bits ------------------------------------------------------- @@ -618,6 +618,52 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- PSMCCON0 bits -------------------- typedef union { struct { @@ -763,4 +809,50 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define TMR1GE T1CON_bits.TMR1GE +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c782.h b/device/include/pic/pic16c782.h index 36317f05..9f08b09a 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -179,7 +179,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -218,7 +218,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- OPACON Bits ------------------------------------------------------- -//----- DACON0 Bits -------------------------------------------------------- +//----- DACON Bits -------------------------------------------------------- //----- PMCON1 Bits ------------------------------------------------------- @@ -618,6 +618,52 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- PSMCCON0 bits -------------------- typedef union { struct { @@ -763,4 +809,50 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define TMR1GE T1CON_bits.TMR1GE +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16c925.h b/device/include/pic/pic16c925.h index 47f160e9..2737c46e 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -268,6 +268,9 @@ extern __sfr __at (PMADRH_ADDR) PMADRH; //----- SSPSTAT Bits ------------------------------------------------------- +//----- ADCON1 Bits -------------------------------------------------------- + + //----- LCDSE Bits --------------------------------------------------------- @@ -597,6 +600,119 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -787,6 +903,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16c926.h b/device/include/pic/pic16c926.h index 5421c70e..89d675f0 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -268,6 +268,9 @@ extern __sfr __at (PMADRH_ADDR) PMADRH; //----- SSPSTAT Bits ------------------------------------------------------- +//----- ADCON1 Bits -------------------------------------------------------- + + //----- LCDSE Bits --------------------------------------------------------- @@ -597,6 +600,119 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -787,6 +903,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f627.h b/device/include/pic/pic16f627.h index 16790462..f4300d83 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -434,6 +434,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -527,6 +573,52 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f627a.h b/device/include/pic/pic16f627a.h index b3c5a86b..180c6e46 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -438,6 +438,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -531,6 +577,52 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f628.h b/device/include/pic/pic16f628.h index 3cb50aae..7e4152cd 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -434,6 +434,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -527,6 +573,52 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f628a.h b/device/include/pic/pic16f628a.h index 05ad1ebf..7e087d05 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -439,6 +439,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -532,6 +578,52 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f630.h b/device/include/pic/pic16f630.h index 379742af..fdc5acab 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -160,7 +160,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- T1CON Bits --------------------------------------------------------- -//----- CMCON Bits -------------------------------------------------------- +//----- COMCON Bits -------------------------------------------------------- //----- OPTION Bits -------------------------------------------------------- @@ -242,6 +242,26 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define CINV CMCON_bits.CINV #define COUT CMCON_bits.COUT +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- INTCON bits -------------------- typedef union { struct { @@ -403,6 +423,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -450,6 +516,52 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define TMR1GE T1CON_bits.TMR1GE +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- VRCON bits -------------------- typedef union { struct { @@ -462,27 +574,13 @@ typedef union { unsigned char :1; unsigned char VREN:1; }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; } __VRCON_bits_t; extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VR0 VRCON_bits.VR0 -#define RD VRCON_bits.RD #define VR1 VRCON_bits.VR1 -#define WR VRCON_bits.WR #define VR2 VRCON_bits.VR2 -#define WREN VRCON_bits.WREN #define VR3 VRCON_bits.VR3 -#define WRERR VRCON_bits.WRERR #define VRR VRCON_bits.VRR #define VREN VRCON_bits.VREN diff --git a/device/include/pic/pic16f636.h b/device/include/pic/pic16f636.h index 4cdc776a..e23fced8 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -317,6 +317,46 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define C2SYNC CMCON1_bits.C2SYNC #define T1GSS CMCON1_bits.T1GSS +// ----- CRCON bits -------------------- +typedef union { + struct { + unsigned char CRREG0:1; + unsigned char CRREG1:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ENC_DEC:1; + unsigned char GO:1; + }; +} __CRCON_bits_t; +extern volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; + +#define CRREG0 CRCON_bits.CRREG0 +#define CRREG1 CRCON_bits.CRREG1 +#define ENC_DEC CRCON_bits.ENC_DEC +#define GO CRCON_bits.GO + +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- INTCON bits -------------------- typedef union { struct { @@ -341,6 +381,49 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + +// ----- LVDCON bits -------------------- +typedef union { + struct { + unsigned char LVDL0:1; + unsigned char LVDL1:1; + unsigned char LVDL2:1; + unsigned char :1; + unsigned char LVDEN:1; + unsigned char IRVST:1; + unsigned char :1; + unsigned char :1; + }; +} __LVDCON_bits_t; +extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; + +#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 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -396,76 +479,6 @@ typedef union { unsigned char TUN2:1; unsigned char TUN3:1; unsigned char TUN4:1; - unsigned char IOCA5:1; - unsigned char ENC_DEC:1; - unsigned char VREN:1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char IOCA3:1; - unsigned char IOCA4:1; - unsigned char VRR:1; - unsigned char :1; - unsigned char GO:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char LVDEN:1; - unsigned char IRVST:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char VR0:1; - unsigned char VR1:1; - unsigned char VR2:1; - unsigned char VR3:1; - unsigned char WDA4:1; - unsigned char WDA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char CRREG0:1; - unsigned char CRREG1:1; - unsigned char LVDL2:1; - unsigned char :1; - unsigned char WPUDA4:1; - unsigned char WPUDA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char LVDL0:1; - unsigned char LVDL1:1; - unsigned char WDA2:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char WDA0:1; - unsigned char WDA1:1; - unsigned char WPUDA2:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char WPUDA0:1; - unsigned char WPUDA1:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -474,45 +487,10 @@ typedef union { extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define TUN0 OSCTUNE_bits.TUN0 -#define IOCA0 OSCTUNE_bits.IOCA0 -#define RD OSCTUNE_bits.RD -#define VR0 OSCTUNE_bits.VR0 -#define CRREG0 OSCTUNE_bits.CRREG0 -#define LVDL0 OSCTUNE_bits.LVDL0 -#define WDA0 OSCTUNE_bits.WDA0 -#define WPUDA0 OSCTUNE_bits.WPUDA0 #define TUN1 OSCTUNE_bits.TUN1 -#define IOCA1 OSCTUNE_bits.IOCA1 -#define WR OSCTUNE_bits.WR -#define VR1 OSCTUNE_bits.VR1 -#define CRREG1 OSCTUNE_bits.CRREG1 -#define LVDL1 OSCTUNE_bits.LVDL1 -#define WDA1 OSCTUNE_bits.WDA1 -#define WPUDA1 OSCTUNE_bits.WPUDA1 #define TUN2 OSCTUNE_bits.TUN2 -#define IOCA2 OSCTUNE_bits.IOCA2 -#define WREN OSCTUNE_bits.WREN -#define VR2 OSCTUNE_bits.VR2 -#define LVDL2 OSCTUNE_bits.LVDL2 -#define WDA2 OSCTUNE_bits.WDA2 -#define WPUDA2 OSCTUNE_bits.WPUDA2 #define TUN3 OSCTUNE_bits.TUN3 -#define IOCA3 OSCTUNE_bits.IOCA3 -#define WRERR OSCTUNE_bits.WRERR -#define VR3 OSCTUNE_bits.VR3 #define TUN4 OSCTUNE_bits.TUN4 -#define IOCA4 OSCTUNE_bits.IOCA4 -#define LVDEN OSCTUNE_bits.LVDEN -#define WDA4 OSCTUNE_bits.WDA4 -#define WPUDA4 OSCTUNE_bits.WPUDA4 -#define IOCA5 OSCTUNE_bits.IOCA5 -#define VRR OSCTUNE_bits.VRR -#define IRVST OSCTUNE_bits.IRVST -#define WDA5 OSCTUNE_bits.WDA5 -#define WPUDA5 OSCTUNE_bits.WPUDA5 -#define ENC_DEC OSCTUNE_bits.ENC_DEC -#define VREN OSCTUNE_bits.VREN -#define GO OSCTUNE_bits.GO // ----- PCON bits -------------------- typedef union { @@ -581,6 +559,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define LVDIF PIR1_bits.LVDIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -629,6 +653,95 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define TMR1GE T1CON_bits.TMR1GE #define T1GINV T1CON_bits.T1GINV +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- VRCON bits -------------------- +typedef union { + struct { + unsigned char VR0:1; + unsigned char VR1:1; + unsigned char VR2:1; + unsigned char VR3:1; + unsigned char :1; + unsigned char VRR:1; + unsigned char :1; + unsigned char VREN:1; + }; +} __VRCON_bits_t; +extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; + +#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 + +// ----- WDA bits -------------------- +typedef union { + struct { + unsigned char WDA0:1; + unsigned char WDA1:1; + unsigned char WDA2:1; + unsigned char :1; + unsigned char WDA4:1; + unsigned char WDA5:1; + unsigned char :1; + unsigned char :1; + }; +} __WDA_bits_t; +extern volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; + +#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 + // ----- WDTCON bits -------------------- typedef union { struct { @@ -650,4 +763,25 @@ extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +// ----- WPUDA bits -------------------- +typedef union { + struct { + unsigned char WPUDA0:1; + unsigned char WPUDA1:1; + unsigned char WPUDA2:1; + unsigned char :1; + unsigned char WPUDA4:1; + unsigned char WPUDA5:1; + unsigned char :1; + unsigned char :1; + }; +} __WPUDA_bits_t; +extern volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; + +#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 diff --git a/device/include/pic/pic16f639.h b/device/include/pic/pic16f639.h index f1348c9c..817d1ecb 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -127,18 +127,20 @@ extern __sfr __at (PCLATH_ADDR) PCLATH; extern __sfr __at (INTCON_ADDR) INTCON; extern __sfr __at (PIR1_ADDR) PIR1; -extern __sfr __at (TMR1L_ADDR) TMR1L; -extern __sfr __at (TMR1H_ADDR) TMR1H; -extern __sfr __at (T1CON_ADDR) T1CON; +extern __sfr __at (TMR1L_ADDR) TMR1L; +extern __sfr __at (TMR1H_ADDR) TMR1H; +extern __sfr __at (T1CON_ADDR) T1CON; extern __sfr __at (WDTCON_ADDR) WDTCON; -extern __sfr __at (CMCON0_ADDR) CMCON0; -extern __sfr __at (CMCON1_ADDR) CMCON1; +extern __sfr __at (CMCON0_ADDR) CMCON0; +extern __sfr __at (CMCON1_ADDR) CMCON1; //Bank 1 extern __sfr __at (OPTION_REG_ADDR) OPTION_REG; + extern __sfr __at (TRISA_ADDR) TRISA; extern __sfr __at (TRISC_ADDR) TRISC; + extern __sfr __at (PIE1_ADDR) PIE1; extern __sfr __at (PCON_ADDR) PCON; @@ -151,9 +153,9 @@ extern __sfr __at (IOCA_ADDR) IOCA; extern __sfr __at (WDA_ADDR) WDA; extern __sfr __at (VRCON_ADDR) VRCON; -extern __sfr __at (EEDAT_ADDR) EEDAT; -extern __sfr __at (EEDATA_ADDR) EEDATA; -extern __sfr __at (EEADR_ADDR) EEADR; +extern __sfr __at (EEDAT_ADDR) EEDAT; +extern __sfr __at (EEDATA_ADDR) EEDATA; +extern __sfr __at (EEADR_ADDR) EEADR; extern __sfr __at (EECON1_ADDR) EECON1; extern __sfr __at (EECON2_ADDR) EECON2; @@ -232,8 +234,8 @@ extern __sfr __at (CRDAT3_ADDR) CRDAT3; // __MAXRAM H'1FF' // __BADRAM H'06', H'08'-H'09', H'0D', H'11'-H'17', H'1B'-H'1F' // __BADRAM H'86', H'88'-H'89', H'8D', H'91'-H'93', H'98', H'9E'-H'9F', H'C0'-H'EF' -// __BADRAM H'10C'-H'10F', H'115'-H'16F', H'106', H'108'-H'109', H'186' -// __BADRAM H'188'-H'189', H'18C'-H'1EF' +// __BADRAM H'10C'-H'10F', H'115'-H'16F', H'106', H'108'-H'109', H'186' +// __BADRAM H'188'-H'189', H'18C'-H'1EF' //========================================================================== // @@ -313,6 +315,46 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define C2SYNC CMCON1_bits.C2SYNC #define T1GSS CMCON1_bits.T1GSS +// ----- CRCON bits -------------------- +typedef union { + struct { + unsigned char CRREG0:1; + unsigned char CRREG1:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ENC_DEC:1; + unsigned char GO:1; + }; +} __CRCON_bits_t; +extern volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; + +#define CRREG0 CRCON_bits.CRREG0 +#define CRREG1 CRCON_bits.CRREG1 +#define ENC_DEC CRCON_bits.ENC_DEC +#define GO CRCON_bits.GO + +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- INTCON bits -------------------- typedef union { struct { @@ -337,6 +379,49 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + +// ----- LVDCON bits -------------------- +typedef union { + struct { + unsigned char LVDL0:1; + unsigned char LVDL1:1; + unsigned char LVDL2:1; + unsigned char :1; + unsigned char LVDEN:1; + unsigned char IRVST:1; + unsigned char :1; + unsigned char :1; + }; +} __LVDCON_bits_t; +extern volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; + +#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 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -392,76 +477,6 @@ typedef union { unsigned char TUN2:1; unsigned char TUN3:1; unsigned char TUN4:1; - unsigned char IOCA5:1; - unsigned char ENC_DEC:1; - unsigned char VREN:1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char IOCA3:1; - unsigned char IOCA4:1; - unsigned char VRR:1; - unsigned char :1; - unsigned char GO:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char LVDEN:1; - unsigned char IRVST:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char VR0:1; - unsigned char VR1:1; - unsigned char VR2:1; - unsigned char VR3:1; - unsigned char WDA4:1; - unsigned char WDA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char CRREG0:1; - unsigned char CRREG1:1; - unsigned char LVDL2:1; - unsigned char :1; - unsigned char WPUDA4:1; - unsigned char WPUDA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char LVDL0:1; - unsigned char LVDL1:1; - unsigned char WDA2:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char WDA0:1; - unsigned char WDA1:1; - unsigned char WPUDA2:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char WPUDA0:1; - unsigned char WPUDA1:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -470,45 +485,10 @@ typedef union { extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define TUN0 OSCTUNE_bits.TUN0 -#define IOCA0 OSCTUNE_bits.IOCA0 -#define RD OSCTUNE_bits.RD -#define VR0 OSCTUNE_bits.VR0 -#define CRREG0 OSCTUNE_bits.CRREG0 -#define LVDL0 OSCTUNE_bits.LVDL0 -#define WDA0 OSCTUNE_bits.WDA0 -#define WPUDA0 OSCTUNE_bits.WPUDA0 #define TUN1 OSCTUNE_bits.TUN1 -#define IOCA1 OSCTUNE_bits.IOCA1 -#define WR OSCTUNE_bits.WR -#define VR1 OSCTUNE_bits.VR1 -#define CRREG1 OSCTUNE_bits.CRREG1 -#define LVDL1 OSCTUNE_bits.LVDL1 -#define WDA1 OSCTUNE_bits.WDA1 -#define WPUDA1 OSCTUNE_bits.WPUDA1 #define TUN2 OSCTUNE_bits.TUN2 -#define IOCA2 OSCTUNE_bits.IOCA2 -#define WREN OSCTUNE_bits.WREN -#define VR2 OSCTUNE_bits.VR2 -#define LVDL2 OSCTUNE_bits.LVDL2 -#define WDA2 OSCTUNE_bits.WDA2 -#define WPUDA2 OSCTUNE_bits.WPUDA2 #define TUN3 OSCTUNE_bits.TUN3 -#define IOCA3 OSCTUNE_bits.IOCA3 -#define WRERR OSCTUNE_bits.WRERR -#define VR3 OSCTUNE_bits.VR3 #define TUN4 OSCTUNE_bits.TUN4 -#define IOCA4 OSCTUNE_bits.IOCA4 -#define LVDEN OSCTUNE_bits.LVDEN -#define WDA4 OSCTUNE_bits.WDA4 -#define WPUDA4 OSCTUNE_bits.WPUDA4 -#define IOCA5 OSCTUNE_bits.IOCA5 -#define VRR OSCTUNE_bits.VRR -#define IRVST OSCTUNE_bits.IRVST -#define WDA5 OSCTUNE_bits.WDA5 -#define WPUDA5 OSCTUNE_bits.WPUDA5 -#define ENC_DEC OSCTUNE_bits.ENC_DEC -#define VREN OSCTUNE_bits.VREN -#define GO OSCTUNE_bits.GO // ----- PCON bits -------------------- typedef union { @@ -577,6 +557,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define LVDIF PIR1_bits.LVDIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -625,6 +651,95 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define TMR1GE T1CON_bits.TMR1GE #define T1GINV T1CON_bits.T1GINV +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- VRCON bits -------------------- +typedef union { + struct { + unsigned char VR0:1; + unsigned char VR1:1; + unsigned char VR2:1; + unsigned char VR3:1; + unsigned char :1; + unsigned char VRR:1; + unsigned char :1; + unsigned char VREN:1; + }; +} __VRCON_bits_t; +extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; + +#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 + +// ----- WDA bits -------------------- +typedef union { + struct { + unsigned char WDA0:1; + unsigned char WDA1:1; + unsigned char WDA2:1; + unsigned char :1; + unsigned char WDA4:1; + unsigned char WDA5:1; + unsigned char :1; + unsigned char :1; + }; +} __WDA_bits_t; +extern volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; + +#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 + // ----- WDTCON bits -------------------- typedef union { struct { @@ -646,4 +761,25 @@ extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +// ----- WPUDA bits -------------------- +typedef union { + struct { + unsigned char WPUDA0:1; + unsigned char WPUDA1:1; + unsigned char WPUDA2:1; + unsigned char :1; + unsigned char WPUDA4:1; + unsigned char WPUDA5:1; + unsigned char :1; + unsigned char :1; + }; +} __WPUDA_bits_t; +extern volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; + +#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 diff --git a/device/include/pic/pic16f648a.h b/device/include/pic/pic16f648a.h index 3724eea8..b990035b 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -437,6 +437,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CMIF PIR1_bits.CMIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -530,6 +576,52 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f676.h b/device/include/pic/pic16f676.h index 9cfcf7dc..871e82c5 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -174,7 +174,7 @@ extern __sfr __at (ADCON1_ADDR) ADCON1; //----- T1CON Bits --------------------------------------------------------- -//----- CMCON Bits -------------------------------------------------------- +//----- COMCON Bits -------------------------------------------------------- //----- ADCON0 Bits -------------------------------------------------------- @@ -288,6 +288,49 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ADCON1 bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ADCON1_bits_t; +extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; + +#define ADCS0 ADCON1_bits.ADCS0 +#define ADCS1 ADCON1_bits.ADCS1 +#define ADCS2 ADCON1_bits.ADCS2 + +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#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 +#define ANS5 ANSEL_bits.ANS5 +#define ANS6 ANSEL_bits.ANS6 +#define ANS7 ANSEL_bits.ANS7 + // ----- CMCON bits -------------------- typedef union { struct { @@ -310,6 +353,26 @@ extern volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; #define CINV CMCON_bits.CINV #define COUT CMCON_bits.COUT +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- INTCON bits -------------------- typedef union { struct { @@ -372,8 +435,8 @@ extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; // ----- OSCCAL bits -------------------- typedef union { struct { - unsigned char ANS0:1; - unsigned char ANS1:1; + unsigned char :1; + unsigned char :1; unsigned char CAL0:1; unsigned char CAL1:1; unsigned char CAL2:1; @@ -381,33 +444,15 @@ typedef union { unsigned char CAL4:1; unsigned char CAL5:1; }; - struct { - unsigned char :1; - unsigned char :1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char ANS4:1; - unsigned char ANS5:1; - unsigned char ANS6:1; - unsigned char ANS7:1; - }; } __OSCCAL_bits_t; extern volatile __OSCCAL_bits_t __at(OSCCAL_ADDR) OSCCAL_bits; -#define ANS0 OSCCAL_bits.ANS0 -#define ANS1 OSCCAL_bits.ANS1 #define CAL0 OSCCAL_bits.CAL0 -#define ANS2 OSCCAL_bits.ANS2 #define CAL1 OSCCAL_bits.CAL1 -#define ANS3 OSCCAL_bits.ANS3 #define CAL2 OSCCAL_bits.CAL2 -#define ANS4 OSCCAL_bits.ANS4 #define CAL3 OSCCAL_bits.CAL3 -#define ANS5 OSCCAL_bits.ANS5 #define CAL4 OSCCAL_bits.CAL4 -#define ANS6 OSCCAL_bits.ANS6 #define CAL5 OSCCAL_bits.CAL5 -#define ANS7 OSCCAL_bits.ANS7 // ----- PCON bits -------------------- typedef union { @@ -489,6 +534,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -536,6 +627,52 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define T1CKPS1 T1CON_bits.T1CKPS1 #define TMR1GE T1CON_bits.TMR1GE +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- VRCON bits -------------------- typedef union { struct { @@ -543,36 +680,19 @@ typedef union { unsigned char VR1:1; unsigned char VR2:1; unsigned char VR3:1; - unsigned char ADCS0:1; - unsigned char VRR:1; - unsigned char ADCS2:1; - unsigned char VREN:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char :1; - unsigned char ADCS1:1; unsigned char :1; + unsigned char VRR:1; unsigned char :1; + unsigned char VREN:1; }; } __VRCON_bits_t; extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VR0 VRCON_bits.VR0 -#define RD VRCON_bits.RD #define VR1 VRCON_bits.VR1 -#define WR VRCON_bits.WR #define VR2 VRCON_bits.VR2 -#define WREN VRCON_bits.WREN #define VR3 VRCON_bits.VR3 -#define WRERR VRCON_bits.WRERR -#define ADCS0 VRCON_bits.ADCS0 #define VRR VRCON_bits.VRR -#define ADCS1 VRCON_bits.ADCS1 -#define ADCS2 VRCON_bits.ADCS2 #define VREN VRCON_bits.VREN #endif diff --git a/device/include/pic/pic16f684.h b/device/include/pic/pic16f684.h index 459a813f..37311051 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -211,10 +211,10 @@ extern __sfr __at (ADCON1_ADDR) ADCON1; //----- WDTCON Bits -------------------------------------------------------- -//----- CMCON0 Bits ------------------------------------------------------- +//----- COMCON0 Bits ------------------------------------------------------- -//----- CMCON1 Bits ------------------------------------------------------- +//----- COMCON1 Bits ------------------------------------------------------- //----- ADCON0 Bits -------------------------------------------------------- @@ -347,6 +347,49 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ADCON1 bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ADCON1_bits_t; +extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; + +#define ADCS0 ADCON1_bits.ADCS0 +#define ADCS1 ADCON1_bits.ADCS1 +#define ADCS2 ADCON1_bits.ADCS2 + +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#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 +#define ANS5 ANSEL_bits.ANS5 +#define ANS6 ANSEL_bits.ANS6 +#define ANS7 ANSEL_bits.ANS7 + // ----- CCP1CON bits -------------------- typedef union { struct { @@ -437,6 +480,26 @@ extern volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; #define ECCPAS2 ECCPAS_bits.ECCPAS2 #define ECCPASE ECCPAS_bits.ECCPASE +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- INTCON bits -------------------- typedef union { struct { @@ -461,6 +524,50 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOC bits -------------------- +typedef union { + struct { + unsigned char IOC0:1; + unsigned char IOC1:1; + unsigned char IOC2:1; + unsigned char IOC3:1; + unsigned char IOC4:1; + unsigned char IOC5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOC_bits_t; +extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; + +#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 + +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -516,36 +623,6 @@ typedef union { unsigned char TUN2:1; unsigned char TUN3:1; unsigned char TUN4:1; - unsigned char ANS5:1; - unsigned char ANS6:1; - unsigned char ANS7:1; - }; - struct { - unsigned char ANS0:1; - unsigned char ANS1:1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char ANS4:1; - unsigned char IOC5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOC0:1; - unsigned char IOC1:1; - unsigned char IOC2:1; - unsigned char IOC3:1; - unsigned char IOC4:1; - unsigned char IOCA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char IOCA3:1; - unsigned char IOCA4:1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -554,30 +631,10 @@ typedef union { extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define TUN0 OSCTUNE_bits.TUN0 -#define ANS0 OSCTUNE_bits.ANS0 -#define IOC0 OSCTUNE_bits.IOC0 -#define IOCA0 OSCTUNE_bits.IOCA0 #define TUN1 OSCTUNE_bits.TUN1 -#define ANS1 OSCTUNE_bits.ANS1 -#define IOC1 OSCTUNE_bits.IOC1 -#define IOCA1 OSCTUNE_bits.IOCA1 #define TUN2 OSCTUNE_bits.TUN2 -#define ANS2 OSCTUNE_bits.ANS2 -#define IOC2 OSCTUNE_bits.IOC2 -#define IOCA2 OSCTUNE_bits.IOCA2 #define TUN3 OSCTUNE_bits.TUN3 -#define ANS3 OSCTUNE_bits.ANS3 -#define IOC3 OSCTUNE_bits.IOC3 -#define IOCA3 OSCTUNE_bits.IOCA3 #define TUN4 OSCTUNE_bits.TUN4 -#define ANS4 OSCTUNE_bits.ANS4 -#define IOC4 OSCTUNE_bits.IOC4 -#define IOCA4 OSCTUNE_bits.IOCA4 -#define ANS5 OSCTUNE_bits.ANS5 -#define IOC5 OSCTUNE_bits.IOC5 -#define IOCA5 OSCTUNE_bits.IOCA5 -#define ANS6 OSCTUNE_bits.ANS6 -#define ANS7 OSCTUNE_bits.ANS7 // ----- PCON bits -------------------- typedef union { @@ -671,6 +728,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- PWM1CON bits -------------------- typedef union { struct { @@ -766,6 +869,52 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- VRCON bits -------------------- typedef union { struct { @@ -773,36 +922,19 @@ typedef union { unsigned char VR1:1; unsigned char VR2:1; unsigned char VR3:1; - unsigned char ADCS0:1; - unsigned char VRR:1; - unsigned char ADCS2:1; - unsigned char VREN:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char :1; - unsigned char ADCS1:1; unsigned char :1; + unsigned char VRR:1; unsigned char :1; + unsigned char VREN:1; }; } __VRCON_bits_t; extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VR0 VRCON_bits.VR0 -#define RD VRCON_bits.RD #define VR1 VRCON_bits.VR1 -#define WR VRCON_bits.WR #define VR2 VRCON_bits.VR2 -#define WREN VRCON_bits.WREN #define VR3 VRCON_bits.VR3 -#define WRERR VRCON_bits.WRERR -#define ADCS0 VRCON_bits.ADCS0 #define VRR VRCON_bits.VRR -#define ADCS1 VRCON_bits.ADCS1 -#define ADCS2 VRCON_bits.ADCS2 #define VREN VRCON_bits.VREN // ----- WDTCON bits -------------------- diff --git a/device/include/pic/pic16f685.h b/device/include/pic/pic16f685.h index d59f79ef..44626182 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -429,6 +429,49 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ADCON1 bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ADCON1_bits_t; +extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; + +#define ADCS0 ADCON1_bits.ADCS0 +#define ADCS1 ADCON1_bits.ADCS1 +#define ADCS2 ADCON1_bits.ADCS2 + +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#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 +#define ANS5 ANSEL_bits.ANS5 +#define ANS6 ANSEL_bits.ANS6 +#define ANS7 ANSEL_bits.ANS7 + // ----- CCP1CON bits -------------------- typedef union { struct { @@ -504,74 +547,20 @@ typedef union { struct { unsigned char C2SYNC:1; unsigned char T1GSS:1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char ANS4:1; - unsigned char ANS5:1; - unsigned char MC2OUT:1; - unsigned char MC1OUT:1; - }; - struct { - unsigned char ANS0:1; - unsigned char ANS1:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char STRSYNC:1; - unsigned char C1SEN:1; - unsigned char ANS6:1; - unsigned char ANS7:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char STRC:1; - unsigned char STRD:1; - unsigned char C2REN:1; unsigned char :1; - unsigned char SR0:1; - unsigned char EEPGD:1; - }; - struct { - unsigned char STRA:1; - unsigned char STRB:1; - unsigned char PULSR:1; - unsigned char PULSS:1; unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char SR1:1; + unsigned char MC2OUT:1; + unsigned char MC1OUT:1; }; } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; #define C2SYNC CM2CON1_bits.C2SYNC -#define ANS0 CM2CON1_bits.ANS0 -#define RD CM2CON1_bits.RD -#define STRA CM2CON1_bits.STRA #define T1GSS CM2CON1_bits.T1GSS -#define ANS1 CM2CON1_bits.ANS1 -#define WR CM2CON1_bits.WR -#define STRB CM2CON1_bits.STRB -#define ANS2 CM2CON1_bits.ANS2 -#define WREN CM2CON1_bits.WREN -#define STRC CM2CON1_bits.STRC -#define PULSR CM2CON1_bits.PULSR -#define ANS3 CM2CON1_bits.ANS3 -#define WRERR CM2CON1_bits.WRERR -#define STRD CM2CON1_bits.STRD -#define PULSS CM2CON1_bits.PULSS -#define ANS4 CM2CON1_bits.ANS4 -#define STRSYNC CM2CON1_bits.STRSYNC -#define C2REN CM2CON1_bits.C2REN -#define ANS5 CM2CON1_bits.ANS5 -#define C1SEN CM2CON1_bits.C1SEN #define MC2OUT CM2CON1_bits.MC2OUT -#define ANS6 CM2CON1_bits.ANS6 -#define SR0 CM2CON1_bits.SR0 #define MC1OUT CM2CON1_bits.MC1OUT -#define ANS7 CM2CON1_bits.ANS7 -#define EEPGD CM2CON1_bits.EEPGD -#define SR1 CM2CON1_bits.SR1 // ----- ECCPAS bits -------------------- typedef union { @@ -597,6 +586,27 @@ extern volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; #define ECCPAS2 ECCPAS_bits.ECCPAS2 #define ECCPASE ECCPAS_bits.ECCPASE +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char EEPGD:1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#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 + // ----- INTCON bits -------------------- typedef union { struct { @@ -621,6 +631,70 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOC bits -------------------- +typedef union { + struct { + unsigned char IOC0:1; + unsigned char IOC1:1; + unsigned char IOC2:1; + unsigned char IOC3:1; + unsigned char IOC4:1; + unsigned char IOC5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOC_bits_t; +extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; + +#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 + +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + +// ----- IOCB bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char IOCB4:1; + unsigned char IOCB5:1; + unsigned char IOCB6:1; + unsigned char IOCB7:1; + }; +} __IOCB_bits_t; +extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; + +#define IOCB4 IOCB_bits.IOCB4 +#define IOCB5 IOCB_bits.IOCB5 +#define IOCB6 IOCB_bits.IOCB6 +#define IOCB7 IOCB_bits.IOCB7 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -676,36 +750,6 @@ typedef union { unsigned char TUN2:1; unsigned char TUN3:1; unsigned char TUN4:1; - unsigned char WPUA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char WPUA0:1; - unsigned char WPUA1:1; - unsigned char WPUA2:1; - unsigned char IOC3:1; - unsigned char WPUA4:1; - unsigned char IOC5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOC0:1; - unsigned char IOC1:1; - unsigned char IOC2:1; - unsigned char IOCA3:1; - unsigned char IOC4:1; - unsigned char IOCA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char :1; - unsigned char IOCA4:1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -714,27 +758,10 @@ typedef union { extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define TUN0 OSCTUNE_bits.TUN0 -#define WPUA0 OSCTUNE_bits.WPUA0 -#define IOC0 OSCTUNE_bits.IOC0 -#define IOCA0 OSCTUNE_bits.IOCA0 #define TUN1 OSCTUNE_bits.TUN1 -#define WPUA1 OSCTUNE_bits.WPUA1 -#define IOC1 OSCTUNE_bits.IOC1 -#define IOCA1 OSCTUNE_bits.IOCA1 #define TUN2 OSCTUNE_bits.TUN2 -#define WPUA2 OSCTUNE_bits.WPUA2 -#define IOC2 OSCTUNE_bits.IOC2 -#define IOCA2 OSCTUNE_bits.IOCA2 #define TUN3 OSCTUNE_bits.TUN3 -#define IOC3 OSCTUNE_bits.IOC3 -#define IOCA3 OSCTUNE_bits.IOCA3 #define TUN4 OSCTUNE_bits.TUN4 -#define WPUA4 OSCTUNE_bits.WPUA4 -#define IOC4 OSCTUNE_bits.IOC4 -#define IOCA4 OSCTUNE_bits.IOCA4 -#define WPUA5 OSCTUNE_bits.WPUA5 -#define IOC5 OSCTUNE_bits.IOC5 -#define IOCA5 OSCTUNE_bits.IOCA5 // ----- PCON bits -------------------- typedef union { @@ -860,6 +887,97 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PSTRCON bits -------------------- +typedef union { + struct { + unsigned char STRA:1; + unsigned char STRB:1; + unsigned char STRC:1; + unsigned char STRD:1; + unsigned char STRSYNC:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PSTRCON_bits_t; +extern volatile __PSTRCON_bits_t __at(PSTRCON_ADDR) PSTRCON_bits; + +#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 + // ----- PWM1CON bits -------------------- typedef union { struct { @@ -884,6 +1002,28 @@ extern volatile __PWM1CON_bits_t __at(PWM1CON_ADDR) PWM1CON_bits; #define PDC6 PWM1CON_bits.PDC6 #define PRSEN PWM1CON_bits.PRSEN +// ----- SRCON bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char PULSR:1; + unsigned char PULSS:1; + unsigned char C2REN:1; + unsigned char C1SEN:1; + unsigned char SR0:1; + unsigned char SR1:1; + }; +} __SRCON_bits_t; +extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; + +#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 + // ----- STATUS bits -------------------- typedef union { struct { @@ -1053,16 +1193,6 @@ typedef union { unsigned char WDTPS1:1; unsigned char WDTPS2:1; unsigned char WDTPS3:1; - unsigned char ADCS1:1; - unsigned char ADCS2:1; - unsigned char :1; - }; - struct { - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char ADCS0:1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -1075,42 +1205,46 @@ extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; #define WDTPS1 WDTCON_bits.WDTPS1 #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 -#define ADCS0 WDTCON_bits.ADCS0 -#define ADCS1 WDTCON_bits.ADCS1 -#define ADCS2 WDTCON_bits.ADCS2 -// ----- WPUB bits -------------------- +// ----- WPUA bits -------------------- typedef union { struct { + unsigned char WPUA0:1; + unsigned char WPUA1:1; + unsigned char WPUA2:1; unsigned char :1; + unsigned char WPUA4:1; + unsigned char WPUA5:1; unsigned char :1; unsigned char :1; - unsigned char :1; - unsigned char WPUB4:1; - unsigned char WPUB5:1; - unsigned char WPUB6:1; - unsigned char WPUB7:1; }; +} __WPUA_bits_t; +extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; + +#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 + +// ----- WPUB bits -------------------- +typedef union { struct { unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char IOCB4:1; - unsigned char IOCB5:1; - unsigned char IOCB6:1; - unsigned char IOCB7:1; + unsigned char WPUB4:1; + unsigned char WPUB5:1; + unsigned char WPUB6:1; + unsigned char WPUB7:1; }; } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB4 WPUB_bits.WPUB4 -#define IOCB4 WPUB_bits.IOCB4 #define WPUB5 WPUB_bits.WPUB5 -#define IOCB5 WPUB_bits.IOCB5 #define WPUB6 WPUB_bits.WPUB6 -#define IOCB6 WPUB_bits.IOCB6 #define WPUB7 WPUB_bits.WPUB7 -#define IOCB7 WPUB_bits.IOCB7 #endif diff --git a/device/include/pic/pic16f687.h b/device/include/pic/pic16f687.h index 6415d047..603370b4 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -243,7 +243,7 @@ extern __sfr __at (SRCON_ADDR) SRCON; -//----- SSPCON Bits ------------------------------------------------------- +//----- SSPCON0 Bits ------------------------------------------------------- @@ -445,6 +445,49 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ADCON1 bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ADCON1_bits_t; +extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; + +#define ADCS0 ADCON1_bits.ADCS0 +#define ADCS1 ADCON1_bits.ADCS1 +#define ADCS2 ADCON1_bits.ADCS2 + +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#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 +#define ANS5 ANSEL_bits.ANS5 +#define ANS6 ANSEL_bits.ANS6 +#define ANS7 ANSEL_bits.ANS7 + // ----- BAUDCTL bits -------------------- typedef union { struct { @@ -453,20 +496,10 @@ typedef union { unsigned char :1; unsigned char BRG16:1; unsigned char CKTXP:1; - unsigned char ADCS1:1; + unsigned char :1; unsigned char RCIDL:1; unsigned char ABDOVF:1; }; - struct { - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char ADCS0:1; - unsigned char :1; - unsigned char ADCS2:1; - unsigned char :1; - }; } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; @@ -474,10 +507,7 @@ extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define CKTXP BAUDCTL_bits.CKTXP -#define ADCS0 BAUDCTL_bits.ADCS0 -#define ADCS1 BAUDCTL_bits.ADCS1 #define RCIDL BAUDCTL_bits.RCIDL -#define ADCS2 BAUDCTL_bits.ADCS2 #define ABDOVF BAUDCTL_bits.ABDOVF // ----- CM1CON0 bits -------------------- @@ -531,69 +561,41 @@ typedef union { struct { unsigned char C2SYNC:1; unsigned char T1GSS:1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char ANS4:1; - unsigned char ANS5:1; - unsigned char MC2OUT:1; - unsigned char MC1OUT:1; - }; - struct { - unsigned char ANS0:1; - unsigned char ANS1:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char C2REN:1; - unsigned char C1SEN:1; - unsigned char ANS6:1; - unsigned char ANS7:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char PULSR:1; - unsigned char PULSS:1; - unsigned char :1; - unsigned char :1; - unsigned char SR0:1; - unsigned char EEPGD:1; - }; - struct { - unsigned char :1; - unsigned char :1; - unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char SR1:1; + unsigned char MC2OUT:1; + unsigned char MC1OUT:1; }; } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; #define C2SYNC CM2CON1_bits.C2SYNC -#define ANS0 CM2CON1_bits.ANS0 -#define RD CM2CON1_bits.RD #define T1GSS CM2CON1_bits.T1GSS -#define ANS1 CM2CON1_bits.ANS1 -#define WR CM2CON1_bits.WR -#define ANS2 CM2CON1_bits.ANS2 -#define WREN CM2CON1_bits.WREN -#define PULSR CM2CON1_bits.PULSR -#define ANS3 CM2CON1_bits.ANS3 -#define WRERR CM2CON1_bits.WRERR -#define PULSS CM2CON1_bits.PULSS -#define ANS4 CM2CON1_bits.ANS4 -#define C2REN CM2CON1_bits.C2REN -#define ANS5 CM2CON1_bits.ANS5 -#define C1SEN CM2CON1_bits.C1SEN #define MC2OUT CM2CON1_bits.MC2OUT -#define ANS6 CM2CON1_bits.ANS6 -#define SR0 CM2CON1_bits.SR0 #define MC1OUT CM2CON1_bits.MC1OUT -#define ANS7 CM2CON1_bits.ANS7 -#define EEPGD CM2CON1_bits.EEPGD -#define SR1 CM2CON1_bits.SR1 + +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char EEPGD:1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#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 // ----- INTCON bits -------------------- typedef union { @@ -619,6 +621,70 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOC bits -------------------- +typedef union { + struct { + unsigned char IOC0:1; + unsigned char IOC1:1; + unsigned char IOC2:1; + unsigned char IOC3:1; + unsigned char IOC4:1; + unsigned char IOC5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOC_bits_t; +extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; + +#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 + +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + +// ----- IOCB bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char IOCB4:1; + unsigned char IOCB5:1; + unsigned char IOCB6:1; + unsigned char IOCB7:1; + }; +} __IOCB_bits_t; +extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; + +#define IOCB4 IOCB_bits.IOCB4 +#define IOCB5 IOCB_bits.IOCB5 +#define IOCB6 IOCB_bits.IOCB6 +#define IOCB7 IOCB_bits.IOCB7 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -811,6 +877,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -883,6 +1019,28 @@ extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; #define BRG14 SPBRGH_bits.BRG14 #define BRG15 SPBRGH_bits.BRG15 +// ----- SRCON bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char PULSR:1; + unsigned char PULSS:1; + unsigned char C2REN:1; + unsigned char C1SEN:1; + unsigned char SR0:1; + unsigned char SR1:1; + }; +} __SRCON_bits_t; +extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; + +#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 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -919,62 +1077,15 @@ typedef union { unsigned char CKE:1; unsigned char SMP:1; }; - struct { - unsigned char WPUA0:1; - unsigned char WPUA1:1; - unsigned char WPUA2:1; - unsigned char IOC3:1; - unsigned char WPUA4:1; - unsigned char WPUA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOC0:1; - unsigned char IOC1:1; - unsigned char IOC2:1; - unsigned char IOCA3:1; - unsigned char IOC4:1; - unsigned char IOC5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char :1; - unsigned char IOCA4:1; - unsigned char IOCA5:1; - unsigned char :1; - unsigned char :1; - }; } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define BF SSPSTAT_bits.BF -#define WPUA0 SSPSTAT_bits.WPUA0 -#define IOC0 SSPSTAT_bits.IOC0 -#define IOCA0 SSPSTAT_bits.IOCA0 #define UA SSPSTAT_bits.UA -#define WPUA1 SSPSTAT_bits.WPUA1 -#define IOC1 SSPSTAT_bits.IOC1 -#define IOCA1 SSPSTAT_bits.IOCA1 #define R_W_NOT SSPSTAT_bits.R_W_NOT -#define WPUA2 SSPSTAT_bits.WPUA2 -#define IOC2 SSPSTAT_bits.IOC2 -#define IOCA2 SSPSTAT_bits.IOCA2 #define S SSPSTAT_bits.S -#define IOC3 SSPSTAT_bits.IOC3 -#define IOCA3 SSPSTAT_bits.IOCA3 #define P SSPSTAT_bits.P -#define WPUA4 SSPSTAT_bits.WPUA4 -#define IOC4 SSPSTAT_bits.IOC4 -#define IOCA4 SSPSTAT_bits.IOCA4 #define D_A_NOT SSPSTAT_bits.D_A_NOT -#define WPUA5 SSPSTAT_bits.WPUA5 -#define IOC5 SSPSTAT_bits.IOC5 -#define IOCA5 SSPSTAT_bits.IOCA5 #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP @@ -1161,38 +1272,45 @@ extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 -// ----- WPUB bits -------------------- +// ----- WPUA bits -------------------- typedef union { struct { + unsigned char WPUA0:1; + unsigned char WPUA1:1; + unsigned char WPUA2:1; unsigned char :1; + unsigned char WPUA4:1; + unsigned char WPUA5:1; unsigned char :1; unsigned char :1; - unsigned char :1; - unsigned char WPUB4:1; - unsigned char WPUB5:1; - unsigned char WPUB6:1; - unsigned char WPUB7:1; }; +} __WPUA_bits_t; +extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; + +#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 + +// ----- WPUB bits -------------------- +typedef union { struct { unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char IOCB4:1; - unsigned char IOCB5:1; - unsigned char IOCB6:1; - unsigned char IOCB7:1; + unsigned char WPUB4:1; + unsigned char WPUB5:1; + unsigned char WPUB6:1; + unsigned char WPUB7:1; }; } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB4 WPUB_bits.WPUB4 -#define IOCB4 WPUB_bits.IOCB4 #define WPUB5 WPUB_bits.WPUB5 -#define IOCB5 WPUB_bits.IOCB5 #define WPUB6 WPUB_bits.WPUB6 -#define IOCB6 WPUB_bits.IOCB6 #define WPUB7 WPUB_bits.WPUB7 -#define IOCB7 WPUB_bits.IOCB7 #endif diff --git a/device/include/pic/pic16f688.h b/device/include/pic/pic16f688.h index c10f1d06..811cc771 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -207,10 +207,10 @@ extern __sfr __at (ADCON1_ADDR) ADCON1; //----- WDTCON Bits -------------------------------------------------------- -//----- CMCON0 Bits ------------------------------------------------------- +//----- COMCON0 Bits ------------------------------------------------------- -//----- CMCON1 Bits ------------------------------------------------------- +//----- COMCON1 Bits ------------------------------------------------------- //----- ADCON0 Bits -------------------------------------------------------- @@ -345,6 +345,49 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ADCON1 bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ADCON1_bits_t; +extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; + +#define ADCS0 ADCON1_bits.ADCS0 +#define ADCS1 ADCON1_bits.ADCS1 +#define ADCS2 ADCON1_bits.ADCS2 + +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#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 +#define ANS5 ANSEL_bits.ANS5 +#define ANS6 ANSEL_bits.ANS6 +#define ANS7 ANSEL_bits.ANS7 + // ----- BAUDCTL bits -------------------- typedef union { struct { @@ -409,6 +452,27 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define C2SYNC CMCON1_bits.C2SYNC #define T1GSS CMCON1_bits.T1GSS +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char EEPGD:1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#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 + // ----- INTCON bits -------------------- typedef union { struct { @@ -433,6 +497,50 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOC bits -------------------- +typedef union { + struct { + unsigned char IOC0:1; + unsigned char IOC1:1; + unsigned char IOC2:1; + unsigned char IOC3:1; + unsigned char IOC4:1; + unsigned char IOC5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOC_bits_t; +extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; + +#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 + +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -488,36 +596,6 @@ typedef union { unsigned char TUN2:1; unsigned char TUN3:1; unsigned char TUN4:1; - unsigned char ANS5:1; - unsigned char ANS6:1; - unsigned char ANS7:1; - }; - struct { - unsigned char ANS0:1; - unsigned char ANS1:1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char ANS4:1; - unsigned char IOC5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOC0:1; - unsigned char IOC1:1; - unsigned char IOC2:1; - unsigned char IOC3:1; - unsigned char IOC4:1; - unsigned char IOCA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char IOCA3:1; - unsigned char IOCA4:1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -526,30 +604,10 @@ typedef union { extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define TUN0 OSCTUNE_bits.TUN0 -#define ANS0 OSCTUNE_bits.ANS0 -#define IOC0 OSCTUNE_bits.IOC0 -#define IOCA0 OSCTUNE_bits.IOCA0 #define TUN1 OSCTUNE_bits.TUN1 -#define ANS1 OSCTUNE_bits.ANS1 -#define IOC1 OSCTUNE_bits.IOC1 -#define IOCA1 OSCTUNE_bits.IOCA1 #define TUN2 OSCTUNE_bits.TUN2 -#define ANS2 OSCTUNE_bits.ANS2 -#define IOC2 OSCTUNE_bits.IOC2 -#define IOCA2 OSCTUNE_bits.IOCA2 #define TUN3 OSCTUNE_bits.TUN3 -#define ANS3 OSCTUNE_bits.ANS3 -#define IOC3 OSCTUNE_bits.IOC3 -#define IOCA3 OSCTUNE_bits.IOCA3 #define TUN4 OSCTUNE_bits.TUN4 -#define ANS4 OSCTUNE_bits.ANS4 -#define IOC4 OSCTUNE_bits.IOC4 -#define IOCA4 OSCTUNE_bits.IOCA4 -#define ANS5 OSCTUNE_bits.ANS5 -#define IOC5 OSCTUNE_bits.IOC5 -#define IOCA5 OSCTUNE_bits.IOCA5 -#define ANS6 OSCTUNE_bits.ANS6 -#define ANS7 OSCTUNE_bits.ANS7 // ----- PCON bits -------------------- typedef union { @@ -641,6 +699,52 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -728,6 +832,52 @@ extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define TMR1GE T1CON_bits.TMR1GE #define T1GINV T1CON_bits.T1GINV +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { @@ -759,37 +909,19 @@ typedef union { unsigned char VR1:1; unsigned char VR2:1; unsigned char VR3:1; - unsigned char ADCS0:1; - unsigned char VRR:1; - unsigned char ADCS2:1; - unsigned char VREN:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; unsigned char :1; - unsigned char ADCS1:1; + unsigned char VRR:1; unsigned char :1; - unsigned char EEPGD:1; + unsigned char VREN:1; }; } __VRCON_bits_t; extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VR0 VRCON_bits.VR0 -#define RD VRCON_bits.RD #define VR1 VRCON_bits.VR1 -#define WR VRCON_bits.WR #define VR2 VRCON_bits.VR2 -#define WREN VRCON_bits.WREN #define VR3 VRCON_bits.VR3 -#define WRERR VRCON_bits.WRERR -#define ADCS0 VRCON_bits.ADCS0 #define VRR VRCON_bits.VRR -#define ADCS1 VRCON_bits.ADCS1 -#define ADCS2 VRCON_bits.ADCS2 #define VREN VRCON_bits.VREN -#define EEPGD VRCON_bits.EEPGD #endif diff --git a/device/include/pic/pic16f689.h b/device/include/pic/pic16f689.h index 582c889b..82cefc36 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -445,6 +445,49 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ADCON1 bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ADCON1_bits_t; +extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; + +#define ADCS0 ADCON1_bits.ADCS0 +#define ADCS1 ADCON1_bits.ADCS1 +#define ADCS2 ADCON1_bits.ADCS2 + +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#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 +#define ANS5 ANSEL_bits.ANS5 +#define ANS6 ANSEL_bits.ANS6 +#define ANS7 ANSEL_bits.ANS7 + // ----- BAUDCTL bits -------------------- typedef union { struct { @@ -453,20 +496,10 @@ typedef union { unsigned char :1; unsigned char BRG16:1; unsigned char CKTXP:1; - unsigned char ADCS1:1; + unsigned char :1; unsigned char RCIDL:1; unsigned char ABDOVF:1; }; - struct { - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char ADCS0:1; - unsigned char :1; - unsigned char ADCS2:1; - unsigned char :1; - }; } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; @@ -474,10 +507,7 @@ extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define CKTXP BAUDCTL_bits.CKTXP -#define ADCS0 BAUDCTL_bits.ADCS0 -#define ADCS1 BAUDCTL_bits.ADCS1 #define RCIDL BAUDCTL_bits.RCIDL -#define ADCS2 BAUDCTL_bits.ADCS2 #define ABDOVF BAUDCTL_bits.ABDOVF // ----- CM1CON0 bits -------------------- @@ -531,69 +561,41 @@ typedef union { struct { unsigned char C2SYNC:1; unsigned char T1GSS:1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char ANS4:1; - unsigned char ANS5:1; - unsigned char MC2OUT:1; - unsigned char MC1OUT:1; - }; - struct { - unsigned char ANS0:1; - unsigned char ANS1:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char C2REN:1; - unsigned char C1SEN:1; - unsigned char ANS6:1; - unsigned char ANS7:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char PULSR:1; - unsigned char PULSS:1; - unsigned char :1; - unsigned char :1; - unsigned char SR0:1; - unsigned char EEPGD:1; - }; - struct { - unsigned char :1; - unsigned char :1; - unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char SR1:1; + unsigned char MC2OUT:1; + unsigned char MC1OUT:1; }; } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; #define C2SYNC CM2CON1_bits.C2SYNC -#define ANS0 CM2CON1_bits.ANS0 -#define RD CM2CON1_bits.RD #define T1GSS CM2CON1_bits.T1GSS -#define ANS1 CM2CON1_bits.ANS1 -#define WR CM2CON1_bits.WR -#define ANS2 CM2CON1_bits.ANS2 -#define WREN CM2CON1_bits.WREN -#define PULSR CM2CON1_bits.PULSR -#define ANS3 CM2CON1_bits.ANS3 -#define WRERR CM2CON1_bits.WRERR -#define PULSS CM2CON1_bits.PULSS -#define ANS4 CM2CON1_bits.ANS4 -#define C2REN CM2CON1_bits.C2REN -#define ANS5 CM2CON1_bits.ANS5 -#define C1SEN CM2CON1_bits.C1SEN #define MC2OUT CM2CON1_bits.MC2OUT -#define ANS6 CM2CON1_bits.ANS6 -#define SR0 CM2CON1_bits.SR0 #define MC1OUT CM2CON1_bits.MC1OUT -#define ANS7 CM2CON1_bits.ANS7 -#define EEPGD CM2CON1_bits.EEPGD -#define SR1 CM2CON1_bits.SR1 + +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char EEPGD:1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#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 // ----- INTCON bits -------------------- typedef union { @@ -619,6 +621,70 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOC bits -------------------- +typedef union { + struct { + unsigned char IOC0:1; + unsigned char IOC1:1; + unsigned char IOC2:1; + unsigned char IOC3:1; + unsigned char IOC4:1; + unsigned char IOC5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOC_bits_t; +extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; + +#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 + +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + +// ----- IOCB bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char IOCB4:1; + unsigned char IOCB5:1; + unsigned char IOCB6:1; + unsigned char IOCB7:1; + }; +} __IOCB_bits_t; +extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; + +#define IOCB4 IOCB_bits.IOCB4 +#define IOCB5 IOCB_bits.IOCB5 +#define IOCB6 IOCB_bits.IOCB6 +#define IOCB7 IOCB_bits.IOCB7 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -811,6 +877,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -883,6 +1019,28 @@ extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; #define BRG14 SPBRGH_bits.BRG14 #define BRG15 SPBRGH_bits.BRG15 +// ----- SRCON bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char PULSR:1; + unsigned char PULSS:1; + unsigned char C2REN:1; + unsigned char C1SEN:1; + unsigned char SR0:1; + unsigned char SR1:1; + }; +} __SRCON_bits_t; +extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; + +#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 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -919,62 +1077,15 @@ typedef union { unsigned char CKE:1; unsigned char SMP:1; }; - struct { - unsigned char WPUA0:1; - unsigned char WPUA1:1; - unsigned char WPUA2:1; - unsigned char IOC3:1; - unsigned char WPUA4:1; - unsigned char WPUA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOC0:1; - unsigned char IOC1:1; - unsigned char IOC2:1; - unsigned char IOCA3:1; - unsigned char IOC4:1; - unsigned char IOC5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char :1; - unsigned char IOCA4:1; - unsigned char IOCA5:1; - unsigned char :1; - unsigned char :1; - }; } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define BF SSPSTAT_bits.BF -#define WPUA0 SSPSTAT_bits.WPUA0 -#define IOC0 SSPSTAT_bits.IOC0 -#define IOCA0 SSPSTAT_bits.IOCA0 #define UA SSPSTAT_bits.UA -#define WPUA1 SSPSTAT_bits.WPUA1 -#define IOC1 SSPSTAT_bits.IOC1 -#define IOCA1 SSPSTAT_bits.IOCA1 #define R_W_NOT SSPSTAT_bits.R_W_NOT -#define WPUA2 SSPSTAT_bits.WPUA2 -#define IOC2 SSPSTAT_bits.IOC2 -#define IOCA2 SSPSTAT_bits.IOCA2 #define S SSPSTAT_bits.S -#define IOC3 SSPSTAT_bits.IOC3 -#define IOCA3 SSPSTAT_bits.IOCA3 #define P SSPSTAT_bits.P -#define WPUA4 SSPSTAT_bits.WPUA4 -#define IOC4 SSPSTAT_bits.IOC4 -#define IOCA4 SSPSTAT_bits.IOCA4 #define D_A_NOT SSPSTAT_bits.D_A_NOT -#define WPUA5 SSPSTAT_bits.WPUA5 -#define IOC5 SSPSTAT_bits.IOC5 -#define IOCA5 SSPSTAT_bits.IOCA5 #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP @@ -1161,38 +1272,45 @@ extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 -// ----- WPUB bits -------------------- +// ----- WPUA bits -------------------- typedef union { struct { + unsigned char WPUA0:1; + unsigned char WPUA1:1; + unsigned char WPUA2:1; unsigned char :1; + unsigned char WPUA4:1; + unsigned char WPUA5:1; unsigned char :1; unsigned char :1; - unsigned char :1; - unsigned char WPUB4:1; - unsigned char WPUB5:1; - unsigned char WPUB6:1; - unsigned char WPUB7:1; }; +} __WPUA_bits_t; +extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; + +#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 + +// ----- WPUB bits -------------------- +typedef union { struct { unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char IOCB4:1; - unsigned char IOCB5:1; - unsigned char IOCB6:1; - unsigned char IOCB7:1; + unsigned char WPUB4:1; + unsigned char WPUB5:1; + unsigned char WPUB6:1; + unsigned char WPUB7:1; }; } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB4 WPUB_bits.WPUB4 -#define IOCB4 WPUB_bits.IOCB4 #define WPUB5 WPUB_bits.WPUB5 -#define IOCB5 WPUB_bits.IOCB5 #define WPUB6 WPUB_bits.WPUB6 -#define IOCB6 WPUB_bits.IOCB6 #define WPUB7 WPUB_bits.WPUB7 -#define IOCB7 WPUB_bits.IOCB7 #endif diff --git a/device/include/pic/pic16f690.h b/device/include/pic/pic16f690.h index 5b854e27..08826eef 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -467,6 +467,49 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ADCON1 bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ADCON1_bits_t; +extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; + +#define ADCS0 ADCON1_bits.ADCS0 +#define ADCS1 ADCON1_bits.ADCS1 +#define ADCS2 ADCON1_bits.ADCS2 + +// ----- ANSEL bits -------------------- +typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; +} __ANSEL_bits_t; +extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; + +#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 +#define ANS5 ANSEL_bits.ANS5 +#define ANS6 ANSEL_bits.ANS6 +#define ANS7 ANSEL_bits.ANS7 + // ----- BAUDCTL bits -------------------- typedef union { struct { @@ -475,20 +518,10 @@ typedef union { unsigned char :1; unsigned char BRG16:1; unsigned char CKTXP:1; - unsigned char ADCS1:1; + unsigned char :1; unsigned char RCIDL:1; unsigned char ABDOVF:1; }; - struct { - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char ADCS0:1; - unsigned char :1; - unsigned char ADCS2:1; - unsigned char :1; - }; } __BAUDCTL_bits_t; extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; @@ -496,10 +529,7 @@ extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 #define CKTXP BAUDCTL_bits.CKTXP -#define ADCS0 BAUDCTL_bits.ADCS0 -#define ADCS1 BAUDCTL_bits.ADCS1 #define RCIDL BAUDCTL_bits.RCIDL -#define ADCS2 BAUDCTL_bits.ADCS2 #define ABDOVF BAUDCTL_bits.ABDOVF // ----- CCP1CON bits -------------------- @@ -577,74 +607,20 @@ typedef union { struct { unsigned char C2SYNC:1; unsigned char T1GSS:1; - unsigned char ANS2:1; - unsigned char ANS3:1; - unsigned char ANS4:1; - unsigned char ANS5:1; - unsigned char MC2OUT:1; - unsigned char MC1OUT:1; - }; - struct { - unsigned char ANS0:1; - unsigned char ANS1:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char STRSYNC:1; - unsigned char C1SEN:1; - unsigned char ANS6:1; - unsigned char ANS7:1; - }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char STRC:1; - unsigned char STRD:1; - unsigned char C2REN:1; unsigned char :1; - unsigned char SR0:1; - unsigned char EEPGD:1; - }; - struct { - unsigned char STRA:1; - unsigned char STRB:1; - unsigned char PULSR:1; - unsigned char PULSS:1; unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char SR1:1; + unsigned char MC2OUT:1; + unsigned char MC1OUT:1; }; } __CM2CON1_bits_t; extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; #define C2SYNC CM2CON1_bits.C2SYNC -#define ANS0 CM2CON1_bits.ANS0 -#define RD CM2CON1_bits.RD -#define STRA CM2CON1_bits.STRA #define T1GSS CM2CON1_bits.T1GSS -#define ANS1 CM2CON1_bits.ANS1 -#define WR CM2CON1_bits.WR -#define STRB CM2CON1_bits.STRB -#define ANS2 CM2CON1_bits.ANS2 -#define WREN CM2CON1_bits.WREN -#define STRC CM2CON1_bits.STRC -#define PULSR CM2CON1_bits.PULSR -#define ANS3 CM2CON1_bits.ANS3 -#define WRERR CM2CON1_bits.WRERR -#define STRD CM2CON1_bits.STRD -#define PULSS CM2CON1_bits.PULSS -#define ANS4 CM2CON1_bits.ANS4 -#define STRSYNC CM2CON1_bits.STRSYNC -#define C2REN CM2CON1_bits.C2REN -#define ANS5 CM2CON1_bits.ANS5 -#define C1SEN CM2CON1_bits.C1SEN #define MC2OUT CM2CON1_bits.MC2OUT -#define ANS6 CM2CON1_bits.ANS6 -#define SR0 CM2CON1_bits.SR0 #define MC1OUT CM2CON1_bits.MC1OUT -#define ANS7 CM2CON1_bits.ANS7 -#define EEPGD CM2CON1_bits.EEPGD -#define SR1 CM2CON1_bits.SR1 // ----- ECCPAS bits -------------------- typedef union { @@ -670,6 +646,27 @@ extern volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; #define ECCPAS2 ECCPAS_bits.ECCPAS2 #define ECCPASE ECCPAS_bits.ECCPASE +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char EEPGD:1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#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 + // ----- INTCON bits -------------------- typedef union { struct { @@ -694,6 +691,70 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOC bits -------------------- +typedef union { + struct { + unsigned char IOC0:1; + unsigned char IOC1:1; + unsigned char IOC2:1; + unsigned char IOC3:1; + unsigned char IOC4:1; + unsigned char IOC5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOC_bits_t; +extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; + +#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 + +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + +// ----- IOCB bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char IOCB4:1; + unsigned char IOCB5:1; + unsigned char IOCB6:1; + unsigned char IOCB7:1; + }; +} __IOCB_bits_t; +extern volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; + +#define IOCB4 IOCB_bits.IOCB4 +#define IOCB5 IOCB_bits.IOCB5 +#define IOCB6 IOCB_bits.IOCB6 +#define IOCB7 IOCB_bits.IOCB7 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -892,6 +953,97 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PSTRCON bits -------------------- +typedef union { + struct { + unsigned char STRA:1; + unsigned char STRB:1; + unsigned char STRC:1; + unsigned char STRD:1; + unsigned char STRSYNC:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PSTRCON_bits_t; +extern volatile __PSTRCON_bits_t __at(PSTRCON_ADDR) PSTRCON_bits; + +#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 + // ----- PWM1CON bits -------------------- typedef union { struct { @@ -988,6 +1140,28 @@ extern volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; #define BRG14 SPBRGH_bits.BRG14 #define BRG15 SPBRGH_bits.BRG15 +// ----- SRCON bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char PULSR:1; + unsigned char PULSS:1; + unsigned char C2REN:1; + unsigned char C1SEN:1; + unsigned char SR0:1; + unsigned char SR1:1; + }; +} __SRCON_bits_t; +extern volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; + +#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 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -1024,62 +1198,15 @@ typedef union { unsigned char CKE:1; unsigned char SMP:1; }; - struct { - unsigned char WPUA0:1; - unsigned char WPUA1:1; - unsigned char WPUA2:1; - unsigned char IOC3:1; - unsigned char WPUA4:1; - unsigned char WPUA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOC0:1; - unsigned char IOC1:1; - unsigned char IOC2:1; - unsigned char IOCA3:1; - unsigned char IOC4:1; - unsigned char IOC5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char :1; - unsigned char IOCA4:1; - unsigned char IOCA5:1; - unsigned char :1; - unsigned char :1; - }; } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define BF SSPSTAT_bits.BF -#define WPUA0 SSPSTAT_bits.WPUA0 -#define IOC0 SSPSTAT_bits.IOC0 -#define IOCA0 SSPSTAT_bits.IOCA0 #define UA SSPSTAT_bits.UA -#define WPUA1 SSPSTAT_bits.WPUA1 -#define IOC1 SSPSTAT_bits.IOC1 -#define IOCA1 SSPSTAT_bits.IOCA1 #define R_W_NOT SSPSTAT_bits.R_W_NOT -#define WPUA2 SSPSTAT_bits.WPUA2 -#define IOC2 SSPSTAT_bits.IOC2 -#define IOCA2 SSPSTAT_bits.IOCA2 #define S SSPSTAT_bits.S -#define IOC3 SSPSTAT_bits.IOC3 -#define IOCA3 SSPSTAT_bits.IOCA3 #define P SSPSTAT_bits.P -#define WPUA4 SSPSTAT_bits.WPUA4 -#define IOC4 SSPSTAT_bits.IOC4 -#define IOCA4 SSPSTAT_bits.IOCA4 #define D_A_NOT SSPSTAT_bits.D_A_NOT -#define WPUA5 SSPSTAT_bits.WPUA5 -#define IOC5 SSPSTAT_bits.IOC5 -#define IOCA5 SSPSTAT_bits.IOCA5 #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP @@ -1289,38 +1416,45 @@ extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 -// ----- WPUB bits -------------------- +// ----- WPUA bits -------------------- typedef union { struct { + unsigned char WPUA0:1; + unsigned char WPUA1:1; + unsigned char WPUA2:1; unsigned char :1; + unsigned char WPUA4:1; + unsigned char WPUA5:1; unsigned char :1; unsigned char :1; - unsigned char :1; - unsigned char WPUB4:1; - unsigned char WPUB5:1; - unsigned char WPUB6:1; - unsigned char WPUB7:1; }; +} __WPUA_bits_t; +extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; + +#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 + +// ----- WPUB bits -------------------- +typedef union { struct { unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; - unsigned char IOCB4:1; - unsigned char IOCB5:1; - unsigned char IOCB6:1; - unsigned char IOCB7:1; + unsigned char WPUB4:1; + unsigned char WPUB5:1; + unsigned char WPUB6:1; + unsigned char WPUB7:1; }; } __WPUB_bits_t; extern volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; #define WPUB4 WPUB_bits.WPUB4 -#define IOCB4 WPUB_bits.IOCB4 #define WPUB5 WPUB_bits.WPUB5 -#define IOCB5 WPUB_bits.IOCB5 #define WPUB6 WPUB_bits.WPUB6 -#define IOCB6 WPUB_bits.IOCB6 #define WPUB7 WPUB_bits.WPUB7 -#define IOCB7 WPUB_bits.IOCB7 #endif diff --git a/device/include/pic/pic16f716.h b/device/include/pic/pic16f716.h index 57dcee09..9dafc066 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -471,6 +471,28 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define CCP1IF PIR1_bits.CCP1IF #define ADIF PIR1_bits.ADIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + // ----- PORTB bits -------------------- typedef union { struct { @@ -593,6 +615,28 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + // ----- TRISB bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f72.h b/device/include/pic/pic16f72.h index 51f10829..398d2f6c 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -474,6 +474,76 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -664,4 +734,74 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + #endif diff --git a/device/include/pic/pic16f73.h b/device/include/pic/pic16f73.h index c7cdbe8d..8e31d6d6 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -552,6 +552,76 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -799,6 +869,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f737.h b/device/include/pic/pic16f737.h index 657c057e..d2833fca 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -246,7 +246,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- TRISE Bits --------------------------------------------------------- @@ -849,6 +849,119 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -1133,6 +1246,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f74.h b/device/include/pic/pic16f74.h index 1c619262..37a9f367 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -563,6 +563,119 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -810,6 +923,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f76.h b/device/include/pic/pic16f76.h index bb9833b4..6f44ed82 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -551,6 +551,76 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -798,6 +868,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f767.h b/device/include/pic/pic16f767.h index b98d3bdb..3ec253e8 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -242,7 +242,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- TRISE Bits --------------------------------------------------------- @@ -845,6 +845,95 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -1129,6 +1218,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f77.h b/device/include/pic/pic16f77.h index e10233d8..22f26e89 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -563,6 +563,119 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -810,6 +923,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f777.h b/device/include/pic/pic16f777.h index ec8237cd..2d0ce6b9 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -246,7 +246,7 @@ extern __sfr __at (PMCON1_ADDR) PMCON1; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- TRISE Bits --------------------------------------------------------- @@ -848,6 +848,119 @@ extern volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; #define RD PMCON1_bits.RD +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -1132,6 +1245,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f785.h b/device/include/pic/pic16f785.h index c5072253..72f2c936 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -401,6 +401,45 @@ extern volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; #define VCFG ADCON0_bits.VCFG #define ADFM ADCON0_bits.ADFM +// ----- ADCON1 bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char ADCS0:1; + unsigned char ADCS1:1; + unsigned char ADCS2:1; + unsigned char :1; + }; +} __ADCON1_bits_t; +extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; + +#define ADCS0 ADCON1_bits.ADCS0 +#define ADCS1 ADCON1_bits.ADCS1 +#define ADCS2 ADCON1_bits.ADCS2 + +// ----- ANSEL1 bits -------------------- +typedef union { + struct { + unsigned char ANS8:1; + unsigned char ANS9:1; + unsigned char ANS10:1; + unsigned char ANS11:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __ANSEL1_bits_t; +extern volatile __ANSEL1_bits_t __at(ANSEL1_ADDR) ANSEL1_bits; + +#define ANS8 ANSEL1_bits.ANS8 +#define ANS9 ANSEL1_bits.ANS9 +#define ANS10 ANSEL1_bits.ANS10 +#define ANS11 ANSEL1_bits.ANS11 + // ----- CCP1CON bits -------------------- typedef union { struct { @@ -423,6 +462,105 @@ extern volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; #define DC1B0 CCP1CON_bits.DC1B0 #define DC1B1 CCP1CON_bits.DC1B1 +// ----- CM1CON0 bits -------------------- +typedef union { + struct { + unsigned char C1CH0:1; + unsigned char C1CH1:1; + unsigned char C1R:1; + unsigned char C1SP:1; + unsigned char C1POL:1; + unsigned char C1OE:1; + unsigned char C1OUT:1; + unsigned char C1ON:1; + }; +} __CM1CON0_bits_t; +extern volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; + +#define C1CH0 CM1CON0_bits.C1CH0 +#define C1CH1 CM1CON0_bits.C1CH1 +#define C1R CM1CON0_bits.C1R +#define C1SP CM1CON0_bits.C1SP +#define C1POL CM1CON0_bits.C1POL +#define C1OE CM1CON0_bits.C1OE +#define C1OUT CM1CON0_bits.C1OUT +#define C1ON CM1CON0_bits.C1ON + +// ----- CM2CON0 bits -------------------- +typedef union { + struct { + unsigned char C2CH0:1; + unsigned char C2CH1:1; + unsigned char C2R:1; + unsigned char C2SP:1; + unsigned char C2POL:1; + unsigned char C2OE:1; + unsigned char C2OUT:1; + unsigned char C2ON:1; + }; +} __CM2CON0_bits_t; +extern volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; + +#define C2CH0 CM2CON0_bits.C2CH0 +#define C2CH1 CM2CON0_bits.C2CH1 +#define C2R CM2CON0_bits.C2R +#define C2SP CM2CON0_bits.C2SP +#define C2POL CM2CON0_bits.C2POL +#define C2OE CM2CON0_bits.C2OE +#define C2OUT CM2CON0_bits.C2OUT +#define C2ON CM2CON0_bits.C2ON + +// ----- CM2CON1 bits -------------------- +typedef union { + struct { + unsigned char C2SYNC:1; + unsigned char T1GSS:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char MC2OUT:1; + unsigned char MC1OUT:1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char OPAON:1; + }; +} __CM2CON1_bits_t; +extern volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; + +#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 + +// ----- EECON1 bits -------------------- +typedef union { + struct { + unsigned char RD:1; + unsigned char WR:1; + unsigned char WREN:1; + unsigned char WRERR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EECON1_bits_t; +extern volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; + +#define RD EECON1_bits.RD +#define WR EECON1_bits.WR +#define WREN EECON1_bits.WREN +#define WRERR EECON1_bits.WRERR + // ----- INTCON bits -------------------- typedef union { struct { @@ -447,6 +585,50 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE +// ----- IOC bits -------------------- +typedef union { + struct { + unsigned char IOC0:1; + unsigned char IOC1:1; + unsigned char IOC2:1; + unsigned char IOC3:1; + unsigned char IOC4:1; + unsigned char IOC5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOC_bits_t; +extern volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; + +#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 + +// ----- IOCA bits -------------------- +typedef union { + struct { + unsigned char IOCA0:1; + unsigned char IOCA1:1; + unsigned char IOCA2:1; + unsigned char IOCA3:1; + unsigned char IOCA4:1; + unsigned char IOCA5:1; + unsigned char :1; + unsigned char :1; + }; +} __IOCA_bits_t; +extern volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; + +#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 + // ----- OPTION_REG bits -------------------- typedef union { struct { @@ -512,56 +694,6 @@ typedef union { unsigned char ANS2:1; unsigned char ANS3:1; unsigned char ANS4:1; - unsigned char WPUA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char ANS8:1; - unsigned char ANS9:1; - unsigned char ANS10:1; - unsigned char ANS11:1; - unsigned char WPUA4:1; - unsigned char IOC5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char WPUA0:1; - unsigned char WPUA1:1; - unsigned char WPUA2:1; - unsigned char WPUA3:1; - unsigned char IOC4:1; - unsigned char IOCA5:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOC0:1; - unsigned char IOC1:1; - unsigned char IOC2:1; - unsigned char IOC3:1; - unsigned char IOCA4:1; - unsigned char BGST:1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char IOCA0:1; - unsigned char IOCA1:1; - unsigned char IOCA2:1; - unsigned char IOCA3:1; - unsigned char VRBB:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - }; - struct { - unsigned char :1; - unsigned char CVROE:1; - unsigned char VROE:1; - unsigned char VREN:1; - unsigned char :1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -571,42 +703,15 @@ extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; #define TUN0 OSCTUNE_bits.TUN0 #define ANS0 OSCTUNE_bits.ANS0 -#define ANS8 OSCTUNE_bits.ANS8 -#define WPUA0 OSCTUNE_bits.WPUA0 -#define IOC0 OSCTUNE_bits.IOC0 -#define IOCA0 OSCTUNE_bits.IOCA0 #define TUN1 OSCTUNE_bits.TUN1 #define ANS1 OSCTUNE_bits.ANS1 -#define ANS9 OSCTUNE_bits.ANS9 -#define WPUA1 OSCTUNE_bits.WPUA1 -#define IOC1 OSCTUNE_bits.IOC1 -#define IOCA1 OSCTUNE_bits.IOCA1 -#define CVROE OSCTUNE_bits.CVROE #define TUN2 OSCTUNE_bits.TUN2 #define ANS2 OSCTUNE_bits.ANS2 -#define ANS10 OSCTUNE_bits.ANS10 -#define WPUA2 OSCTUNE_bits.WPUA2 -#define IOC2 OSCTUNE_bits.IOC2 -#define IOCA2 OSCTUNE_bits.IOCA2 -#define VROE OSCTUNE_bits.VROE #define TUN3 OSCTUNE_bits.TUN3 #define ANS3 OSCTUNE_bits.ANS3 -#define ANS11 OSCTUNE_bits.ANS11 -#define WPUA3 OSCTUNE_bits.WPUA3 -#define IOC3 OSCTUNE_bits.IOC3 -#define IOCA3 OSCTUNE_bits.IOCA3 -#define VREN OSCTUNE_bits.VREN #define TUN4 OSCTUNE_bits.TUN4 #define ANS4 OSCTUNE_bits.ANS4 -#define WPUA4 OSCTUNE_bits.WPUA4 -#define IOC4 OSCTUNE_bits.IOC4 -#define IOCA4 OSCTUNE_bits.IOCA4 -#define VRBB OSCTUNE_bits.VRBB #define ANS5 OSCTUNE_bits.ANS5 -#define WPUA5 OSCTUNE_bits.WPUA5 -#define IOC5 OSCTUNE_bits.IOC5 -#define IOCA5 OSCTUNE_bits.IOCA5 -#define BGST OSCTUNE_bits.BGST #define ANS6 OSCTUNE_bits.ANS6 #define ANS7 OSCTUNE_bits.ANS7 @@ -713,6 +818,186 @@ extern volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; #define ADIF PIR1_bits.ADIF #define EEIF PIR1_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PWMCLK bits -------------------- +typedef union { + struct { + unsigned char PER0:1; + unsigned char PER1:1; + unsigned char PER2:1; + unsigned char PER3:1; + unsigned char PER4:1; + unsigned char PWMP0:1; + unsigned char PWMP1:1; + unsigned char PWMASE:1; + }; + struct { + unsigned char PH0:1; + unsigned char PH1:1; + unsigned char PH2:1; + unsigned char PH3:1; + unsigned char PH4:1; + unsigned char C1EN:1; + unsigned char C2EN:1; + unsigned char POL:1; + }; +} __PWMCLK_bits_t; +extern volatile __PWMCLK_bits_t __at(PWMCLK_ADDR) PWMCLK_bits; + +#define PER0 PWMCLK_bits.PER0 +#define PH0 PWMCLK_bits.PH0 +#define PER1 PWMCLK_bits.PER1 +#define PH1 PWMCLK_bits.PH1 +#define PER2 PWMCLK_bits.PER2 +#define PH2 PWMCLK_bits.PH2 +#define PER3 PWMCLK_bits.PER3 +#define PH3 PWMCLK_bits.PH3 +#define PER4 PWMCLK_bits.PER4 +#define PH4 PWMCLK_bits.PH4 +#define PWMP0 PWMCLK_bits.PWMP0 +#define C1EN PWMCLK_bits.C1EN +#define PWMP1 PWMCLK_bits.PWMP1 +#define C2EN PWMCLK_bits.C2EN +#define PWMASE PWMCLK_bits.PWMASE +#define POL PWMCLK_bits.POL + +// ----- PWMCON0 bits -------------------- +typedef union { + struct { + unsigned char PH1EN:1; + unsigned char PH2EN:1; + unsigned char SYNC0:1; + unsigned char SYNC1:1; + unsigned char BLANK1:1; + unsigned char BLANK2:1; + unsigned char PASEN:1; + unsigned char PRSEN:1; + }; +} __PWMCON0_bits_t; +extern volatile __PWMCON0_bits_t __at(PWMCON0_ADDR) PWMCON0_bits; + +#define PH1EN PWMCON0_bits.PH1EN +#define PH2EN PWMCON0_bits.PH2EN +#define SYNC0 PWMCON0_bits.SYNC0 +#define SYNC1 PWMCON0_bits.SYNC1 +#define BLANK1 PWMCON0_bits.BLANK1 +#define BLANK2 PWMCON0_bits.BLANK2 +#define PASEN PWMCON0_bits.PASEN +#define PRSEN PWMCON0_bits.PRSEN + +// ----- PWMCON1 bits -------------------- +typedef union { + struct { + unsigned char CMDLY0:1; + unsigned char CMDLY1:1; + unsigned char CMDLY2:1; + unsigned char CMDLY3:1; + unsigned char CMDLY4:1; + unsigned char COMOD0:1; + unsigned char COMOD1:1; + unsigned char :1; + }; +} __PWMCON1_bits_t; +extern volatile __PWMCON1_bits_t __at(PWMCON1_ADDR) PWMCON1_bits; + +#define CMDLY0 PWMCON1_bits.CMDLY0 +#define CMDLY1 PWMCON1_bits.CMDLY1 +#define CMDLY2 PWMCON1_bits.CMDLY2 +#define CMDLY3 PWMCON1_bits.CMDLY3 +#define CMDLY4 PWMCON1_bits.CMDLY4 +#define COMOD0 PWMCON1_bits.COMOD0 +#define COMOD1 PWMCON1_bits.COMOD1 + +// ----- REFCON bits -------------------- +typedef union { + struct { + unsigned char :1; + unsigned char CVROE:1; + unsigned char VROE:1; + unsigned char VREN:1; + unsigned char VRBB:1; + unsigned char BGST:1; + unsigned char :1; + unsigned char :1; + }; +} __REFCON_bits_t; +extern volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; + +#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 + // ----- STATUS bits -------------------- typedef union { struct { @@ -795,6 +1080,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- VRCON bits -------------------- typedef union { struct { @@ -802,160 +1157,21 @@ typedef union { unsigned char VR1:1; unsigned char VR2:1; unsigned char VR3:1; - unsigned char ADCS0:1; + unsigned char :1; unsigned char VRR:1; unsigned char C2VREN:1; unsigned char C1VREN:1; }; - struct { - unsigned char RD:1; - unsigned char WR:1; - unsigned char WREN:1; - unsigned char WRERR:1; - unsigned char CMDLY4:1; - unsigned char ADCS1:1; - unsigned char ADCS2:1; - unsigned char PRSEN:1; - }; - struct { - unsigned char CMDLY0:1; - unsigned char CMDLY1:1; - unsigned char CMDLY2:1; - unsigned char CMDLY3:1; - unsigned char BLANK1:1; - unsigned char COMOD0:1; - unsigned char COMOD1:1; - unsigned char PWMASE:1; - }; - struct { - unsigned char PH1EN:1; - unsigned char PH2EN:1; - unsigned char SYNC0:1; - unsigned char SYNC1:1; - unsigned char PER4:1; - unsigned char BLANK2:1; - unsigned char PASEN:1; - unsigned char POL:1; - }; - struct { - unsigned char PER0:1; - unsigned char PER1:1; - unsigned char PER2:1; - unsigned char PER3:1; - unsigned char PH4:1; - unsigned char PWMP0:1; - unsigned char PWMP1:1; - unsigned char C1ON:1; - }; - struct { - unsigned char PH0:1; - unsigned char PH1:1; - unsigned char PH2:1; - unsigned char PH3:1; - unsigned char C1POL:1; - unsigned char C1EN:1; - unsigned char C2EN:1; - unsigned char C2ON:1; - }; - struct { - unsigned char C1CH0:1; - unsigned char C1CH1:1; - unsigned char C1R:1; - unsigned char C1SP:1; - unsigned char C2POL:1; - unsigned char C1OE:1; - unsigned char C1OUT:1; - unsigned char MC1OUT:1; - }; - struct { - unsigned char C2CH0:1; - unsigned char C2CH1:1; - unsigned char C2R:1; - unsigned char C2SP:1; - unsigned char :1; - unsigned char C2OE:1; - unsigned char C2OUT:1; - unsigned char OPAON:1; - }; - struct { - unsigned char C2SYNC:1; - unsigned char T1GSS:1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char :1; - unsigned char MC2OUT:1; - unsigned char :1; - }; } __VRCON_bits_t; extern volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; #define VR0 VRCON_bits.VR0 -#define RD VRCON_bits.RD -#define CMDLY0 VRCON_bits.CMDLY0 -#define PH1EN VRCON_bits.PH1EN -#define PER0 VRCON_bits.PER0 -#define PH0 VRCON_bits.PH0 -#define C1CH0 VRCON_bits.C1CH0 -#define C2CH0 VRCON_bits.C2CH0 -#define C2SYNC VRCON_bits.C2SYNC #define VR1 VRCON_bits.VR1 -#define WR VRCON_bits.WR -#define CMDLY1 VRCON_bits.CMDLY1 -#define PH2EN VRCON_bits.PH2EN -#define PER1 VRCON_bits.PER1 -#define PH1 VRCON_bits.PH1 -#define C1CH1 VRCON_bits.C1CH1 -#define C2CH1 VRCON_bits.C2CH1 -#define T1GSS VRCON_bits.T1GSS #define VR2 VRCON_bits.VR2 -#define WREN VRCON_bits.WREN -#define CMDLY2 VRCON_bits.CMDLY2 -#define SYNC0 VRCON_bits.SYNC0 -#define PER2 VRCON_bits.PER2 -#define PH2 VRCON_bits.PH2 -#define C1R VRCON_bits.C1R -#define C2R VRCON_bits.C2R #define VR3 VRCON_bits.VR3 -#define WRERR VRCON_bits.WRERR -#define CMDLY3 VRCON_bits.CMDLY3 -#define SYNC1 VRCON_bits.SYNC1 -#define PER3 VRCON_bits.PER3 -#define PH3 VRCON_bits.PH3 -#define C1SP VRCON_bits.C1SP -#define C2SP VRCON_bits.C2SP -#define ADCS0 VRCON_bits.ADCS0 -#define CMDLY4 VRCON_bits.CMDLY4 -#define BLANK1 VRCON_bits.BLANK1 -#define PER4 VRCON_bits.PER4 -#define PH4 VRCON_bits.PH4 -#define C1POL VRCON_bits.C1POL -#define C2POL VRCON_bits.C2POL #define VRR VRCON_bits.VRR -#define ADCS1 VRCON_bits.ADCS1 -#define COMOD0 VRCON_bits.COMOD0 -#define BLANK2 VRCON_bits.BLANK2 -#define PWMP0 VRCON_bits.PWMP0 -#define C1EN VRCON_bits.C1EN -#define C1OE VRCON_bits.C1OE -#define C2OE VRCON_bits.C2OE #define C2VREN VRCON_bits.C2VREN -#define ADCS2 VRCON_bits.ADCS2 -#define COMOD1 VRCON_bits.COMOD1 -#define PASEN VRCON_bits.PASEN -#define PWMP1 VRCON_bits.PWMP1 -#define C2EN VRCON_bits.C2EN -#define C1OUT VRCON_bits.C1OUT -#define C2OUT VRCON_bits.C2OUT -#define MC2OUT VRCON_bits.MC2OUT #define C1VREN VRCON_bits.C1VREN -#define PRSEN VRCON_bits.PRSEN -#define PWMASE VRCON_bits.PWMASE -#define POL VRCON_bits.POL -#define C1ON VRCON_bits.C1ON -#define C2ON VRCON_bits.C2ON -#define MC1OUT VRCON_bits.MC1OUT -#define OPAON VRCON_bits.OPAON // ----- WDTCON bits -------------------- typedef union { @@ -978,4 +1194,26 @@ extern volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; #define WDTPS2 WDTCON_bits.WDTPS2 #define WDTPS3 WDTCON_bits.WDTPS3 +// ----- WPUA bits -------------------- +typedef union { + struct { + unsigned char WPUA0:1; + unsigned char WPUA1:1; + unsigned char WPUA2:1; + unsigned char WPUA3:1; + unsigned char WPUA4:1; + unsigned char WPUA5:1; + unsigned char :1; + unsigned char :1; + }; +} __WPUA_bits_t; +extern volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; + +#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 diff --git a/device/include/pic/pic16f818.h b/device/include/pic/pic16f818.h index ba5f6210..27d9f66b 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -196,7 +196,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -579,6 +579,52 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -769,4 +815,50 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16f819.h b/device/include/pic/pic16f819.h index 44761517..9e65cdb8 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -196,7 +196,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -580,6 +580,52 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -770,4 +816,50 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + #endif diff --git a/device/include/pic/pic16f84.h b/device/include/pic/pic16f84.h index ae3ebb00..ae7b4e6e 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -225,6 +225,51 @@ extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; #define INTEDG OPTION_REG_bits.INTEDG #define NOT_RBPU OPTION_REG_bits.NOT_RBPU +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -249,50 +294,49 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP -// ----- PORTA bits -------------------- +// ----- TRISA bits -------------------- typedef union { - struct { - unsigned char RA0:1; - unsigned char RA1:1; - unsigned char RA2:1; - unsigned char RA3:1; - unsigned char RA4:1; + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; unsigned char :1; unsigned char :1; unsigned char :1; - }; -} __PORTA_bits_t; -extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; - -#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 + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; -// ----- PORTB bits -------------------- +#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 +// ----- TRISB bits -------------------- typedef union { - struct { - unsigned char RB0:1; - unsigned char RB1:1; - unsigned char RB2:1; - unsigned char RB3:1; - unsigned char RB4:1; - unsigned char RB5:1; - unsigned char RB6:1; - unsigned char RB7:1; - }; -} __PORTB_bits_t; -extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; - -#define RB0 PORTB_bits.RB0 -#define RB1 PORTB_bits.RB1 -#define RB2 PORTB_bits.RB2 -#define RB3 PORTB_bits.RB3 -#define RB4 PORTB_bits.RB4 -#define RB5 PORTB_bits.RB5 -#define RB6 PORTB_bits.RB6 -#define RB7 PORTB_bits.RB7 + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 #endif diff --git a/device/include/pic/pic16f84a.h b/device/include/pic/pic16f84a.h index 46c9403c..1ef0e0ad 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -120,7 +120,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- INTCON Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- EECON1 Bits -------------------------------------------------------- @@ -223,6 +223,51 @@ extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; #define INTEDG OPTION_REG_bits.INTEDG #define NOT_RBPU OPTION_REG_bits.NOT_RBPU +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- STATUS bits -------------------- typedef union { struct { @@ -247,50 +292,49 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; #define RP1 STATUS_bits.RP1 #define IRP STATUS_bits.IRP -// ----- PORTA bits -------------------- +// ----- TRISA bits -------------------- typedef union { - struct { - unsigned char RA0:1; - unsigned char RA1:1; - unsigned char RA2:1; - unsigned char RA3:1; - unsigned char RA4:1; + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; unsigned char :1; unsigned char :1; unsigned char :1; - }; -} __PORTA_bits_t; -extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; - -#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 + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; -// ----- PORTB bits -------------------- +#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 +// ----- TRISB bits -------------------- typedef union { - struct { - unsigned char RB0:1; - unsigned char RB1:1; - unsigned char RB2:1; - unsigned char RB3:1; - unsigned char RB4:1; - unsigned char RB5:1; - unsigned char RB6:1; - unsigned char RB7:1; - }; -} __PORTB_bits_t; -extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; - -#define RB0 PORTB_bits.RB0 -#define RB1 PORTB_bits.RB1 -#define RB2 PORTB_bits.RB2 -#define RB3 PORTB_bits.RB3 -#define RB4 PORTB_bits.RB4 -#define RB5 PORTB_bits.RB5 -#define RB6 PORTB_bits.RB6 -#define RB7 PORTB_bits.RB7 + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 #endif diff --git a/device/include/pic/pic16f87.h b/device/include/pic/pic16f87.h index 7fa5def4..0868b2be 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -199,7 +199,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- RCSTA Bits --------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -598,6 +598,52 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define CMIF PIR2_bits.CMIF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -847,6 +893,52 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f870.h b/device/include/pic/pic16f870.h index 322cf8f2..dea3cd83 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -174,7 +174,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- STATUS Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- INTCON Bits -------------------------------------------------------- @@ -527,6 +527,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -676,6 +746,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f871.h b/device/include/pic/pic16f871.h index c37b8323..84cbfd3d 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -181,7 +181,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- STATUS Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- INTCON Bits -------------------------------------------------------- @@ -540,6 +540,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -689,6 +802,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f872.h b/device/include/pic/pic16f872.h index 8ecab5a4..0d05fb28 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -197,7 +197,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -533,6 +533,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- SSPCON bits -------------------- typedef union { struct { @@ -758,4 +828,74 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + #endif diff --git a/device/include/pic/pic16f873.h b/device/include/pic/pic16f873.h index cc66a84b..f4ac07b0 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -221,7 +221,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -583,6 +583,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -866,6 +936,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f873a.h b/device/include/pic/pic16f873a.h index 0e7921a9..ed79b55c 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -224,7 +224,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -639,6 +639,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -922,6 +992,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f874.h b/device/include/pic/pic16f874.h index 566dae51..9f9af250 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -230,7 +230,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits -------------------------------------------------------- +//----- OPTION_REG Bits -------------------------------------------------------- //----- TRISE Bits --------------------------------------------------------- @@ -596,6 +596,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -879,6 +992,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f874a.h b/device/include/pic/pic16f874a.h index 06464f55..663391dd 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -232,7 +232,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- TRISE Bits --------------------------------------------------------- @@ -652,6 +652,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -935,6 +1048,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f876.h b/device/include/pic/pic16f876.h index 84765b4a..2f962aa0 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -222,7 +222,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ---------------------------------------------------- +//----- OPTION_REG Bits ---------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -584,6 +584,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -867,6 +937,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f876a.h b/device/include/pic/pic16f876a.h index e558b0de..ae23e8b4 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -224,7 +224,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -639,6 +639,76 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -922,6 +992,76 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f877.h b/device/include/pic/pic16f877.h index d967feda..c9343a1c 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -229,7 +229,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- TRISE Bits --------------------------------------------------------- @@ -595,6 +595,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define BCLIF PIR2_bits.BCLIF #define EEIF PIR2_bits.EEIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -878,6 +991,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f877a.h b/device/include/pic/pic16f877a.h index 5a4be49c..5fa4fda1 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -232,7 +232,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- TRISE Bits --------------------------------------------------------- @@ -664,6 +664,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define EEIF PIR2_bits.EEIF #define CMIF PIR2_bits.CMIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -947,6 +1060,100 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + // ----- TRISE bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f88.h b/device/include/pic/pic16f88.h index e3e88a78..47d337bf 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -211,7 +211,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -676,6 +676,52 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define CMIF PIR2_bits.CMIF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -925,6 +971,52 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f913.h b/device/include/pic/pic16f913.h index 46fbf65b..8ce61068 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -263,7 +263,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -333,38 +333,38 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- LVDCON Bits -------------------------------------------------------- -//----- LCDDATA0 Bits ------------------------------------------------------- +//----- LCDDAT0 Bits ------------------------------------------------------- -//----- LCDDATA1 Bits ------------------------------------------------------- +//----- LCDDAT1 Bits ------------------------------------------------------- -//----- LCDDATA3 Bits ------------------------------------------------------- +//----- LCDDAT3 Bits ------------------------------------------------------- -//----- LCDDATA4 Bits ------------------------------------------------------- +//----- LCDDAT4 Bits ------------------------------------------------------- -//----- LCDDATA6 Bits ------------------------------------------------------- +//----- LCDDAT6 Bits ------------------------------------------------------- -//----- LCDDATA7 Bits ------------------------------------------------------- +//----- LCDDAT7 Bits ------------------------------------------------------- -//----- LCDDATA9 Bits ------------------------------------------------------- +//----- LCDDAT9 Bits ------------------------------------------------------- -//----- LCDDATA10 Bits ------------------------------------------------------- +//----- LCDDAT10 Bits ------------------------------------------------------- @@ -1364,6 +1364,95 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -1625,6 +1714,95 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISE bits -------------------- +typedef union { + struct { + unsigned char TRISE0:1; + unsigned char TRISE1:1; + unsigned char TRISE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __TRISE_bits_t; +extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; + +#define TRISE0 TRISE_bits.TRISE0 +#define TRISE1 TRISE_bits.TRISE1 +#define TRISE2 TRISE_bits.TRISE2 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f914.h b/device/include/pic/pic16f914.h index 9b93ca51..f7f7c6fc 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -285,7 +285,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -355,51 +355,51 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- LVDCON Bits -------------------------------------------------------- -//----- LCDDATA0 Bits ------------------------------------------------------- +//----- LCDDAT0 Bits ------------------------------------------------------- -//----- LCDDATA1 Bits ------------------------------------------------------- +//----- LCDDAT1 Bits ------------------------------------------------------- -//----- LCDDATA2 Bits ------------------------------------------------------- +//----- LCDDAT2 Bits ------------------------------------------------------- -//----- LCDDATA3 Bits ------------------------------------------------------- +//----- LCDDAT3 Bits ------------------------------------------------------- -//----- LCDDATA4 Bits ------------------------------------------------------- +//----- LCDDAT4 Bits ------------------------------------------------------- -//----- LCDDATA5 Bits ------------------------------------------------------- +//----- LCDDAT5 Bits ------------------------------------------------------- -//----- LCDDATA6 Bits ------------------------------------------------------- +//----- LCDDAT6 Bits ------------------------------------------------------- -//----- LCDDATA7 Bits ------------------------------------------------------- +//----- LCDDAT7 Bits ------------------------------------------------------- -//----- LCDDATA8 Bits ------------------------------------------------------- +//----- LCDDAT8 Bits ------------------------------------------------------- -//----- LCDDATA9 Bits ------------------------------------------------------- +//----- LCDDAT9 Bits ------------------------------------------------------- -//----- LCDDATA10 Bits ------------------------------------------------------- +//----- LCDDAT10 Bits ------------------------------------------------------- -//----- LCDDATA11 Bits ------------------------------------------------------- +//----- LCDDAT11 Bits ------------------------------------------------------- @@ -411,7 +411,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; -//----- LCDSE2 Bits -------------------------------------------------------- +//----- LCDSE3 Bits -------------------------------------------------------- @@ -1637,6 +1637,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -1898,6 +2011,119 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + +// ----- TRISE bits -------------------- +typedef union { + struct { + unsigned char TRISE0:1; + unsigned char TRISE1:1; + unsigned char TRISE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __TRISE_bits_t; +extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; + +#define TRISE0 TRISE_bits.TRISE0 +#define TRISE1 TRISE_bits.TRISE1 +#define TRISE2 TRISE_bits.TRISE2 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f916.h b/device/include/pic/pic16f916.h index d776cb29..42175544 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -263,7 +263,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -333,38 +333,38 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- LVDCON Bits -------------------------------------------------------- -//----- LCDDATA0 Bits ------------------------------------------------------- +//----- LCDDAT0 Bits ------------------------------------------------------- -//----- LCDDATA1 Bits ------------------------------------------------------- +//----- LCDDAT1 Bits ------------------------------------------------------- -//----- LCDDATA3 Bits ------------------------------------------------------- +//----- LCDDAT3 Bits ------------------------------------------------------- -//----- LCDDATA4 Bits ------------------------------------------------------- +//----- LCDDAT4 Bits ------------------------------------------------------- -//----- LCDDATA6 Bits ------------------------------------------------------- +//----- LCDDAT6 Bits ------------------------------------------------------- -//----- LCDDATA7 Bits ------------------------------------------------------- +//----- LCDDAT7 Bits ------------------------------------------------------- -//----- LCDDATA9 Bits ------------------------------------------------------- +//----- LCDDAT9 Bits ------------------------------------------------------- -//----- LCDDATA10 Bits ------------------------------------------------------- +//----- LCDDAT10 Bits ------------------------------------------------------- @@ -1364,6 +1364,95 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -1625,6 +1714,95 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISE bits -------------------- +typedef union { + struct { + unsigned char TRISE0:1; + unsigned char TRISE1:1; + unsigned char TRISE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __TRISE_bits_t; +extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; + +#define TRISE0 TRISE_bits.TRISE0 +#define TRISE1 TRISE_bits.TRISE1 +#define TRISE2 TRISE_bits.TRISE2 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f917.h b/device/include/pic/pic16f917.h index e2eeddd5..c37c56c2 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 V1.6 +// inc2h.pl V4514 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -285,7 +285,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- ADCON0 Bits -------------------------------------------------------- -//----- OPTION Bits ----------------------------------------------------- +//----- OPTION_REG Bits ----------------------------------------------------- //----- PIE1 Bits ---------------------------------------------------------- @@ -355,51 +355,51 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- LVDCON Bits -------------------------------------------------------- -//----- LCDDATA0 Bits ------------------------------------------------------- +//----- LCDDAT0 Bits ------------------------------------------------------- -//----- LCDDATA1 Bits ------------------------------------------------------- +//----- LCDDAT1 Bits ------------------------------------------------------- -//----- LCDDATA2 Bits ------------------------------------------------------- +//----- LCDDAT2 Bits ------------------------------------------------------- -//----- LCDDATA3 Bits ------------------------------------------------------- +//----- LCDDAT3 Bits ------------------------------------------------------- -//----- LCDDATA4 Bits ------------------------------------------------------- +//----- LCDDAT4 Bits ------------------------------------------------------- -//----- LCDDATA5 Bits ------------------------------------------------------- +//----- LCDDAT5 Bits ------------------------------------------------------- -//----- LCDDATA6 Bits ------------------------------------------------------- +//----- LCDDAT6 Bits ------------------------------------------------------- -//----- LCDDATA7 Bits ------------------------------------------------------- +//----- LCDDAT7 Bits ------------------------------------------------------- -//----- LCDDATA8 Bits ------------------------------------------------------- +//----- LCDDAT8 Bits ------------------------------------------------------- -//----- LCDDATA9 Bits ------------------------------------------------------- +//----- LCDDAT9 Bits ------------------------------------------------------- -//----- LCDDATA10 Bits ------------------------------------------------------- +//----- LCDDAT10 Bits ------------------------------------------------------- -//----- LCDDATA11 Bits ------------------------------------------------------- +//----- LCDDAT11 Bits ------------------------------------------------------- @@ -411,7 +411,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; -//----- LCDSE2 Bits -------------------------------------------------------- +//----- LCDSE3 Bits -------------------------------------------------------- @@ -1637,6 +1637,119 @@ extern volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; #define C2IF PIR2_bits.C2IF #define OSFIF PIR2_bits.OSFIF +// ----- PORTA bits -------------------- +typedef union { + struct { + unsigned char RA0:1; + unsigned char RA1:1; + unsigned char RA2:1; + unsigned char RA3:1; + unsigned char RA4:1; + unsigned char RA5:1; + unsigned char :1; + unsigned char :1; + }; +} __PORTA_bits_t; +extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; + +#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 + +// ----- PORTB bits -------------------- +typedef union { + struct { + unsigned char RB0:1; + unsigned char RB1:1; + unsigned char RB2:1; + unsigned char RB3:1; + unsigned char RB4:1; + unsigned char RB5:1; + unsigned char RB6:1; + unsigned char RB7:1; + }; +} __PORTB_bits_t; +extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; + +#define RB0 PORTB_bits.RB0 +#define RB1 PORTB_bits.RB1 +#define RB2 PORTB_bits.RB2 +#define RB3 PORTB_bits.RB3 +#define RB4 PORTB_bits.RB4 +#define RB5 PORTB_bits.RB5 +#define RB6 PORTB_bits.RB6 +#define RB7 PORTB_bits.RB7 + +// ----- PORTC bits -------------------- +typedef union { + struct { + unsigned char RC0:1; + unsigned char RC1:1; + unsigned char RC2:1; + unsigned char RC3:1; + unsigned char RC4:1; + unsigned char RC5:1; + unsigned char RC6:1; + unsigned char RC7:1; + }; +} __PORTC_bits_t; +extern volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; + +#define RC0 PORTC_bits.RC0 +#define RC1 PORTC_bits.RC1 +#define RC2 PORTC_bits.RC2 +#define RC3 PORTC_bits.RC3 +#define RC4 PORTC_bits.RC4 +#define RC5 PORTC_bits.RC5 +#define RC6 PORTC_bits.RC6 +#define RC7 PORTC_bits.RC7 + +// ----- PORTD bits -------------------- +typedef union { + struct { + unsigned char RD0:1; + unsigned char RD1:1; + unsigned char RD2:1; + unsigned char RD3:1; + unsigned char RD4:1; + unsigned char RD5:1; + unsigned char RD6:1; + unsigned char RD7:1; + }; +} __PORTD_bits_t; +extern volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; + +#define RD0 PORTD_bits.RD0 +#define RD1 PORTD_bits.RD1 +#define RD2 PORTD_bits.RD2 +#define RD3 PORTD_bits.RD3 +#define RD4 PORTD_bits.RD4 +#define RD5 PORTD_bits.RD5 +#define RD6 PORTD_bits.RD6 +#define RD7 PORTD_bits.RD7 + +// ----- PORTE bits -------------------- +typedef union { + struct { + unsigned char RE0:1; + unsigned char RE1:1; + unsigned char RE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __PORTE_bits_t; +extern volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; + +#define RE0 PORTE_bits.RE0 +#define RE1 PORTE_bits.RE1 +#define RE2 PORTE_bits.RE2 + // ----- RCSTA bits -------------------- typedef union { struct { @@ -1898,6 +2011,119 @@ extern volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; #define TOUTPS2 T2CON_bits.TOUTPS2 #define TOUTPS3 T2CON_bits.TOUTPS3 +// ----- TRISA bits -------------------- +typedef union { + struct { + unsigned char TRISA0:1; + unsigned char TRISA1:1; + unsigned char TRISA2:1; + unsigned char TRISA3:1; + unsigned char TRISA4:1; + unsigned char TRISA5:1; + unsigned char :1; + unsigned char :1; + }; +} __TRISA_bits_t; +extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; + +#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 + +// ----- TRISB bits -------------------- +typedef union { + struct { + unsigned char TRISB0:1; + unsigned char TRISB1:1; + unsigned char TRISB2:1; + unsigned char TRISB3:1; + unsigned char TRISB4:1; + unsigned char TRISB5:1; + unsigned char TRISB6:1; + unsigned char TRISB7:1; + }; +} __TRISB_bits_t; +extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; + +#define TRISB0 TRISB_bits.TRISB0 +#define TRISB1 TRISB_bits.TRISB1 +#define TRISB2 TRISB_bits.TRISB2 +#define TRISB3 TRISB_bits.TRISB3 +#define TRISB4 TRISB_bits.TRISB4 +#define TRISB5 TRISB_bits.TRISB5 +#define TRISB6 TRISB_bits.TRISB6 +#define TRISB7 TRISB_bits.TRISB7 + +// ----- TRISC bits -------------------- +typedef union { + struct { + unsigned char TRISC0:1; + unsigned char TRISC1:1; + unsigned char TRISC2:1; + unsigned char TRISC3:1; + unsigned char TRISC4:1; + unsigned char TRISC5:1; + unsigned char TRISC6:1; + unsigned char TRISC7:1; + }; +} __TRISC_bits_t; +extern volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; + +#define TRISC0 TRISC_bits.TRISC0 +#define TRISC1 TRISC_bits.TRISC1 +#define TRISC2 TRISC_bits.TRISC2 +#define TRISC3 TRISC_bits.TRISC3 +#define TRISC4 TRISC_bits.TRISC4 +#define TRISC5 TRISC_bits.TRISC5 +#define TRISC6 TRISC_bits.TRISC6 +#define TRISC7 TRISC_bits.TRISC7 + +// ----- TRISD bits -------------------- +typedef union { + struct { + unsigned char TRISD0:1; + unsigned char TRISD1:1; + unsigned char TRISD2:1; + unsigned char TRISD3:1; + unsigned char TRISD4:1; + unsigned char TRISD5:1; + unsigned char TRISD6:1; + unsigned char TRISD7:1; + }; +} __TRISD_bits_t; +extern volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; + +#define TRISD0 TRISD_bits.TRISD0 +#define TRISD1 TRISD_bits.TRISD1 +#define TRISD2 TRISD_bits.TRISD2 +#define TRISD3 TRISD_bits.TRISD3 +#define TRISD4 TRISD_bits.TRISD4 +#define TRISD5 TRISD_bits.TRISD5 +#define TRISD6 TRISD_bits.TRISD6 +#define TRISD7 TRISD_bits.TRISD7 + +// ----- TRISE bits -------------------- +typedef union { + struct { + unsigned char TRISE0:1; + unsigned char TRISE1:1; + unsigned char TRISE2:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __TRISE_bits_t; +extern volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; + +#define TRISE0 TRISE_bits.TRISE0 +#define TRISE1 TRISE_bits.TRISE1 +#define TRISE2 TRISE_bits.TRISE2 + // ----- TXSTA bits -------------------- typedef union { struct { diff --git a/device/lib/pic/libdev/Makefile.in b/device/lib/pic/libdev/Makefile.in index cf9bc296..6545b098 100644 --- a/device/lib/pic/libdev/Makefile.in +++ b/device/lib/pic/libdev/Makefile.in @@ -22,26 +22,29 @@ ifeq (0,1) # useful while fixing .inc files GPUTILS = /opt/modules/gputils-0.13.3/share/gputils pic%.c : $(GPUTILS)/header/p%.inc - -$(SDCC_BASE)/support/scripts/inc2h.pl $* $(GPUTILS) \ - > $(SDCC_BASE)/device/include/pic/pic$*.h + -$(SDCC_BASE)/support/scripts/inc2h.pl $* $(GPUTILS); + -mv pic$*.h $(SDCC_BASE)/device/include/pic/pic$*.h; endif pic%.o : pic%.c - -$(CC) $(CPPFLAGS) $(CFLAGS) -mpic14 -p$* -o "$@" -c "$<" +ifndef SILENT + @echo "[ CC ] ==> $(patsubst $(top_builddir)/%,%,$@)" +endif + @-$(CC) $(CPPFLAGS) $(CFLAGS) -mpic14 -p$* -o "$@" -c "$<" $(INSTALL_DIR)/%.lib : %.o - -$(LIB) -c "$@" "$<"; + @-$(LIB) -c "$@" "$<"; install : all clean : clean-intermediate - $(Q)-$(RM) *.asm - $(Q)-$(RM) $(OBJS) $(LIBS) - $(Q)-$(RMDIR) ../build/libdev + @-$(RM) *.asm + @-$(RM) $(OBJS) $(LIBS) + @-$(RMDIR) ../build/libdev distclean: clean - $(Q)-$(RM) Makefile + @-$(RM) Makefile clean-intermediate : - $(Q)-$(RM) *.lst *.d *.adb + @-$(RM) *.lst *.d *.adb diff --git a/device/lib/pic/libdev/devices.txt b/device/lib/pic/libdev/devices.txt new file mode 100644 index 00000000..bfa3b562 --- /dev/null +++ b/device/lib/pic/libdev/devices.txt @@ -0,0 +1,82 @@ +12f629 +12f635 +12f675 +12f683 +16c432 +16c433 +16c554 +16c557 +16c558 +16c62 +16c620 +16c620a +16c621 +16c621a +16c622 +16c622a +16c63a +16c65b +16c71 +16c710 +16c711 +16c715 +16c717 +16c72 +16c73b +16c745 +16c74b +16c765 +16c770 +16c771 +16c773 +16c774 +16c781 +16c782 +16c925 +16c926 +16f627 +16f627a +16f628 +16f628a +16f630 +16f636 +16f639 +16f648a +16f676 +16f684 +16f685 +16f687 +16f688 +16f689 +16f690 +16f716 +16f72 +16f73 +16f737 +16f74 +16f76 +16f767 +16f77 +16f777 +16f785 +16f818 +16f819 +16f84 +16f84a +16f87 +16f870 +16f871 +16f872 +16f873 +16f873a +16f874 +16f874a +16f876 +16f876a +16f877 +16f877a +16f88 +16f913 +16f914 +16f916 +16f917 diff --git a/device/lib/pic/libdev/mkall.sh b/device/lib/pic/libdev/mkall.sh new file mode 100755 index 00000000..fff2cada --- /dev/null +++ b/device/lib/pic/libdev/mkall.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +# This script is supposed to recreate all device libraries and their +# accompanying header files from the gputils' header/*.inc files +# using sdcc/support/scripts/inc2h.pl. +# +# The devices to be created are listed in ./devices.txt, the output +# files will be located in ./build/, which is created before use. +# +# (c) 2007 by Raphael Neider +# This file is published under the terms of the GPLv2. + +GPUTILS=$HOME/svn/gputils +SDCC=$HOME/svn/sdcc + +mkdir build; +cd build; +cp $SDCC/device/lib/pic/libdev/pic14ports.txt . + +cat $SDCC/device/lib/pic/libdev/devices.txt | while read PROC; do + echo $PROC; + $SDCC/support/scripts/inc2h.pl $PROC $GPUTILS; +done + +cd ..; +mv build/*.c . +mv build/*.h $SDCC/device/include/pic/ diff --git a/device/lib/pic/libdev/pic12f629.c b/device/lib/pic/libdev/pic12f629.c index 4efac128..6a6f8c58 100644 --- a/device/lib/pic/libdev/pic12f629.c +++ b/device/lib/pic/libdev/pic12f629.c @@ -1,6 +1,6 @@ /* Register definitions for pic12f629. * This file was automatically generated by: - * inc2h.pl V1.7 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -37,6 +37,7 @@ __sfr __at (EECON2_ADDR) EECON2; // bitfield definitions // volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; diff --git a/device/lib/pic/libdev/pic12f635.c b/device/lib/pic/libdev/pic12f635.c index 92c0818c..84f24216 100644 --- a/device/lib/pic/libdev/pic12f635.c +++ b/device/lib/pic/libdev/pic12f635.c @@ -1,6 +1,6 @@ /* Register definitions for pic12f635. * This file was automatically generated by: - * inc2h.pl V1.7 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -49,14 +49,23 @@ __sfr __at (CRDAT3_ADDR) CRDAT3; // volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; +volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; +volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; +volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; +volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; diff --git a/device/lib/pic/libdev/pic12f675.c b/device/lib/pic/libdev/pic12f675.c index 6667848c..7108cff3 100644 --- a/device/lib/pic/libdev/pic12f675.c +++ b/device/lib/pic/libdev/pic12f675.c @@ -1,6 +1,6 @@ /* Register definitions for pic12f675. * This file was automatically generated by: - * inc2h.pl V1.7 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -41,7 +41,9 @@ __sfr __at (ANSEL_ADDR) ANSEL; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __GPIO_bits_t __at(GPIO_ADDR) GPIO_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; diff --git a/device/lib/pic/libdev/pic12f683.c b/device/lib/pic/libdev/pic12f683.c index a23fd02f..9dae3117 100644 --- a/device/lib/pic/libdev/pic12f683.c +++ b/device/lib/pic/libdev/pic12f683.c @@ -1,6 +1,6 @@ /* Register definitions for pic12f683. * This file was automatically generated by: - * inc2h.pl V1.7 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -51,10 +51,14 @@ __sfr __at (ANSEL_ADDR) ANSEL; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; diff --git a/device/lib/pic/libdev/pic14ports.txt b/device/lib/pic/libdev/pic14ports.txt new file mode 100644 index 00000000..a906f6ad --- /dev/null +++ b/device/lib/pic/libdev/pic14ports.txt @@ -0,0 +1,10 @@ +# Add PORT* and TRIS* bit entries if they're not in the header. +# Note, the PORTx SFR address must be in the header for the bits to be generated + +# defaults for parts not listed + * A0-5,B0-7,C0-7,D0-7,E0-2 + +# specific parts + 16f84 A0-4,B0-7 + 16f84a A0-4,B0-7 + diff --git a/device/lib/pic/libdev/pic16c432.c b/device/lib/pic/libdev/pic16c432.c index ef64668b..078f1787 100644 --- a/device/lib/pic/libdev/pic16c432.c +++ b/device/lib/pic/libdev/pic16c432.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c432. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -21,7 +21,7 @@ __sfr __at (TRISA_ADDR) TRISA; __sfr __at (TRISB_ADDR) TRISB; __sfr __at (PIE1_ADDR) PIE1; __sfr __at (PCON_ADDR) PCON; -__sfr __at (LININTF_ADDR) LININTF; +__sfr __at (LINPRT_ADDR) LINPRT; __sfr __at (VRCON_ADDR) VRCON; // @@ -29,12 +29,14 @@ __sfr __at (VRCON_ADDR) VRCON; // volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; -volatile __LININTF_bits_t __at(LININTF_ADDR) LININTF_bits; +volatile __LINPRT_bits_t __at(LINPRT_ADDR) LINPRT_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16c433.c b/device/lib/pic/libdev/pic16c433.c index 33492208..97152d33 100644 --- a/device/lib/pic/libdev/pic16c433.c +++ b/device/lib/pic/libdev/pic16c433.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c433. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include diff --git a/device/lib/pic/libdev/pic16c554.c b/device/lib/pic/libdev/pic16c554.c index c3a33610..a690590e 100644 --- a/device/lib/pic/libdev/pic16c554.c +++ b/device/lib/pic/libdev/pic16c554.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c554. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -25,5 +25,9 @@ __sfr __at (PCON_ADDR) PCON; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c557.c b/device/lib/pic/libdev/pic16c557.c index d0af45c8..1a3d6bf1 100644 --- a/device/lib/pic/libdev/pic16c557.c +++ b/device/lib/pic/libdev/pic16c557.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c557. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -27,5 +27,11 @@ __sfr __at (PCON_ADDR) PCON; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; diff --git a/device/lib/pic/libdev/pic16c558.c b/device/lib/pic/libdev/pic16c558.c index b62ce3fd..439965c3 100644 --- a/device/lib/pic/libdev/pic16c558.c +++ b/device/lib/pic/libdev/pic16c558.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c558. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -25,5 +25,9 @@ __sfr __at (PCON_ADDR) PCON; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c62.c b/device/lib/pic/libdev/pic16c62.c index 65dcebf3..35eb57de 100644 --- a/device/lib/pic/libdev/pic16c62.c +++ b/device/lib/pic/libdev/pic16c62.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c62. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -45,9 +45,15 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; diff --git a/device/lib/pic/libdev/pic16c620.c b/device/lib/pic/libdev/pic16c620.c index d3bc34fd..790f278f 100644 --- a/device/lib/pic/libdev/pic16c620.c +++ b/device/lib/pic/libdev/pic16c620.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c620. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -32,6 +32,10 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16c620a.c b/device/lib/pic/libdev/pic16c620a.c index a1aa6abc..3d0fc153 100644 --- a/device/lib/pic/libdev/pic16c620a.c +++ b/device/lib/pic/libdev/pic16c620a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c620a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -32,6 +32,10 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16c621.c b/device/lib/pic/libdev/pic16c621.c index b3971823..8ad25181 100644 --- a/device/lib/pic/libdev/pic16c621.c +++ b/device/lib/pic/libdev/pic16c621.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c621. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -32,6 +32,10 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16c621a.c b/device/lib/pic/libdev/pic16c621a.c index ae7b58ff..2f0fee44 100644 --- a/device/lib/pic/libdev/pic16c621a.c +++ b/device/lib/pic/libdev/pic16c621a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c621a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -32,6 +32,10 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16c622.c b/device/lib/pic/libdev/pic16c622.c index 36efe33b..ce95620b 100644 --- a/device/lib/pic/libdev/pic16c622.c +++ b/device/lib/pic/libdev/pic16c622.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c622. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -32,6 +32,10 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16c622a.c b/device/lib/pic/libdev/pic16c622a.c index 0aa3804e..efa52751 100644 --- a/device/lib/pic/libdev/pic16c622a.c +++ b/device/lib/pic/libdev/pic16c622a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c622a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -32,6 +32,10 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16c63a.c b/device/lib/pic/libdev/pic16c63a.c index 0f101b02..5c089989 100644 --- a/device/lib/pic/libdev/pic16c63a.c +++ b/device/lib/pic/libdev/pic16c63a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c63a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -58,11 +58,17 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16c65b.c b/device/lib/pic/libdev/pic16c65b.c index 2a4f196b..9e36bc0c 100644 --- a/device/lib/pic/libdev/pic16c65b.c +++ b/device/lib/pic/libdev/pic16c65b.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c65b. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -62,12 +62,21 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16c71.c b/device/lib/pic/libdev/pic16c71.c index 446b5988..d0315202 100644 --- a/device/lib/pic/libdev/pic16c71.c +++ b/device/lib/pic/libdev/pic16c71.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c71. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -28,5 +28,9 @@ volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c710.c b/device/lib/pic/libdev/pic16c710.c index 74c47fbd..18033833 100644 --- a/device/lib/pic/libdev/pic16c710.c +++ b/device/lib/pic/libdev/pic16c710.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c710. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -30,5 +30,9 @@ volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c711.c b/device/lib/pic/libdev/pic16c711.c index b0ed27db..9e5fc0aa 100644 --- a/device/lib/pic/libdev/pic16c711.c +++ b/device/lib/pic/libdev/pic16c711.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c711. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -30,5 +30,9 @@ volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c715.c b/device/lib/pic/libdev/pic16c715.c index 0bef8365..788396f3 100644 --- a/device/lib/pic/libdev/pic16c715.c +++ b/device/lib/pic/libdev/pic16c715.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c715. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -34,5 +34,9 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c717.c b/device/lib/pic/libdev/pic16c717.c index 14988a7e..69efee2a 100644 --- a/device/lib/pic/libdev/pic16c717.c +++ b/device/lib/pic/libdev/pic16c717.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c717. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -67,6 +67,8 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -74,4 +76,6 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c72.c b/device/lib/pic/libdev/pic16c72.c index 14d5c661..c1f4faf5 100644 --- a/device/lib/pic/libdev/pic16c72.c +++ b/device/lib/pic/libdev/pic16c72.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c72. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -50,9 +50,15 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; diff --git a/device/lib/pic/libdev/pic16c73b.c b/device/lib/pic/libdev/pic16c73b.c index 1f1fca76..4a234e41 100644 --- a/device/lib/pic/libdev/pic16c73b.c +++ b/device/lib/pic/libdev/pic16c73b.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c73b. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -63,11 +63,17 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16c745.c b/device/lib/pic/libdev/pic16c745.c index 720e609f..9fa42f60 100644 --- a/device/lib/pic/libdev/pic16c745.c +++ b/device/lib/pic/libdev/pic16c745.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c745. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -88,14 +88,20 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __UCTRL_bits_t __at(UCTRL_ADDR) UCTRL_bits; volatile __UEIE_bits_t __at(UEIE_ADDR) UEIE_bits; -volatile __UEP2_bits_t __at(UEP2_ADDR) UEP2_bits; +volatile __UEP0_bits_t __at(UEP0_ADDR) UEP0_bits; volatile __UIE_bits_t __at(UIE_ADDR) UIE_bits; volatile __USTAT_bits_t __at(USTAT_ADDR) USTAT_bits; diff --git a/device/lib/pic/libdev/pic16c74b.c b/device/lib/pic/libdev/pic16c74b.c index 32870b36..97d0e21b 100644 --- a/device/lib/pic/libdev/pic16c74b.c +++ b/device/lib/pic/libdev/pic16c74b.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c74b. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -67,12 +67,21 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16c765.c b/device/lib/pic/libdev/pic16c765.c index 4a8b8a8a..4e8ed426 100644 --- a/device/lib/pic/libdev/pic16c765.c +++ b/device/lib/pic/libdev/pic16c765.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c765. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -92,15 +92,24 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __UCTRL_bits_t __at(UCTRL_ADDR) UCTRL_bits; volatile __UEIE_bits_t __at(UEIE_ADDR) UEIE_bits; -volatile __UEP2_bits_t __at(UEP2_ADDR) UEP2_bits; +volatile __UEP0_bits_t __at(UEP0_ADDR) UEP0_bits; volatile __UIE_bits_t __at(UIE_ADDR) UIE_bits; volatile __USTAT_bits_t __at(USTAT_ADDR) USTAT_bits; diff --git a/device/lib/pic/libdev/pic16c770.c b/device/lib/pic/libdev/pic16c770.c index 050f9281..dcce2a77 100644 --- a/device/lib/pic/libdev/pic16c770.c +++ b/device/lib/pic/libdev/pic16c770.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c770. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -67,6 +67,8 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -74,4 +76,6 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c771.c b/device/lib/pic/libdev/pic16c771.c index 2535352f..7cc5385a 100644 --- a/device/lib/pic/libdev/pic16c771.c +++ b/device/lib/pic/libdev/pic16c771.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c771. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -67,6 +67,8 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -74,4 +76,6 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c773.c b/device/lib/pic/libdev/pic16c773.c index 2176f2de..7eddb892 100644 --- a/device/lib/pic/libdev/pic16c773.c +++ b/device/lib/pic/libdev/pic16c773.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c773. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -68,6 +68,9 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; @@ -76,5 +79,8 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16c774.c b/device/lib/pic/libdev/pic16c774.c index c063fad0..90f63dc8 100644 --- a/device/lib/pic/libdev/pic16c774.c +++ b/device/lib/pic/libdev/pic16c774.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c774. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -72,6 +72,11 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; @@ -80,6 +85,10 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16c781.c b/device/lib/pic/libdev/pic16c781.c index 0b50271c..69ee5bdb 100644 --- a/device/lib/pic/libdev/pic16c781.c +++ b/device/lib/pic/libdev/pic16c781.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c781. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -64,9 +64,13 @@ volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __PSMCCON0_bits_t __at(PSMCCON0_ADDR) PSMCCON0_bits; volatile __PSMCCON1_bits_t __at(PSMCCON1_ADDR) PSMCCON1_bits; volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c782.c b/device/lib/pic/libdev/pic16c782.c index 8e0d9a19..0c17df74 100644 --- a/device/lib/pic/libdev/pic16c782.c +++ b/device/lib/pic/libdev/pic16c782.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c782. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -64,9 +64,13 @@ volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __PSMCCON0_bits_t __at(PSMCCON0_ADDR) PSMCCON0_bits; volatile __PSMCCON1_bits_t __at(PSMCCON1_ADDR) PSMCCON1_bits; volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16c925.c b/device/lib/pic/libdev/pic16c925.c index ea595c00..1423c915 100644 --- a/device/lib/pic/libdev/pic16c925.c +++ b/device/lib/pic/libdev/pic16c925.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c925. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -87,10 +87,19 @@ volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; diff --git a/device/lib/pic/libdev/pic16c926.c b/device/lib/pic/libdev/pic16c926.c index 6e8c4101..29c46c56 100644 --- a/device/lib/pic/libdev/pic16c926.c +++ b/device/lib/pic/libdev/pic16c926.c @@ -1,6 +1,6 @@ /* Register definitions for pic16c926. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -87,10 +87,19 @@ volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; diff --git a/device/lib/pic/libdev/pic16f627.c b/device/lib/pic/libdev/pic16f627.c index 0af7862a..0d247a9e 100644 --- a/device/lib/pic/libdev/pic16f627.c +++ b/device/lib/pic/libdev/pic16f627.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f627. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -52,10 +52,14 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16f627a.c b/device/lib/pic/libdev/pic16f627a.c index 3a479593..e1024365 100644 --- a/device/lib/pic/libdev/pic16f627a.c +++ b/device/lib/pic/libdev/pic16f627a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f627a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -52,10 +52,14 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16f628.c b/device/lib/pic/libdev/pic16f628.c index 48883a39..9cbcb3b1 100644 --- a/device/lib/pic/libdev/pic16f628.c +++ b/device/lib/pic/libdev/pic16f628.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f628. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -52,10 +52,14 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16f628a.c b/device/lib/pic/libdev/pic16f628a.c index 04d0f5ad..59e910cb 100644 --- a/device/lib/pic/libdev/pic16f628a.c +++ b/device/lib/pic/libdev/pic16f628a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f628a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -52,10 +52,14 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16f630.c b/device/lib/pic/libdev/pic16f630.c index e32779ce..43cdb88b 100644 --- a/device/lib/pic/libdev/pic16f630.c +++ b/device/lib/pic/libdev/pic16f630.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f630. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -40,13 +40,18 @@ __sfr __at (EECON2_ADDR) EECON2; // bitfield definitions // volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCAL_bits_t __at(OSCCAL_ADDR) OSCCAL_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16f636.c b/device/lib/pic/libdev/pic16f636.c index 36c6fca2..59466f9c 100644 --- a/device/lib/pic/libdev/pic16f636.c +++ b/device/lib/pic/libdev/pic16f636.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f636. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -49,14 +49,25 @@ __sfr __at (CRDAT3_ADDR) CRDAT3; // volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; +volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; +volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; diff --git a/device/lib/pic/libdev/pic16f639.c b/device/lib/pic/libdev/pic16f639.c index ff43717f..72a9d214 100644 --- a/device/lib/pic/libdev/pic16f639.c +++ b/device/lib/pic/libdev/pic16f639.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f639. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -49,14 +49,25 @@ __sfr __at (CRDAT3_ADDR) CRDAT3; // volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __CRCON_bits_t __at(CRCON_ADDR) CRCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; +volatile __LVDCON_bits_t __at(LVDCON_ADDR) LVDCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; +volatile __WDA_bits_t __at(WDA_ADDR) WDA_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +volatile __WPUDA_bits_t __at(WPUDA_ADDR) WPUDA_bits; diff --git a/device/lib/pic/libdev/pic16f648a.c b/device/lib/pic/libdev/pic16f648a.c index 911250df..b811d051 100644 --- a/device/lib/pic/libdev/pic16f648a.c +++ b/device/lib/pic/libdev/pic16f648a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f648a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -52,10 +52,14 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16f676.c b/device/lib/pic/libdev/pic16f676.c index 8eefa22d..761c4c4d 100644 --- a/device/lib/pic/libdev/pic16f676.c +++ b/device/lib/pic/libdev/pic16f676.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f676. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -45,14 +45,21 @@ __sfr __at (ADCON1_ADDR) ADCON1; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __CMCON_bits_t __at(CMCON_ADDR) CMCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCAL_bits_t __at(OSCCAL_ADDR) OSCCAL_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16f684.c b/device/lib/pic/libdev/pic16f684.c index b54f92b1..6f8ee745 100644 --- a/device/lib/pic/libdev/pic16f684.c +++ b/device/lib/pic/libdev/pic16f684.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f684. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -56,21 +56,30 @@ __sfr __at (ADCON1_ADDR) ADCON1; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __PWM1CON_bits_t __at(PWM1CON_ADDR) PWM1CON_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f685.c b/device/lib/pic/libdev/pic16f685.c index fe0a74c7..5b5b07e8 100644 --- a/device/lib/pic/libdev/pic16f685.c +++ b/device/lib/pic/libdev/pic16f685.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f685. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -67,12 +67,18 @@ __sfr __at (SRCON_ADDR) SRCON; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; +volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; @@ -81,7 +87,12 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PSTRCON_bits_t __at(PSTRCON_ADDR) PSTRCON_bits; volatile __PWM1CON_bits_t __at(PWM1CON_ADDR) PWM1CON_bits; +volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; @@ -90,5 +101,6 @@ volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; diff --git a/device/lib/pic/libdev/pic16f687.c b/device/lib/pic/libdev/pic16f687.c index 34916dd3..dced3246 100644 --- a/device/lib/pic/libdev/pic16f687.c +++ b/device/lib/pic/libdev/pic16f687.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f687. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -71,11 +71,17 @@ __sfr __at (SRCON_ADDR) SRCON; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; +volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; @@ -84,9 +90,13 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; +volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; @@ -97,5 +107,6 @@ volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; diff --git a/device/lib/pic/libdev/pic16f688.c b/device/lib/pic/libdev/pic16f688.c index aa5513cb..fb3dab8b 100644 --- a/device/lib/pic/libdev/pic16f688.c +++ b/device/lib/pic/libdev/pic16f688.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f688. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -57,19 +57,28 @@ __sfr __at (ADCON1_ADDR) ADCON1; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; diff --git a/device/lib/pic/libdev/pic16f689.c b/device/lib/pic/libdev/pic16f689.c index 4cdbc567..04e62024 100644 --- a/device/lib/pic/libdev/pic16f689.c +++ b/device/lib/pic/libdev/pic16f689.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f689. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -71,11 +71,17 @@ __sfr __at (SRCON_ADDR) SRCON; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; +volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; @@ -84,9 +90,13 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; +volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; @@ -97,5 +107,6 @@ volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; diff --git a/device/lib/pic/libdev/pic16f690.c b/device/lib/pic/libdev/pic16f690.c index f092c957..6674368d 100644 --- a/device/lib/pic/libdev/pic16f690.c +++ b/device/lib/pic/libdev/pic16f690.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f690. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -80,13 +80,19 @@ __sfr __at (SRCON_ADDR) SRCON; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; volatile __ECCPAS_bits_t __at(ECCPAS_ADDR) ECCPAS_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; +volatile __IOCB_bits_t __at(IOCB_ADDR) IOCB_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; @@ -95,10 +101,15 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PSTRCON_bits_t __at(PSTRCON_ADDR) PSTRCON_bits; volatile __PWM1CON_bits_t __at(PWM1CON_ADDR) PWM1CON_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SPBRG_bits_t __at(SPBRG_ADDR) SPBRG_bits; volatile __SPBRGH_bits_t __at(SPBRGH_ADDR) SPBRGH_bits; +volatile __SRCON_bits_t __at(SRCON_ADDR) SRCON_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; @@ -110,5 +121,6 @@ volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; volatile __WPUB_bits_t __at(WPUB_ADDR) WPUB_bits; diff --git a/device/lib/pic/libdev/pic16f716.c b/device/lib/pic/libdev/pic16f716.c index 4040a2f4..b22efc71 100644 --- a/device/lib/pic/libdev/pic16f716.c +++ b/device/lib/pic/libdev/pic16f716.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f716. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -49,10 +49,12 @@ volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __PWM1CON_bits_t __at(PWM1CON_ADDR) PWM1CON_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16f72.c b/device/lib/pic/libdev/pic16f72.c index c4f383fa..88ec320a 100644 --- a/device/lib/pic/libdev/pic16f72.c +++ b/device/lib/pic/libdev/pic16f72.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f72. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -56,9 +56,15 @@ volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; diff --git a/device/lib/pic/libdev/pic16f73.c b/device/lib/pic/libdev/pic16f73.c index 011621ed..3f9177d5 100644 --- a/device/lib/pic/libdev/pic16f73.c +++ b/device/lib/pic/libdev/pic16f73.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f73. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -69,11 +69,17 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f737.c b/device/lib/pic/libdev/pic16f737.c index 5e06525c..1b9c68ef 100644 --- a/device/lib/pic/libdev/pic16f737.c +++ b/device/lib/pic/libdev/pic16f737.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f737. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -92,6 +92,11 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -99,6 +104,10 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f74.c b/device/lib/pic/libdev/pic16f74.c index f751a3a8..cb8f33f1 100644 --- a/device/lib/pic/libdev/pic16f74.c +++ b/device/lib/pic/libdev/pic16f74.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f74. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -73,12 +73,21 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f76.c b/device/lib/pic/libdev/pic16f76.c index b660e5d5..f925201d 100644 --- a/device/lib/pic/libdev/pic16f76.c +++ b/device/lib/pic/libdev/pic16f76.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f76. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -69,11 +69,17 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f767.c b/device/lib/pic/libdev/pic16f767.c index 49b12409..0580d4e2 100644 --- a/device/lib/pic/libdev/pic16f767.c +++ b/device/lib/pic/libdev/pic16f767.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f767. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -90,6 +90,10 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -97,6 +101,9 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f77.c b/device/lib/pic/libdev/pic16f77.c index 1de2e77e..5ab45e72 100644 --- a/device/lib/pic/libdev/pic16f77.c +++ b/device/lib/pic/libdev/pic16f77.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f77. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -73,12 +73,21 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f777.c b/device/lib/pic/libdev/pic16f777.c index 618c66b1..d173bcd1 100644 --- a/device/lib/pic/libdev/pic16f777.c +++ b/device/lib/pic/libdev/pic16f777.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f777. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -92,6 +92,11 @@ volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; volatile __PMCON1_bits_t __at(PMCON1_ADDR) PMCON1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -99,6 +104,10 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f785.c b/device/lib/pic/libdev/pic16f785.c index 1df2da5b..66d473bb 100644 --- a/device/lib/pic/libdev/pic16f785.c +++ b/device/lib/pic/libdev/pic16f785.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f785. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -67,17 +67,36 @@ __sfr __at (OPA2CON_ADDR) OPA2CON; // bitfield definitions // volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; +volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; +volatile __ANSEL1_bits_t __at(ANSEL1_ADDR) ANSEL1_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; +volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; +volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; +volatile __CM2CON1_bits_t __at(CM2CON1_ADDR) CM2CON1_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; +volatile __IOCA_bits_t __at(IOCA_ADDR) IOCA_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; volatile __OSCCON_bits_t __at(OSCCON_ADDR) OSCCON_bits; volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PWMCLK_bits_t __at(PWMCLK_ADDR) PWMCLK_bits; +volatile __PWMCON0_bits_t __at(PWMCON0_ADDR) PWMCON0_bits; +volatile __PWMCON1_bits_t __at(PWMCON1_ADDR) PWMCON1_bits; +volatile __REFCON_bits_t __at(REFCON_ADDR) REFCON_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; +volatile __WPUA_bits_t __at(WPUA_ADDR) WPUA_bits; diff --git a/device/lib/pic/libdev/pic16f818.c b/device/lib/pic/libdev/pic16f818.c index 54dbf9cd..5d210a1b 100644 --- a/device/lib/pic/libdev/pic16f818.c +++ b/device/lib/pic/libdev/pic16f818.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f818. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -64,9 +64,13 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16f819.c b/device/lib/pic/libdev/pic16f819.c index d837beba..f6417748 100644 --- a/device/lib/pic/libdev/pic16f819.c +++ b/device/lib/pic/libdev/pic16f819.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f819. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -64,9 +64,13 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16f84.c b/device/lib/pic/libdev/pic16f84.c index 8c1245bf..d529c6d5 100644 --- a/device/lib/pic/libdev/pic16f84.c +++ b/device/lib/pic/libdev/pic16f84.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f84. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -25,10 +25,12 @@ __sfr __at (EECON2_ADDR) EECON2; // // bitfield definitions // -volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; -volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; +volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; -volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; -volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; -volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16f84a.c b/device/lib/pic/libdev/pic16f84a.c index 2cfe8540..d96e9008 100644 --- a/device/lib/pic/libdev/pic16f84a.c +++ b/device/lib/pic/libdev/pic16f84a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f84a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -25,10 +25,12 @@ __sfr __at (EECON2_ADDR) EECON2; // // bitfield definitions // -volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; -volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; +volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; +volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits; -volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; -volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; -volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; diff --git a/device/lib/pic/libdev/pic16f87.c b/device/lib/pic/libdev/pic16f87.c index 540d43bf..d99f4b8d 100644 --- a/device/lib/pic/libdev/pic16f87.c +++ b/device/lib/pic/libdev/pic16f87.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f87. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -68,12 +68,16 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f870.c b/device/lib/pic/libdev/pic16f870.c index 7a0aba5a..b8d81afd 100644 --- a/device/lib/pic/libdev/pic16f870.c +++ b/device/lib/pic/libdev/pic16f870.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f870. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -63,9 +63,15 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f871.c b/device/lib/pic/libdev/pic16f871.c index c3bc6691..36514c0d 100644 --- a/device/lib/pic/libdev/pic16f871.c +++ b/device/lib/pic/libdev/pic16f871.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f871. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -67,10 +67,19 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f872.c b/device/lib/pic/libdev/pic16f872.c index 2adbd75d..a2211099 100644 --- a/device/lib/pic/libdev/pic16f872.c +++ b/device/lib/pic/libdev/pic16f872.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f872. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -63,10 +63,16 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; diff --git a/device/lib/pic/libdev/pic16f873.c b/device/lib/pic/libdev/pic16f873.c index 9a564552..5670d96a 100644 --- a/device/lib/pic/libdev/pic16f873.c +++ b/device/lib/pic/libdev/pic16f873.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f873. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -72,6 +72,9 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -79,5 +82,8 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f873a.c b/device/lib/pic/libdev/pic16f873a.c index 0f75e398..976f58ae 100644 --- a/device/lib/pic/libdev/pic16f873a.c +++ b/device/lib/pic/libdev/pic16f873a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f873a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -76,6 +76,9 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -83,5 +86,8 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f874.c b/device/lib/pic/libdev/pic16f874.c index c0539b94..211b19b1 100644 --- a/device/lib/pic/libdev/pic16f874.c +++ b/device/lib/pic/libdev/pic16f874.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f874. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -76,6 +76,11 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -83,6 +88,10 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f874a.c b/device/lib/pic/libdev/pic16f874a.c index 0b0e2ad8..eea92fc1 100644 --- a/device/lib/pic/libdev/pic16f874a.c +++ b/device/lib/pic/libdev/pic16f874a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f874a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -80,6 +80,11 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -87,6 +92,10 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f876.c b/device/lib/pic/libdev/pic16f876.c index 02ed3a36..33d5c81f 100644 --- a/device/lib/pic/libdev/pic16f876.c +++ b/device/lib/pic/libdev/pic16f876.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f876. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -72,6 +72,9 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -79,5 +82,8 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f876a.c b/device/lib/pic/libdev/pic16f876a.c index b6aab0ff..9d7f1e78 100644 --- a/device/lib/pic/libdev/pic16f876a.c +++ b/device/lib/pic/libdev/pic16f876a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f876a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -76,6 +76,9 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -83,5 +86,8 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f877.c b/device/lib/pic/libdev/pic16f877.c index 01400702..6f7ae888 100644 --- a/device/lib/pic/libdev/pic16f877.c +++ b/device/lib/pic/libdev/pic16f877.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f877. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -76,6 +76,11 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -83,6 +88,10 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f877a.c b/device/lib/pic/libdev/pic16f877a.c index be6b0915..84241fd8 100644 --- a/device/lib/pic/libdev/pic16f877a.c +++ b/device/lib/pic/libdev/pic16f877a.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f877a. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -80,6 +80,11 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPCON2_bits_t __at(SSPCON2_ADDR) SSPCON2_bits; @@ -87,6 +92,10 @@ volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; diff --git a/device/lib/pic/libdev/pic16f88.c b/device/lib/pic/libdev/pic16f88.c index e42ead34..a6ccf8b0 100644 --- a/device/lib/pic/libdev/pic16f88.c +++ b/device/lib/pic/libdev/pic16f88.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f88. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -75,12 +75,16 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f913.c b/device/lib/pic/libdev/pic16f913.c index 2a1fea93..cf21bd00 100644 --- a/device/lib/pic/libdev/pic16f913.c +++ b/device/lib/pic/libdev/pic16f913.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f913. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -113,12 +113,20 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f914.c b/device/lib/pic/libdev/pic16f914.c index aecdc898..91b56d7a 100644 --- a/device/lib/pic/libdev/pic16f914.c +++ b/device/lib/pic/libdev/pic16f914.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f914. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -129,12 +129,22 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f916.c b/device/lib/pic/libdev/pic16f916.c index 0dc35d23..d2a201f2 100644 --- a/device/lib/pic/libdev/pic16f916.c +++ b/device/lib/pic/libdev/pic16f916.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f916. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -113,12 +113,20 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/device/lib/pic/libdev/pic16f917.c b/device/lib/pic/libdev/pic16f917.c index ffabb16e..099913f0 100644 --- a/device/lib/pic/libdev/pic16f917.c +++ b/device/lib/pic/libdev/pic16f917.c @@ -1,6 +1,6 @@ /* Register definitions for pic16f917. * This file was automatically generated by: - * inc2h.pl V1.6 + * inc2h.pl V4514 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include @@ -129,12 +129,22 @@ volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; volatile __PIE2_bits_t __at(PIE2_ADDR) PIE2_bits; volatile __PIR1_bits_t __at(PIR1_ADDR) PIR1_bits; volatile __PIR2_bits_t __at(PIR2_ADDR) PIR2_bits; +volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; +volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits; +volatile __PORTC_bits_t __at(PORTC_ADDR) PORTC_bits; +volatile __PORTD_bits_t __at(PORTD_ADDR) PORTD_bits; +volatile __PORTE_bits_t __at(PORTE_ADDR) PORTE_bits; volatile __RCSTA_bits_t __at(RCSTA_ADDR) RCSTA_bits; volatile __SSPCON_bits_t __at(SSPCON_ADDR) SSPCON_bits; volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits; volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; volatile __T2CON_bits_t __at(T2CON_ADDR) T2CON_bits; +volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; +volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits; +volatile __TRISC_bits_t __at(TRISC_ADDR) TRISC_bits; +volatile __TRISD_bits_t __at(TRISD_ADDR) TRISD_bits; +volatile __TRISE_bits_t __at(TRISE_ADDR) TRISE_bits; volatile __TXSTA_bits_t __at(TXSTA_ADDR) TXSTA_bits; volatile __VRCON_bits_t __at(VRCON_ADDR) VRCON_bits; volatile __WDTCON_bits_t __at(WDTCON_ADDR) WDTCON_bits; diff --git a/support/scripts/inc2h.pl b/support/scripts/inc2h.pl index 805f8196..02dce1ca 100755 --- a/support/scripts/inc2h.pl +++ b/support/scripts/inc2h.pl @@ -19,7 +19,7 @@ $rcsid = q~$Id$~; ($junk, $file, $version, $date, $time, $programmer, $status) = split(/\s+/, $rcsid); -($programName) = ($file =~ /(\S+),v/); +($programName) = ($file =~ /(\S+)/); if ($#ARGV < 0 || $#ARGV > 1 ) { Usage(); @@ -27,6 +27,57 @@ if ($#ARGV < 0 || $#ARGV > 1 ) { $processor = uc(shift); $path = shift; + +# just in time fixes for some register names +sub fixname { + my $name = shift; + $name =~ s/COMCON/CMCON/ig; + # use OPTION_REG instead of OPTION as OPTION is a assembler directive + $name =~ s/OPTION(_REG)?/OPTION_REG/ig; + # often declared as LCDDATn, but bits defined for LCDDATAn, 0 <= n <= 10 + $name =~ s/LCDDAT([^A])/LCDDATA$1/ig; + # LCDSE2 is missing in some headers, but LCDSE3 is declared... + $name =~ s/LCDSE3/LCDSE2/ig; + # XXX: should this be named LININTF or LINPRT? + $name =~ s/LININTF/LINPRT/ig; + # FIXME: duplicate declarations for n in {0,1,2} + $name =~ s/UEPn/UEP0/ig; + + return $name; +} + +sub checkname { + my $name = shift; + if (not exists $sfrs{$name}) { + print "SFR $name not defined (yet).\n"; + # Find similar ones. + if (exists $sfrs{$name."0"}) { + print " but ".$name."0 exists---using that instead.\n"; + return $name."0"; + } + $try = $name; + $try =~ s/[0-9]$//; + if (exists $sfrs{$try}) { + print " but $try exists---using that instead.\n"; + return $try; + } + die "Not found a similar SFR---aborting.\n"; + } + return $name; +} + +# exists clone for arrays---does this not exist in Perl?!? +sub contained { + my $name = shift; + my $arr = shift; + + foreach my $item (@$arr) { + return 1 if ($name eq $item); + } + return 0; +} + + if ($^O eq 'MSWin32') { if ($path eq '') { if (defined($path = $ENV{'GPUTILS_HEADER_PATH'}) || defined($path = $ENV{'GPUTILS_LKR_PATH'})) { @@ -45,6 +96,8 @@ else { $path = "/usr/share/gputils"; } elsif ( -x "/usr/share/gpasm") { $path = "/usr/share/gpasm"; + } elsif ( -x "/usr/local/share/gputils") { + $path = "/usr/local/share/gputils"; } else { die "Could not find gpasm includes.\n"; } @@ -64,7 +117,7 @@ while () { # Some MPASM include files are not entirely consistent # with sfr names. # - $alias{$2} = $1; + $alias{fixname($2)} = fixname($1); } elsif (/^\s*address\s+(\S+)\s+(\S+)/) { # # Set a default address for a special function register. @@ -145,16 +198,27 @@ EOT # # Convert the file. # +%sfrs = (); $defaultType = 'other'; $includeFile = $path.$path_delim.'header'.$path_delim.'p'.lc($processor).'.inc'; +$headFile = "pic" . lc($processor) . ".h"; $defsFile = "pic" . lc($processor) . ".c"; open(HEADER, "<$includeFile") || die "$programName: Error: Cannot open include file $includeFile ($!)\n"; while (
) { - if (/^;-+ (\S+) Bits/i) { + + if (/^;-+ Register Files/i) { + $defaultType = 'sfr'; + s/;/\/\//; + $body .= "$_"; + } elsif (/^;-+\s*(\S+)\s+Bits/i || /^;-+\s*(\S+)\s+-+/i) { + # The second case is usually bits, but the word Bits is missing # also accept "UIE/UIR Bits" foreach $name (split(/\//, $1)) { + $name = fixname($name); + $name = checkname($name); + if (defined($alias{$name})) { $defaultType = "bits $alias{$name}"; } else { @@ -163,10 +227,6 @@ while (
) { } s/;/\/\//; $body .= "$_"; - } elsif (/^;-+ Register Files/i) { - $defaultType = 'sfr'; - s/;/\/\//; - $body .= "$_"; } elsif (/^;=+/i) { $defaultType = ''; s/;/\/\//; @@ -176,7 +236,7 @@ while (
) { # Convert ASM comments to C style. # $body .= "//$'"; - } elsif (/^\s*IFNDEF __(\S+)/) { + } elsif (/^\s*IFNDEF\s+__(\S+)/) { # # Processor type. # @@ -212,9 +272,10 @@ while (
) { # # A special function register. # - $pragmas .= sprintf("#pragma memmap %s_ADDR %s_ADDR " - . "SFR %s\t// %s\n", - $name, $name, $bitmask, $name); +# $pragmas .= sprintf("#pragma memmap %s_ADDR %s_ADDR " +# . "SFR %s\t// %s\n", +# $name, $name, $bitmask, $name); + $name = fixname($name); if (defined $addr{"p$processor", "$name"}) { $addresses .= sprintf("#define %s_ADDR\t0x%s\n", $name, $addr{"p$processor", "$name"}); } else { @@ -223,14 +284,16 @@ while (
) { $body .= sprintf("extern __sfr __at %-30s $name;$rest\n", "(${name}_ADDR)" ); $c_head .= sprintf("__sfr __at %-30s $name;\n", "(${name}_ADDR)"); $addr{"p$processor", "$name"} = "0x$value"; + $sfrs{$name}=1; } elsif ($type eq 'volatile') { # # A location that can change without # direct program manipulation. # - $pragmas .= sprintf("#pragma memmap %s_ADDR %s_ADDR " - . "SFR %s\t// %s\n", - $name, $name, $bitmask, $name); + $name = fixname($name); +# $pragmas .= sprintf("#pragma memmap %s_ADDR %s_ADDR " +# . "SFR %s\t// %s\n", +# $name, $name, $bitmask, $name); $body .= sprintf("extern __data __at %-30s $name;$rest\n", "(${name}_ADDR) volatile char"); $c_head .= sprintf("__data __at %-30s $name;\n", "(${name}_ADDR) volatile char"); if (defined $addr{"p$processor", "$name"}) { @@ -246,13 +309,16 @@ while (
) { for ($k=0; $k < scalar @{$bits{"$register"}->{oct($bit)}}; $k++) { $name = "" if ($bits{"$register"}->{oct($bit)} eq $name) } - if ($name ne "") { + if (($name ne "") + and (1 != contained($name, \@{$bits{"$register"}->{oct($bit)}})) + ) { push @{$bits{"$register"}->{oct($bit)}}, $name; } } else { # # Other registers, bits and/or configurations. # + $name = fixname($name); if ($type eq 'other') { # # A known symbol. @@ -323,6 +389,53 @@ $c_head .= <) { + s/\r//g; chomp; + if(/^\s*(\*|\w*)\s*([ABCDE0-7,-]+)\s*$/) { + if(lc($1) eq lc($processor)) { + die if defined $pinfo; + $pinfo = $2; + } elsif($1 eq "*") { + die if defined $defpinfo; + $defpinfo = $2; + } + } elsif(/^\s*#/ || /^\s*$/) { + # ignore blanks, comments + } else { + die "bad line in pic14ports '$_'"; + } + } + close P14PORTS; + }; + $defpinfo = "A0-5,B0-7,C0-7,D0-7,E0-2" unless defined $defpinfo; + $pinfo = $defpinfo unless defined $pinfo; + + if(defined $pinfo) { + foreach (split /,/, $pinfo) { + if(/^([ABCDE])([0-7])-([0-7])$/) { + my($prt, $low, $high) = ($1, $2, $3); + next unless defined $sfrs{"PORT$prt"} && defined $sfrs{"TRIS$prt"}; + next if defined $bits{"PORT$prt"}; + for(my $i = $low; $i <= $high; $i++) { + push @{$bits{"PORT$prt"}->{oct($i)}}, "R$prt".$i; + } + next if defined $bits{"TRIS$prt"}; + for(my $i = $low; $i <= $high; $i++) { + push @{$bits{"TRIS$prt"}->{oct($i)}}, "TRIS$prt".$i; + } + } else { die } + } + } +} + $structs = ""; ## create struct declarations foreach $reg (sort keys %bits) @@ -352,8 +465,10 @@ foreach $reg (sort keys %bits) $idx++; } while ($idx < $max); $structs .= "} __${reg}_bits_t;\n"; - $structs .= "extern volatile __${reg}_bits_t __at(${reg}_ADDR) ${reg}_bits;\n\n"; - $c_head .= "volatile __${reg}_bits_t __at(${reg}_ADDR) ${reg}_bits;\n"; + #if(defined $sfrs{$reg}) { + $structs .= "extern volatile __${reg}_bits_t __at(${reg}_ADDR) ${reg}_bits;\n\n"; + $c_head .= "volatile __${reg}_bits_t __at(${reg}_ADDR) ${reg}_bits;\n"; + #} # emit defines for individual bits for ($i=0; $i < 8; $i++) @@ -366,12 +481,14 @@ foreach $reg (sort keys %bits) $structs .= "\n"; } # foreach -print $header +open(HEAD, ">$headFile") or die "Could not open $headFile for writing."; +print HEAD $header . $addresses . "\n" . $pragmas . "\n\n" . $body . "\n" . $structs . "#endif\n"; +close(HEAD); open(DEFS, ">$defsFile") or die "Could not open $defsFile for writing."; print DEFS $c_head . "\n";