* device/include/pic16/pic18f1220.h,

[fw/sdcc] / device / include / pic16 / pic18f1220.h

diff --git a/device/include/pic16/pic18f1220.h b/device/include/pic16/pic18f1220.h
index 28227447ac0abb1719d7e119949c754679ccd548..5c86e32e4bfd22bfb8678b785a85f40f1dff7585 100644 (file)
--- a/device/include/pic16/pic18f1220.h
+++ b/device/include/pic16/pic18f1220.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F1220_H__
 #define __PIC18F1220_H__
 
-extern sfr at 0xf80 PORTA;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -62,9 +62,9 @@ typedef union {
        };
 } __PORTAbits_t;
 
-extern volatile __PORTAbits_t at 0xf80 PORTAbits;
+extern volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-extern sfr at 0xf81 PORTB;
+extern __sfr __at (0xf81) PORTB;
 typedef union {
        struct {
                unsigned RB0:1;
@@ -89,9 +89,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern sfr at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -105,9 +105,9 @@ typedef union {
        };
 } __LATAbits_t;
 
-extern volatile __LATAbits_t at 0xf89 LATAbits;
+extern volatile __LATAbits_t __at (0xf89) LATAbits;
 
-extern sfr at 0xf8a LATB;
+extern __sfr __at (0xf8a) LATB;
 typedef union {
        struct {
                unsigned LATB0:1;
@@ -121,9 +121,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern sfr at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -137,9 +137,9 @@ typedef union {
        };
 } __TRISAbits_t;
 
-extern volatile __TRISAbits_t at 0xf92 TRISAbits;
+extern volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-extern sfr at 0xf93 TRISB;
+extern __sfr __at (0xf93) TRISB;
 typedef union {
        struct {
                unsigned TRISB0:1;
@@ -153,9 +153,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern sfr at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -169,9 +169,9 @@ typedef union {
        };
 } __PIE1bits_t;
 
-extern volatile __PIE1bits_t at 0xf9d PIE1bits;
+extern volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-extern sfr at 0xf9e PIR1;
+extern __sfr __at (0xf9e) PIR1;
 typedef union {
        struct {
                unsigned TMR1IF:1;
@@ -185,9 +185,9 @@ typedef union {
        };
 } __PIR1bits_t;
 
-extern volatile __PIR1bits_t at 0xf9e PIR1bits;
+extern volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-extern sfr at 0xf9f IPR1;
+extern __sfr __at (0xf9f) IPR1;
 typedef union {
        struct {
                unsigned TMR1IP:1;
@@ -201,9 +201,9 @@ typedef union {
        };
 } __IPR1bits_t;
 
-extern volatile __IPR1bits_t at 0xf9f IPR1bits;
+extern volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-extern sfr at 0xfa0 PIE2;
+extern __sfr __at (0xfa0) PIE2;
 typedef union {
        struct {
                unsigned :1;
@@ -217,9 +217,9 @@ typedef union {
        };
 } __PIE2bits_t;
 
-extern volatile __PIE2bits_t at 0xfa0 PIE2bits;
+extern volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-extern sfr at 0xfa1 PIR2;
+extern __sfr __at (0xfa1) PIR2;
 typedef union {
        struct {
                unsigned :1;
@@ -233,9 +233,9 @@ typedef union {
        };
 } __PIR2bits_t;
 
-extern volatile __PIR2bits_t at 0xfa1 PIR2bits;
+extern volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-extern sfr at 0xfa2 IPR2;
+extern __sfr __at (0xfa2) IPR2;
 typedef union {
        struct {
                unsigned :1;
@@ -249,9 +249,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern sfr at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -265,13 +265,13 @@ typedef union {
        };
 } __EECON1bits_t;
 
-extern volatile __EECON1bits_t at 0xfa6 EECON1bits;
+extern volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-extern sfr at 0xfa7 EECON2;
-extern sfr at 0xfa8 EEDATA;
-extern sfr at 0xfa9 EEADR;
-extern sfr at 0xfaa BAUDCTL;
-extern sfr at 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) BAUDCTL;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -285,9 +285,9 @@ typedef union {
        };
 } __RCSTAbits_t;
 
-extern volatile __RCSTAbits_t at 0xfab RCSTAbits;
+extern volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
 
-extern sfr at 0xfac TXSTA;
+extern __sfr __at (0xfac) TXSTA;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -301,13 +301,13 @@ typedef union {
        };
 } __TXSTAbits_t;
 
-extern volatile __TXSTAbits_t at 0xfac TXSTAbits;
+extern volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
 
-extern sfr at 0xfad TXREG;
-extern sfr at 0xfae RCREG;
-extern sfr at 0xfaf SPBRG;
-extern sfr at 0xfb0 SPBRGH;
-extern sfr at 0xfb1 T3CON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb0) SPBRGH;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -321,61 +321,77 @@ typedef union {
        };
 } __T3CONbits_t;
 
-extern volatile __T3CONbits_t at 0xfb1 T3CONbits;
+extern volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-extern sfr at 0xfb2 TMR3L;
-extern sfr at 0xfb3 TMR3H;
-extern sfr at 0xfbd CCP1CON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb6) ECCPAS;
+typedef union {
+       struct {
+               unsigned PSSBD0:1;
+               unsigned PSSBD1:1;
+               unsigned PSSAC0:1;
+               unsigned PSSAC1:1;
+               unsigned ECCPAS0:1;
+               unsigned ECCPAS1:1;
+               unsigned ECCPAS2:1;
+               unsigned ECCPASE:1;
+       };
+} __ECCPASbits_t;
+
+extern volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
+
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
                unsigned CCP1M1:1;
                unsigned CCP1M2:1;
                unsigned CCP1M3:1;
-               unsigned DCCP1Y:1;
-               unsigned DCCP1X:1;
-               unsigned :1;
-               unsigned :1;
+               unsigned DC1B0:1;
+               unsigned DC1B1:1;
+               unsigned P1M0:1;
+               unsigned P1M1:1;
        };
 } __CCP1CONbits_t;
 
