X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Finclude%2Fpic%2Fpic12f683.h;h=d80e585da631faae4dc68ce45ffaf24980a6a0a6;hb=d1509cf37c6ba9cc5aa238fcce11824efefc7941;hp=d7c217e26b5265e582523757f0e7eae378ec8d9a;hpb=14fbdef91206e1fa14b6fedf1b013cbba1021124;p=fw%2Fsdcc 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 --------------------