-extern volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
+extern volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
 
-extern sfr at 0xfbe CCPR1L;
-extern sfr at 0xfbf CCPR1H;
-extern sfr at 0xfc0 ADCON2;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc0) ADCON2;
 typedef union {
        struct {
                unsigned ADCS0:1;
                unsigned ADCS1:1;
                unsigned ADCS2:1;
-               unsigned :1;
-               unsigned :1;
-               unsigned :1;
+               unsigned ACQT0:1;
+               unsigned ACQT1:1;
+               unsigned ACQT2:1;
                unsigned :1;
                unsigned ADFM:1;
        };
 } __ADCON2bits_t;
 
-extern volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
+extern volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
 
-extern sfr at 0xfc1 ADCON1;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
                unsigned PCFG1:1;
                unsigned PCFG2:1;
                unsigned PCFG3:1;
-               unsigned VCFG0:1;
-               unsigned VCFG1:1;
-               unsigned :1;
+               unsigned PCFG4:1;
+               unsigned PCFG5:1;
+               unsigned PCFG6:1;
                unsigned :1;
        };
 } __ADCON1bits_t;
 
-extern volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
+extern volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
 
-extern sfr at 0xfc2 ADCON0;
+extern __sfr __at (0xfc2) ADCON0;
 typedef union {
        struct {
                unsigned ADON:1;
@@ -389,11 +405,11 @@ typedef union {
        };
 } __ADCON0bits_t;
 
-extern volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
+extern volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
 
-extern sfr at 0xfc3 ADRESL;
-extern sfr at 0xfc4 ADRESH;
-extern sfr at 0xfca T2CON;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -407,11 +423,11 @@ typedef union {
        };
 } __T2CONbits_t;
 
-extern volatile __T2CONbits_t at 0xfca T2CONbits;
+extern volatile __T2CONbits_t __at (0xfca) T2CONbits;
 
-extern sfr at 0xfcb PR2;
-extern sfr at 0xfcc TMR2;
-extern sfr at 0xfcd T1CON;
+extern __sfr __at (0xfcb) PR2;
+extern __sfr __at (0xfcc) TMR2;
+extern __sfr __at (0xfcd) T1CON;
 typedef union {
        struct {
                unsigned TMR1ON:1;
@@ -425,11 +441,11 @@ typedef union {
        };
 } __T1CONbits_t;
 
-extern volatile __T1CONbits_t at 0xfcd T1CONbits;
+extern volatile __T1CONbits_t __at (0xfcd) T1CONbits;
 
-extern sfr at 0xfce TMR1L;
-extern sfr at 0xfcf TMR1H;
-extern sfr at 0xfd0 RCON;
+extern __sfr __at (0xfce) TMR1L;
+extern __sfr __at (0xfcf) TMR1H;
+extern __sfr __at (0xfd0) RCON;
 typedef union {
        struct {
                unsigned BOR:1;
@@ -443,9 +459,9 @@ typedef union {
        };
 } __RCONbits_t;
 
-extern volatile __RCONbits_t at 0xfd0 RCONbits;
+extern volatile __RCONbits_t __at (0xfd0) RCONbits;
 
-extern sfr at 0xfd1 WDTCON;
+extern __sfr __at (0xfd1) WDTCON;
 typedef union {
        struct {
                unsigned SWDTEN:1;
@@ -470,9 +486,9 @@ typedef union {
        };
 } __WDTCONbits_t;
 
-extern volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
+extern volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
 
-extern sfr at 0xfd2 LVDCON;
+extern __sfr __at (0xfd2) LVDCON;
 typedef union {
        struct {
                unsigned LVDL0:1;
@@ -497,9 +513,9 @@ typedef union {
        };
 } __LVDCONbits_t;
 
-extern volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
+extern volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
 
-extern sfr at 0xfd3 OSCCON;
+extern __sfr __at (0xfd3) OSCCON;
 typedef union {
        struct {
                unsigned SCS:1;
@@ -513,12 +529,26 @@ typedef union {
        };
 } __OSCCONbits_t;
 
-extern volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
+extern volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
 
-extern sfr at 0xfd5 T0CON;
-extern sfr at 0xfd6 TMR0L;
-extern sfr at 0xfd7 TMR0H;
-extern sfr at 0xfd8 STATUS;
+extern __sfr __at (0xfd5) T0CON;
+typedef union {
+        struct {
+                unsigned T0PS0          : 1;
+                unsigned T0PS1          : 1;
+                unsigned T0PS2          : 1;
+                unsigned PSA            : 1;
+                unsigned T0SE           : 1;
+                unsigned T0CS           : 1;
+                unsigned T08BIT         : 1;
+                unsigned TMR0ON         : 1;
+        };
+} __T0CONbits_t;
+extern volatile __T0CONbits_t __at (0xfd5) T0CONbits;
+
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -532,32 +562,32 @@ typedef union {
        };
 } __STATUSbits_t;
 
-extern volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-extern sfr at 0xfd9 FSR2L;
-extern sfr at 0xfda FSR2H;
-extern sfr at 0xfdb PLUSW2;
-extern sfr at 0xfdc PREINC2;
-extern sfr at 0xfdd POSTDEC2;
-extern sfr at 0xfde POSTINC2;
-extern sfr at 0xfdf INDF2;
-extern sfr at 0xfe0 BSR;
-extern sfr at 0xfe1 FSR1L;
-extern sfr at 0xfe2 FSR1H;
-extern sfr at 0xfe3 PLUSW1;
-extern sfr at 0xfe4 PREINC1;
-extern sfr at 0xfe5 POSTDEC1;
-extern sfr at 0xfe6 POSTINC1;
-extern sfr at 0xfe7 INDF1;
-extern sfr at 0xfe8 WREG;
-extern sfr at 0xfe9 FSR0L;
-extern sfr at 0xfea FSR0H;
-extern sfr at 0xfeb PLUSW0;
-extern sfr at 0xfec PREINC0;
-extern sfr at 0xfed POSTDEC0;
-extern sfr at 0xfee POSTINC0;
-extern sfr at 0xfef INDF0;
-extern sfr at 0xff0 INTCON3;
+extern volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+extern __sfr __at (0xfd9) FSR2L;
+extern __sfr __at (0xfda) FSR2H;
+extern __sfr __at (0xfdb) PLUSW2;
+extern __sfr __at (0xfdc) PREINC2;
+extern __sfr __at (0xfdd) POSTDEC2;
+extern __sfr __at (0xfde) POSTINC2;
+extern __sfr __at (0xfdf) INDF2;
+extern __sfr __at (0xfe0) BSR;
+extern __sfr __at (0xfe1) FSR1L;
+extern __sfr __at (0xfe2) FSR1H;
+extern __sfr __at (0xfe3) PLUSW1;
+extern __sfr __at (0xfe4) PREINC1;
+extern __sfr __at (0xfe5) POSTDEC1;
+extern __sfr __at (0xfe6) POSTINC1;
+extern __sfr __at (0xfe7) INDF1;
+extern __sfr __at (0xfe8) WREG;
+extern __sfr __at (0xfe9) FSR0L;
+extern __sfr __at (0xfea) FSR0H;
+extern __sfr __at (0xfeb) PLUSW0;
+extern __sfr __at (0xfec) PREINC0;
+extern __sfr __at (0xfed) POSTDEC0;
+extern __sfr __at (0xfee) POSTINC0;
+extern __sfr __at (0xfef) INDF0;
+extern __sfr __at (0xff0) INTCON3;
 typedef union {
        struct {
                unsigned INT1F:1;
@@ -582,9 +612,9 @@ typedef union {
        };
 } __INTCON3bits_t;
 
-extern volatile __INTCON3bits_t at 0xff0 INTCON3bits;
+extern volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
 
-extern sfr at 0xff1 INTCON2;
+extern __sfr __at (0xff1) INTCON2;
 typedef union {
        struct {
                unsigned RBIP:1;
@@ -598,9 +628,9 @@ typedef union {
        };
 } __INTCON2bits_t;
 
-extern volatile __INTCON2bits_t at 0xff1 INTCON2bits;
+extern volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
 
-extern sfr at 0xff2 INTCON;
+extern __sfr __at (0xff2) INTCON;
 typedef union {
        struct {
                unsigned RBIF:1;
@@ -614,18 +644,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-extern sfr at 0xff3 PRODL;
-extern sfr at 0xff4 PRODH;
-extern sfr at 0xff5 TABLAT;
-extern sfr at 0xff6 TBLPTRL;
-extern sfr at 0xff7 TBLPTRH;
-extern sfr at 0xff8 TBLPTRU;
-extern sfr at 0xff9 PCL;
-extern sfr at 0xffa PCLATH;
-extern sfr at 0xffb PCLATU;
-extern sfr at 0xffc STKPTR;
+extern volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+extern __sfr __at (0xff3) PRODL;
+extern __sfr __at (0xff4) PRODH;
+extern __sfr __at (0xff5) TABLAT;
+extern __sfr __at (0xff6) TBLPTRL;
+extern __sfr __at (0xff7) TBLPTRH;
+extern __sfr __at (0xff8) TBLPTRU;
+extern __sfr __at (0xff9) PCL;
+extern __sfr __at (0xffa) PCLATH;
+extern __sfr __at (0xffb) PCLATU;
+extern __sfr __at (0xffc) STKPTR;
 typedef union {
        struct {
                unsigned STKPTR0:1;
@@ -639,11 +669,11 @@ typedef union {
        };
 } __STKPTRbits_t;
 
-extern volatile __STKPTRbits_t at 0xffc STKPTRbits;
+extern volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
 
-extern sfr at 0xffd TOSL;
-extern sfr at 0xffe TOSH;
-extern sfr at 0xfff TOSU;
+extern __sfr __at (0xffd) TOSL;
+extern __sfr __at (0xffe) TOSH;
+extern __sfr __at (0xfff) TOSU;
 
 
 /* Configuration registers locations */