* device/lib/pic16/libdev/pic18f*.c,

* device/include/pic16/pic18f*.h: updated "sfr" and "at X"
  keywords to "__sfr" and "__at (X)"
* device/include/pic16/pic18fregs.h: added pic18f4520
* src/pic16/pcode.c (pic16_pCode2str): fixed (?) bug
  #1203088 (MPLAB compatibility)

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3765 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 4b16f18defbb363c1c83124ca63e83a7f079d4bb..2c65681f2ab3fe3e61c20f5b307f3f2819cbd8c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-18 Raphael Neider <rneider AT web.de>
+
+       * device/lib/pic16/libdev/pic18f*.c,
+       * device/include/pic16/pic18f*.h: updated "sfr" and "at X"
+         keywords to "__sfr" and "__at (X)"
+       * device/include/pic16/pic18fregs.h: added pic18f4520
+       * src/pic16/pcode.c (pic16_pCode2str): fixed (?) bug
+         #1203088 (MPLAB compatibility)
+
 2005-05-17 Raphael Neider <rneider AT web.de>
 
        * device/include/pic18f{2550,4331,4455,4520}.h: NEW

diff --git a/device/include/pic16/pic18f1220.h b/device/include/pic16/pic18f1220.h
index 7562546ad2214cb0d5d138f0a934a8e1661ddbe5..bb097368a540db97d5ea0de318749332d206409a 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,11 +321,11 @@ 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 (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -339,11 +339,11 @@ typedef union {
        };
 } __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;
@@ -357,9 +357,9 @@ typedef union {
        };
 } __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;
@@ -373,9 +373,9 @@ typedef union {
        };
 } __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 +389,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 +407,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 +425,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 +443,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 +470,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 +497,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 +513,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -532,32 +532,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 +582,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 +598,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 +614,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 +639,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 */

diff --git a/device/include/pic16/pic18f2220.h b/device/include/pic16/pic18f2220.h
index 34dbad45cf715b8bb7a1041d6398e041ce8a168c..22eb00cb1b27536fb745b7d7461e4c159e61f499 100644 (file)
--- a/device/include/pic16/pic18f2220.h
+++ b/device/include/pic16/pic18f2220.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F2220_H__
 #define __PIC18F2220_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 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -127,9 +127,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -143,9 +143,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;
@@ -159,9 +159,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -175,9 +175,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -191,9 +191,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;
@@ -207,9 +207,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -223,9 +223,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf9b OSCTUNE;
+extern __sfr __at (0xf9b) OSCTUNE;
 typedef union {
        struct {
                unsigned TUN0:1;
@@ -239,9 +239,9 @@ typedef union {
        };
 } __OSCTUNEbits_t;
 
-extern volatile __OSCTUNEbits_t __at 0xf9b OSCTUNEbits;
+extern volatile __OSCTUNEbits_t __at (0xf9b) OSCTUNEbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -255,9 +255,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;
@@ -271,9 +271,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;
@@ -287,9 +287,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 CCP2IE:1;
@@ -303,9 +303,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 CCP2IF:1;
@@ -319,9 +319,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 CCP2IP:1;
@@ -335,9 +335,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;
@@ -351,12 +351,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -370,9 +370,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;
@@ -386,12 +386,12 @@ 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 0xfb1 T3CON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -405,11 +405,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -423,9 +423,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -439,9 +439,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -455,11 +455,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -473,11 +473,11 @@ typedef union {
        };
 } __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;
@@ -491,9 +491,9 @@ typedef union {
        };
 } __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;
@@ -507,9 +507,9 @@ typedef union {
        };
 } __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;
@@ -523,11 +523,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -541,9 +541,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -557,9 +557,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -573,11 +573,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -591,11 +591,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;
@@ -609,11 +609,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;
@@ -627,9 +627,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;
@@ -654,9 +654,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;
@@ -681,9 +681,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;
@@ -697,12 +697,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -716,32 +716,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;
@@ -766,9 +766,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;
@@ -782,9 +782,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;
@@ -798,18 +798,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -823,11 +823,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 */

diff --git a/device/include/pic16/pic18f242.h b/device/include/pic16/pic18f242.h
index dd68e6261081a669eb7974145239ad91ed5cf4f9..6c884fa82362d34421fef2a18dee6c1b3d1a4dc5 100644 (file)
--- a/device/include/pic16/pic18f242.h
+++ b/device/include/pic16/pic18f242.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F242_H__
 #define __PIC18F242_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 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -127,9 +127,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -143,9 +143,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;
@@ -159,9 +159,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -175,9 +175,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -191,9 +191,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;
@@ -207,9 +207,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -223,9 +223,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -239,9 +239,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;
@@ -255,9 +255,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;
@@ -271,9 +271,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 CCP2IE:1;
@@ -287,9 +287,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 CCP2IF:1;
@@ -303,9 +303,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 CCP2IP:1;
@@ -319,9 +319,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;
@@ -335,12 +335,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -354,9 +354,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;
@@ -370,12 +370,12 @@ 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 0xfb1 T3CON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -389,11 +389,11 @@ 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 0xfba CCP2CON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -407,11 +407,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -425,11 +425,11 @@ typedef union {
        };
 } __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 0xfc1 ADCON1;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -443,9 +443,9 @@ typedef union {
        };
 } __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;
@@ -459,11 +459,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -477,9 +477,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -493,9 +493,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -509,11 +509,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -527,11 +527,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;
@@ -545,11 +545,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;
@@ -563,9 +563,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;
@@ -590,9 +590,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;
@@ -617,9 +617,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;
@@ -633,9 +633,9 @@ 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 (0xfd5) T0CON;
 typedef union {
        struct {
                unsigned T0PS0:1;
@@ -649,11 +649,11 @@ typedef union {
        };
 } __T0CONbits_t;
 
-extern volatile __T0CONbits_t __at 0xfd5 T0CONbits;
+extern volatile __T0CONbits_t __at (0xfd5) T0CONbits;
 
-extern __sfr __at 0xfd6 TMR0L;
-extern __sfr __at 0xfd7 TMR0H;
-extern __sfr __at 0xfd8 STATUS;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -667,32 +667,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;
@@ -717,9 +717,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;
@@ -733,9 +733,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;
@@ -749,18 +749,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -774,11 +774,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 */

diff --git a/device/include/pic16/pic18f248.h b/device/include/pic16/pic18f248.h
index c07a6ef81ce3c7a239a9e362a308fbf482699208..64f082744ca07a4c811afd118a6aef6f8c1af671 100644 (file)
--- a/device/include/pic16/pic18f248.h
+++ b/device/include/pic16/pic18f248.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F248_H__
 #define __PIC18F248_H__
 
-extern __sfr __at 0xf00 RXF0SIDH;
+extern __sfr __at (0xf00) RXF0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RXF0SIDHbits_t;
 
-extern volatile __RXF0SIDHbits_t __at 0xf00 RXF0SIDHbits;
+extern volatile __RXF0SIDHbits_t __at (0xf00) RXF0SIDHbits;
 
-extern __sfr __at 0xf01 RXF0SIDL;
+extern __sfr __at (0xf01) RXF0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -45,9 +45,9 @@ typedef union {
        };
 } __RXF0SIDLbits_t;
 
-extern volatile __RXF0SIDLbits_t __at 0xf01 RXF0SIDLbits;
+extern volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-extern __sfr __at 0xf02 RXF0EIDH;
+extern __sfr __at (0xf02) RXF0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -61,9 +61,9 @@ typedef union {
        };
 } __RXF0EIDHbits_t;
 
-extern volatile __RXF0EIDHbits_t __at 0xf02 RXF0EIDHbits;
+extern volatile __RXF0EIDHbits_t __at (0xf02) RXF0EIDHbits;
 
-extern __sfr __at 0xf03 RXF0EIDL;
+extern __sfr __at (0xf03) RXF0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -77,9 +77,9 @@ typedef union {
        };
 } __RXF0EIDLbits_t;
 
-extern volatile __RXF0EIDLbits_t __at 0xf03 RXF0EIDLbits;
+extern volatile __RXF0EIDLbits_t __at (0xf03) RXF0EIDLbits;
 
-extern __sfr __at 0xf04 RXF1SIDH;
+extern __sfr __at (0xf04) RXF1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -93,9 +93,9 @@ typedef union {
        };
 } __RXF1SIDHbits_t;
 
-extern volatile __RXF1SIDHbits_t __at 0xf04 RXF1SIDHbits;
+extern volatile __RXF1SIDHbits_t __at (0xf04) RXF1SIDHbits;
 
-extern __sfr __at 0xf05 RXF1SIDL;
+extern __sfr __at (0xf05) RXF1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -109,9 +109,9 @@ typedef union {
        };
 } __RXF1SIDLbits_t;
 
-extern volatile __RXF1SIDLbits_t __at 0xf05 RXF1SIDLbits;
+extern volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-extern __sfr __at 0xf06 RXF1EIDH;
+extern __sfr __at (0xf06) RXF1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -125,9 +125,9 @@ typedef union {
        };
 } __RXF1EIDHbits_t;
 
-extern volatile __RXF1EIDHbits_t __at 0xf06 RXF1EIDHbits;
+extern volatile __RXF1EIDHbits_t __at (0xf06) RXF1EIDHbits;
 
-extern __sfr __at 0xf07 RXF1EIDL;
+extern __sfr __at (0xf07) RXF1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -141,9 +141,9 @@ typedef union {
        };
 } __RXF1EIDLbits_t;
 
-extern volatile __RXF1EIDLbits_t __at 0xf07 RXF1EIDLbits;
+extern volatile __RXF1EIDLbits_t __at (0xf07) RXF1EIDLbits;
 
-extern __sfr __at 0xf08 RXF2SIDH;
+extern __sfr __at (0xf08) RXF2SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -157,9 +157,9 @@ typedef union {
        };
 } __RXF2SIDHbits_t;
 
-extern volatile __RXF2SIDHbits_t __at 0xf08 RXF2SIDHbits;
+extern volatile __RXF2SIDHbits_t __at (0xf08) RXF2SIDHbits;
 
-extern __sfr __at 0xf09 RXF2SIDL;
+extern __sfr __at (0xf09) RXF2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -173,9 +173,9 @@ typedef union {
        };
 } __RXF2SIDLbits_t;
 
-extern volatile __RXF2SIDLbits_t __at 0xf09 RXF2SIDLbits;
+extern volatile __RXF2SIDLbits_t __at (0xf09) RXF2SIDLbits;
 
-extern __sfr __at 0xf0a RXF2EIDH;
+extern __sfr __at (0xf0a) RXF2EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -189,9 +189,9 @@ typedef union {
        };
 } __RXF2EIDHbits_t;
 
-extern volatile __RXF2EIDHbits_t __at 0xf0a RXF2EIDHbits;
+extern volatile __RXF2EIDHbits_t __at (0xf0a) RXF2EIDHbits;
 
-extern __sfr __at 0xf0b RXF2EIDL;
+extern __sfr __at (0xf0b) RXF2EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -205,9 +205,9 @@ typedef union {
        };
 } __RXF2EIDLbits_t;
 
-extern volatile __RXF2EIDLbits_t __at 0xf0b RXF2EIDLbits;
+extern volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-extern __sfr __at 0xf0c RXF3SIDH;
+extern __sfr __at (0xf0c) RXF3SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -221,9 +221,9 @@ typedef union {
        };
 } __RXF3SIDHbits_t;
 
-extern volatile __RXF3SIDHbits_t __at 0xf0c RXF3SIDHbits;
+extern volatile __RXF3SIDHbits_t __at (0xf0c) RXF3SIDHbits;
 
-extern __sfr __at 0xf0d RXF3SIDL;
+extern __sfr __at (0xf0d) RXF3SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -237,9 +237,9 @@ typedef union {
        };
 } __RXF3SIDLbits_t;
 
-extern volatile __RXF3SIDLbits_t __at 0xf0d RXF3SIDLbits;
+extern volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-extern __sfr __at 0xf0e RXF3EIDH;
+extern __sfr __at (0xf0e) RXF3EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -253,9 +253,9 @@ typedef union {
        };
 } __RXF3EIDHbits_t;
 
-extern volatile __RXF3EIDHbits_t __at 0xf0e RXF3EIDHbits;
+extern volatile __RXF3EIDHbits_t __at (0xf0e) RXF3EIDHbits;
 
-extern __sfr __at 0xf0f RXF3EIDL;
+extern __sfr __at (0xf0f) RXF3EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -269,9 +269,9 @@ typedef union {
        };
 } __RXF3EIDLbits_t;
 
-extern volatile __RXF3EIDLbits_t __at 0xf0f RXF3EIDLbits;
+extern volatile __RXF3EIDLbits_t __at (0xf0f) RXF3EIDLbits;
 
-extern __sfr __at 0xf10 RXF4SIDH;
+extern __sfr __at (0xf10) RXF4SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -285,9 +285,9 @@ typedef union {
        };
 } __RXF4SIDHbits_t;
 
-extern volatile __RXF4SIDHbits_t __at 0xf10 RXF4SIDHbits;
+extern volatile __RXF4SIDHbits_t __at (0xf10) RXF4SIDHbits;
 
-extern __sfr __at 0xf11 RXF4SIDL;
+extern __sfr __at (0xf11) RXF4SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -301,9 +301,9 @@ typedef union {
        };
 } __RXF4SIDLbits_t;
 
-extern volatile __RXF4SIDLbits_t __at 0xf11 RXF4SIDLbits;
+extern volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-extern __sfr __at 0xf12 RXF4EIDH;
+extern __sfr __at (0xf12) RXF4EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -317,9 +317,9 @@ typedef union {
        };
 } __RXF4EIDHbits_t;
 
-extern volatile __RXF4EIDHbits_t __at 0xf12 RXF4EIDHbits;
+extern volatile __RXF4EIDHbits_t __at (0xf12) RXF4EIDHbits;
 
-extern __sfr __at 0xf13 RXF4EIDL;
+extern __sfr __at (0xf13) RXF4EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -333,9 +333,9 @@ typedef union {
        };
 } __RXF4EIDLbits_t;
 
-extern volatile __RXF4EIDLbits_t __at 0xf13 RXF4EIDLbits;
+extern volatile __RXF4EIDLbits_t __at (0xf13) RXF4EIDLbits;
 
-extern __sfr __at 0xf14 RXF5SIDH;
+extern __sfr __at (0xf14) RXF5SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -349,9 +349,9 @@ typedef union {
        };
 } __RXF5SIDHbits_t;
 
-extern volatile __RXF5SIDHbits_t __at 0xf14 RXF5SIDHbits;
+extern volatile __RXF5SIDHbits_t __at (0xf14) RXF5SIDHbits;
 
-extern __sfr __at 0xf15 RXF5SIDL;
+extern __sfr __at (0xf15) RXF5SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -365,9 +365,9 @@ typedef union {
        };
 } __RXF5SIDLbits_t;
 
-extern volatile __RXF5SIDLbits_t __at 0xf15 RXF5SIDLbits;
+extern volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-extern __sfr __at 0xf16 RXF5EIDH;
+extern __sfr __at (0xf16) RXF5EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -381,9 +381,9 @@ typedef union {
        };
 } __RXF5EIDHbits_t;
 
-extern volatile __RXF5EIDHbits_t __at 0xf16 RXF5EIDHbits;
+extern volatile __RXF5EIDHbits_t __at (0xf16) RXF5EIDHbits;
 
-extern __sfr __at 0xf17 RXF5EIDL;
+extern __sfr __at (0xf17) RXF5EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -397,9 +397,9 @@ typedef union {
        };
 } __RXF5EIDLbits_t;
 
-extern volatile __RXF5EIDLbits_t __at 0xf17 RXF5EIDLbits;
+extern volatile __RXF5EIDLbits_t __at (0xf17) RXF5EIDLbits;
 
-extern __sfr __at 0xf18 RXM0SIDH;
+extern __sfr __at (0xf18) RXM0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -413,9 +413,9 @@ typedef union {
        };
 } __RXM0SIDHbits_t;
 
-extern volatile __RXM0SIDHbits_t __at 0xf18 RXM0SIDHbits;
+extern volatile __RXM0SIDHbits_t __at (0xf18) RXM0SIDHbits;
 
-extern __sfr __at 0xf19 RXM0SIDL;
+extern __sfr __at (0xf19) RXM0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -429,9 +429,9 @@ typedef union {
        };
 } __RXM0SIDLbits_t;
 
-extern volatile __RXM0SIDLbits_t __at 0xf19 RXM0SIDLbits;
+extern volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-extern __sfr __at 0xf1a RXM0EIDH;
+extern __sfr __at (0xf1a) RXM0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -445,9 +445,9 @@ typedef union {
        };
 } __RXM0EIDHbits_t;
 
-extern volatile __RXM0EIDHbits_t __at 0xf1a RXM0EIDHbits;
+extern volatile __RXM0EIDHbits_t __at (0xf1a) RXM0EIDHbits;
 
-extern __sfr __at 0xf1b RXM0EIDL;
+extern __sfr __at (0xf1b) RXM0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -461,9 +461,9 @@ typedef union {
        };
 } __RXM0EIDLbits_t;
 
-extern volatile __RXM0EIDLbits_t __at 0xf1b RXM0EIDLbits;
+extern volatile __RXM0EIDLbits_t __at (0xf1b) RXM0EIDLbits;
 
-extern __sfr __at 0xf1c RXM1SIDH;
+extern __sfr __at (0xf1c) RXM1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -477,9 +477,9 @@ typedef union {
        };
 } __RXM1SIDHbits_t;
 
-extern volatile __RXM1SIDHbits_t __at 0xf1c RXM1SIDHbits;
+extern volatile __RXM1SIDHbits_t __at (0xf1c) RXM1SIDHbits;
 
-extern __sfr __at 0xf1d RXM1SIDL;
+extern __sfr __at (0xf1d) RXM1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -493,9 +493,9 @@ typedef union {
        };
 } __RXM1SIDLbits_t;
 
-extern volatile __RXM1SIDLbits_t __at 0xf1d RXM1SIDLbits;
+extern volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-extern __sfr __at 0xf1e RXM1EIDH;
+extern __sfr __at (0xf1e) RXM1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -509,9 +509,9 @@ typedef union {
        };
 } __RXM1EIDHbits_t;
 
-extern volatile __RXM1EIDHbits_t __at 0xf1e RXM1EIDHbits;
+extern volatile __RXM1EIDHbits_t __at (0xf1e) RXM1EIDHbits;
 
-extern __sfr __at 0xf1f RXM1EIDL;
+extern __sfr __at (0xf1f) RXM1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -525,9 +525,9 @@ typedef union {
        };
 } __RXM1EIDLbits_t;
 
-extern volatile __RXM1EIDLbits_t __at 0xf1f RXM1EIDLbits;
+extern volatile __RXM1EIDLbits_t __at (0xf1f) RXM1EIDLbits;
 
-extern __sfr __at 0xf20 TXB2CON;
+extern __sfr __at (0xf20) TXB2CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -541,9 +541,9 @@ typedef union {
        };
 } __TXB2CONbits_t;
 
-extern volatile __TXB2CONbits_t __at 0xf20 TXB2CONbits;
+extern volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-extern __sfr __at 0xf21 TXB2SIDH;
+extern __sfr __at (0xf21) TXB2SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -557,9 +557,9 @@ typedef union {
        };
 } __TXB2SIDHbits_t;
 
-extern volatile __TXB2SIDHbits_t __at 0xf21 TXB2SIDHbits;
+extern volatile __TXB2SIDHbits_t __at (0xf21) TXB2SIDHbits;
 
-extern __sfr __at 0xf22 TXB2SIDL;
+extern __sfr __at (0xf22) TXB2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -573,9 +573,9 @@ typedef union {
        };
 } __TXB2SIDLbits_t;
 
-extern volatile __TXB2SIDLbits_t __at 0xf22 TXB2SIDLbits;
+extern volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-extern __sfr __at 0xf23 TXB2EIDH;
+extern __sfr __at (0xf23) TXB2EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -589,9 +589,9 @@ typedef union {
        };
 } __TXB2EIDHbits_t;
 
-extern volatile __TXB2EIDHbits_t __at 0xf23 TXB2EIDHbits;
+extern volatile __TXB2EIDHbits_t __at (0xf23) TXB2EIDHbits;
 
-extern __sfr __at 0xf24 TXB2EIDL;
+extern __sfr __at (0xf24) TXB2EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -605,9 +605,9 @@ typedef union {
        };
 } __TXB2EIDLbits_t;
 
-extern volatile __TXB2EIDLbits_t __at 0xf24 TXB2EIDLbits;
+extern volatile __TXB2EIDLbits_t __at (0xf24) TXB2EIDLbits;
 
-extern __sfr __at 0xf25 TXB2DLC;
+extern __sfr __at (0xf25) TXB2DLC;
 typedef union {
        struct {
                unsigned TXB2DLC0:1;
@@ -621,9 +621,9 @@ typedef union {
        };
 } __TXB2DLCbits_t;
 
-extern volatile __TXB2DLCbits_t __at 0xf25 TXB2DLCbits;
+extern volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-extern __sfr __at 0xf26 TXB2D0;
+extern __sfr __at (0xf26) TXB2D0;
 typedef union {
        struct {
                unsigned TXB2D00:1;
@@ -637,9 +637,9 @@ typedef union {
        };
 } __TXB2D0bits_t;
 
-extern volatile __TXB2D0bits_t __at 0xf26 TXB2D0bits;
+extern volatile __TXB2D0bits_t __at (0xf26) TXB2D0bits;
 
-extern __sfr __at 0xf27 TXB2D1;
+extern __sfr __at (0xf27) TXB2D1;
 typedef union {
        struct {
                unsigned TXB2D10:1;
@@ -653,9 +653,9 @@ typedef union {
        };
 } __TXB2D1bits_t;
 
-extern volatile __TXB2D1bits_t __at 0xf27 TXB2D1bits;
+extern volatile __TXB2D1bits_t __at (0xf27) TXB2D1bits;
 
-extern __sfr __at 0xf28 TXB2D2;
+extern __sfr __at (0xf28) TXB2D2;
 typedef union {
        struct {
                unsigned TXB2D20:1;
@@ -669,9 +669,9 @@ typedef union {
        };
 } __TXB2D2bits_t;
 
-extern volatile __TXB2D2bits_t __at 0xf28 TXB2D2bits;
+extern volatile __TXB2D2bits_t __at (0xf28) TXB2D2bits;
 
-extern __sfr __at 0xf29 TXB2D3;
+extern __sfr __at (0xf29) TXB2D3;
 typedef union {
        struct {
                unsigned TXB2D30:1;
@@ -685,9 +685,9 @@ typedef union {
        };
 } __TXB2D3bits_t;
 
-extern volatile __TXB2D3bits_t __at 0xf29 TXB2D3bits;
+extern volatile __TXB2D3bits_t __at (0xf29) TXB2D3bits;
 
-extern __sfr __at 0xf2a TXB2D4;
+extern __sfr __at (0xf2a) TXB2D4;
 typedef union {
        struct {
                unsigned TXB2D40:1;
@@ -701,9 +701,9 @@ typedef union {
        };
 } __TXB2D4bits_t;
 
-extern volatile __TXB2D4bits_t __at 0xf2a TXB2D4bits;
+extern volatile __TXB2D4bits_t __at (0xf2a) TXB2D4bits;
 
-extern __sfr __at 0xf2b TXB2D5;
+extern __sfr __at (0xf2b) TXB2D5;
 typedef union {
        struct {
                unsigned TXB2D50:1;
@@ -717,9 +717,9 @@ typedef union {
        };
 } __TXB2D5bits_t;
 
-extern volatile __TXB2D5bits_t __at 0xf2b TXB2D5bits;
+extern volatile __TXB2D5bits_t __at (0xf2b) TXB2D5bits;
 
-extern __sfr __at 0xf2c TXB2D6;
+extern __sfr __at (0xf2c) TXB2D6;
 typedef union {
        struct {
                unsigned TXB2D60:1;
@@ -733,9 +733,9 @@ typedef union {
        };
 } __TXB2D6bits_t;
 
-extern volatile __TXB2D6bits_t __at 0xf2c TXB2D6bits;
+extern volatile __TXB2D6bits_t __at (0xf2c) TXB2D6bits;
 
-extern __sfr __at 0xf2d TXB2D7;
+extern __sfr __at (0xf2d) TXB2D7;
 typedef union {
        struct {
                unsigned TXB2D70:1;
@@ -749,9 +749,9 @@ typedef union {
        };
 } __TXB2D7bits_t;
 
-extern volatile __TXB2D7bits_t __at 0xf2d TXB2D7bits;
+extern volatile __TXB2D7bits_t __at (0xf2d) TXB2D7bits;
 
-extern __sfr __at 0xf2e CANSTATRO4;
+extern __sfr __at (0xf2e) CANSTATRO4;
 typedef union {
        struct {
                unsigned :1;
@@ -765,9 +765,9 @@ typedef union {
        };
 } __CANSTATRO4bits_t;
 
-extern volatile __CANSTATRO4bits_t __at 0xf2e CANSTATRO4bits;
+extern volatile __CANSTATRO4bits_t __at (0xf2e) CANSTATRO4bits;
 
-extern __sfr __at 0xf30 TXB1CON;
+extern __sfr __at (0xf30) TXB1CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -781,9 +781,9 @@ typedef union {
        };
 } __TXB1CONbits_t;
 
-extern volatile __TXB1CONbits_t __at 0xf30 TXB1CONbits;
+extern volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-extern __sfr __at 0xf31 TXB1SIDH;
+extern __sfr __at (0xf31) TXB1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -797,9 +797,9 @@ typedef union {
        };
 } __TXB1SIDHbits_t;
 
-extern volatile __TXB1SIDHbits_t __at 0xf31 TXB1SIDHbits;
+extern volatile __TXB1SIDHbits_t __at (0xf31) TXB1SIDHbits;
 
-extern __sfr __at 0xf32 TXB1SIDL;
+extern __sfr __at (0xf32) TXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -813,9 +813,9 @@ typedef union {
        };
 } __TXB1SIDLbits_t;
 
-extern volatile __TXB1SIDLbits_t __at 0xf32 TXB1SIDLbits;
+extern volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-extern __sfr __at 0xf33 TXB1EIDH;
+extern __sfr __at (0xf33) TXB1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -829,9 +829,9 @@ typedef union {
        };
 } __TXB1EIDHbits_t;
 
-extern volatile __TXB1EIDHbits_t __at 0xf33 TXB1EIDHbits;
+extern volatile __TXB1EIDHbits_t __at (0xf33) TXB1EIDHbits;
 
-extern __sfr __at 0xf34 TXB1EIDL;
+extern __sfr __at (0xf34) TXB1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -845,9 +845,9 @@ typedef union {
        };
 } __TXB1EIDLbits_t;
 
-extern volatile __TXB1EIDLbits_t __at 0xf34 TXB1EIDLbits;
+extern volatile __TXB1EIDLbits_t __at (0xf34) TXB1EIDLbits;
 
-extern __sfr __at 0xf35 TXB1DLC;
+extern __sfr __at (0xf35) TXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -861,9 +861,9 @@ typedef union {
        };
 } __TXB1DLCbits_t;
 
-extern volatile __TXB1DLCbits_t __at 0xf35 TXB1DLCbits;
+extern volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-extern __sfr __at 0xf36 TXB1D0;
+extern __sfr __at (0xf36) TXB1D0;
 typedef union {
        struct {
                unsigned TXB1D00:1;
@@ -877,9 +877,9 @@ typedef union {
        };
 } __TXB1D0bits_t;
 
-extern volatile __TXB1D0bits_t __at 0xf36 TXB1D0bits;
+extern volatile __TXB1D0bits_t __at (0xf36) TXB1D0bits;
 
-extern __sfr __at 0xf37 TXB1D1;
+extern __sfr __at (0xf37) TXB1D1;
 typedef union {
        struct {
                unsigned TXB1D10:1;
@@ -893,9 +893,9 @@ typedef union {
        };
 } __TXB1D1bits_t;
 
-extern volatile __TXB1D1bits_t __at 0xf37 TXB1D1bits;
+extern volatile __TXB1D1bits_t __at (0xf37) TXB1D1bits;
 
-extern __sfr __at 0xf38 TXB1D2;
+extern __sfr __at (0xf38) TXB1D2;
 typedef union {
        struct {
                unsigned TXB1D20:1;
@@ -909,9 +909,9 @@ typedef union {
        };
 } __TXB1D2bits_t;
 
-extern volatile __TXB1D2bits_t __at 0xf38 TXB1D2bits;
+extern volatile __TXB1D2bits_t __at (0xf38) TXB1D2bits;
 
-extern __sfr __at 0xf39 TXB1D3;
+extern __sfr __at (0xf39) TXB1D3;
 typedef union {
        struct {
                unsigned TXB1D30:1;
@@ -925,9 +925,9 @@ typedef union {
        };
 } __TXB1D3bits_t;
 
-extern volatile __TXB1D3bits_t __at 0xf39 TXB1D3bits;
+extern volatile __TXB1D3bits_t __at (0xf39) TXB1D3bits;
 
-extern __sfr __at 0xf3a TXB1D4;
+extern __sfr __at (0xf3a) TXB1D4;
 typedef union {
        struct {
                unsigned TXB1D40:1;
@@ -941,9 +941,9 @@ typedef union {
        };
 } __TXB1D4bits_t;
 
-extern volatile __TXB1D4bits_t __at 0xf3a TXB1D4bits;
+extern volatile __TXB1D4bits_t __at (0xf3a) TXB1D4bits;
 
-extern __sfr __at 0xf3b TXB1D5;
+extern __sfr __at (0xf3b) TXB1D5;
 typedef union {
        struct {
                unsigned TXB1D50:1;
@@ -957,9 +957,9 @@ typedef union {
        };
 } __TXB1D5bits_t;
 
-extern volatile __TXB1D5bits_t __at 0xf3b TXB1D5bits;
+extern volatile __TXB1D5bits_t __at (0xf3b) TXB1D5bits;
 
-extern __sfr __at 0xf3c TXB1D6;
+extern __sfr __at (0xf3c) TXB1D6;
 typedef union {
        struct {
                unsigned TXB1D60:1;
@@ -973,9 +973,9 @@ typedef union {
        };
 } __TXB1D6bits_t;
 
-extern volatile __TXB1D6bits_t __at 0xf3c TXB1D6bits;
+extern volatile __TXB1D6bits_t __at (0xf3c) TXB1D6bits;
 
-extern __sfr __at 0xf3d TXB1D7;
+extern __sfr __at (0xf3d) TXB1D7;
 typedef union {
        struct {
                unsigned TXB1D70:1;
@@ -989,9 +989,9 @@ typedef union {
        };
 } __TXB1D7bits_t;
 
-extern volatile __TXB1D7bits_t __at 0xf3d TXB1D7bits;
+extern volatile __TXB1D7bits_t __at (0xf3d) TXB1D7bits;
 
-extern __sfr __at 0xf3e CANSTATRO3;
+extern __sfr __at (0xf3e) CANSTATRO3;
 typedef union {
        struct {
                unsigned :1;
@@ -1005,9 +1005,9 @@ typedef union {
        };
 } __CANSTATRO3bits_t;
 
-extern volatile __CANSTATRO3bits_t __at 0xf3e CANSTATRO3bits;
+extern volatile __CANSTATRO3bits_t __at (0xf3e) CANSTATRO3bits;
 
-extern __sfr __at 0xf40 TXB0CON;
+extern __sfr __at (0xf40) TXB0CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -1021,9 +1021,9 @@ typedef union {
        };
 } __TXB0CONbits_t;
 
-extern volatile __TXB0CONbits_t __at 0xf40 TXB0CONbits;
+extern volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-extern __sfr __at 0xf41 TXB0SIDH;
+extern __sfr __at (0xf41) TXB0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1037,9 +1037,9 @@ typedef union {
        };
 } __TXB0SIDHbits_t;
 
-extern volatile __TXB0SIDHbits_t __at 0xf41 TXB0SIDHbits;
+extern volatile __TXB0SIDHbits_t __at (0xf41) TXB0SIDHbits;
 
-extern __sfr __at 0xf42 TXB0SIDL;
+extern __sfr __at (0xf42) TXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1053,9 +1053,9 @@ typedef union {
        };
 } __TXB0SIDLbits_t;
 
-extern volatile __TXB0SIDLbits_t __at 0xf42 TXB0SIDLbits;
+extern volatile __TXB0SIDLbits_t __at (0xf42) TXB0SIDLbits;
 
-extern __sfr __at 0xf43 TXB0EIDH;
+extern __sfr __at (0xf43) TXB0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1069,9 +1069,9 @@ typedef union {
        };
 } __TXB0EIDHbits_t;
 
-extern volatile __TXB0EIDHbits_t __at 0xf43 TXB0EIDHbits;
+extern volatile __TXB0EIDHbits_t __at (0xf43) TXB0EIDHbits;
 
-extern __sfr __at 0xf44 TXB0EIDL;
+extern __sfr __at (0xf44) TXB0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1085,9 +1085,9 @@ typedef union {
        };
 } __TXB0EIDLbits_t;
 
-extern volatile __TXB0EIDLbits_t __at 0xf44 TXB0EIDLbits;
+extern volatile __TXB0EIDLbits_t __at (0xf44) TXB0EIDLbits;
 
-extern __sfr __at 0xf45 TXB0DLC;
+extern __sfr __at (0xf45) TXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1101,9 +1101,9 @@ typedef union {
        };
 } __TXB0DLCbits_t;
 
-extern volatile __TXB0DLCbits_t __at 0xf45 TXB0DLCbits;
+extern volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-extern __sfr __at 0xf46 TXB0D0;
+extern __sfr __at (0xf46) TXB0D0;
 typedef union {
        struct {
                unsigned TXB0D00:1;
@@ -1117,9 +1117,9 @@ typedef union {
        };
 } __TXB0D0bits_t;
 
-extern volatile __TXB0D0bits_t __at 0xf46 TXB0D0bits;
+extern volatile __TXB0D0bits_t __at (0xf46) TXB0D0bits;
 
-extern __sfr __at 0xf47 TXB0D1;
+extern __sfr __at (0xf47) TXB0D1;
 typedef union {
        struct {
                unsigned TXB0D10:1;
@@ -1133,9 +1133,9 @@ typedef union {
        };
 } __TXB0D1bits_t;
 
-extern volatile __TXB0D1bits_t __at 0xf47 TXB0D1bits;
+extern volatile __TXB0D1bits_t __at (0xf47) TXB0D1bits;
 
-extern __sfr __at 0xf48 TXB0D2;
+extern __sfr __at (0xf48) TXB0D2;
 typedef union {
        struct {
                unsigned TXB0D20:1;
@@ -1149,9 +1149,9 @@ typedef union {
        };
 } __TXB0D2bits_t;
 
-extern volatile __TXB0D2bits_t __at 0xf48 TXB0D2bits;
+extern volatile __TXB0D2bits_t __at (0xf48) TXB0D2bits;
 
-extern __sfr __at 0xf49 TXB0D3;
+extern __sfr __at (0xf49) TXB0D3;
 typedef union {
        struct {
                unsigned TXB0D30:1;
@@ -1165,9 +1165,9 @@ typedef union {
        };
 } __TXB0D3bits_t;
 
-extern volatile __TXB0D3bits_t __at 0xf49 TXB0D3bits;
+extern volatile __TXB0D3bits_t __at (0xf49) TXB0D3bits;
 
-extern __sfr __at 0xf4a TXB0D4;
+extern __sfr __at (0xf4a) TXB0D4;
 typedef union {
        struct {
                unsigned TXB0D40:1;
@@ -1181,9 +1181,9 @@ typedef union {
        };
 } __TXB0D4bits_t;
 
-extern volatile __TXB0D4bits_t __at 0xf4a TXB0D4bits;
+extern volatile __TXB0D4bits_t __at (0xf4a) TXB0D4bits;
 
-extern __sfr __at 0xf4b TXB0D5;
+extern __sfr __at (0xf4b) TXB0D5;
 typedef union {
        struct {
                unsigned TXB0D50:1;
@@ -1197,9 +1197,9 @@ typedef union {
        };
 } __TXB0D5bits_t;
 
-extern volatile __TXB0D5bits_t __at 0xf4b TXB0D5bits;
+extern volatile __TXB0D5bits_t __at (0xf4b) TXB0D5bits;
 
-extern __sfr __at 0xf4c TXB0D6;
+extern __sfr __at (0xf4c) TXB0D6;
 typedef union {
        struct {
                unsigned TXB0D60:1;
@@ -1213,9 +1213,9 @@ typedef union {
        };
 } __TXB0D6bits_t;
 
-extern volatile __TXB0D6bits_t __at 0xf4c TXB0D6bits;
+extern volatile __TXB0D6bits_t __at (0xf4c) TXB0D6bits;
 
-extern __sfr __at 0xf4d TXB0D7;
+extern __sfr __at (0xf4d) TXB0D7;
 typedef union {
        struct {
                unsigned TXB0D70:1;
@@ -1229,9 +1229,9 @@ typedef union {
        };
 } __TXB0D7bits_t;
 
-extern volatile __TXB0D7bits_t __at 0xf4d TXB0D7bits;
+extern volatile __TXB0D7bits_t __at (0xf4d) TXB0D7bits;
 
-extern __sfr __at 0xf4e CANSTATRO2;
+extern __sfr __at (0xf4e) CANSTATRO2;
 typedef union {
        struct {
                unsigned :1;
@@ -1245,9 +1245,9 @@ typedef union {
        };
 } __CANSTATRO2bits_t;
 
-extern volatile __CANSTATRO2bits_t __at 0xf4e CANSTATRO2bits;
+extern volatile __CANSTATRO2bits_t __at (0xf4e) CANSTATRO2bits;
 
-extern __sfr __at 0xf50 RXB1CON;
+extern __sfr __at (0xf50) RXB1CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -1261,9 +1261,9 @@ typedef union {
        };
 } __RXB1CONbits_t;
 
-extern volatile __RXB1CONbits_t __at 0xf50 RXB1CONbits;
+extern volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-extern __sfr __at 0xf51 RXB1SIDH;
+extern __sfr __at (0xf51) RXB1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1277,9 +1277,9 @@ typedef union {
        };
 } __RXB1SIDHbits_t;
 
-extern volatile __RXB1SIDHbits_t __at 0xf51 RXB1SIDHbits;
+extern volatile __RXB1SIDHbits_t __at (0xf51) RXB1SIDHbits;
 
-extern __sfr __at 0xf52 RXB1SIDL;
+extern __sfr __at (0xf52) RXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1293,9 +1293,9 @@ typedef union {
        };
 } __RXB1SIDLbits_t;
 
-extern volatile __RXB1SIDLbits_t __at 0xf52 RXB1SIDLbits;
+extern volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-extern __sfr __at 0xf53 RXB1EIDH;
+extern __sfr __at (0xf53) RXB1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1309,9 +1309,9 @@ typedef union {
        };
 } __RXB1EIDHbits_t;
 
-extern volatile __RXB1EIDHbits_t __at 0xf53 RXB1EIDHbits;
+extern volatile __RXB1EIDHbits_t __at (0xf53) RXB1EIDHbits;
 
-extern __sfr __at 0xf54 RXB1EIDL;
+extern __sfr __at (0xf54) RXB1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1325,9 +1325,9 @@ typedef union {
        };
 } __RXB1EIDLbits_t;
 
-extern volatile __RXB1EIDLbits_t __at 0xf54 RXB1EIDLbits;
+extern volatile __RXB1EIDLbits_t __at (0xf54) RXB1EIDLbits;
 
-extern __sfr __at 0xf55 RXB1DLC;
+extern __sfr __at (0xf55) RXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1341,9 +1341,9 @@ typedef union {
        };
 } __RXB1DLCbits_t;
 
-extern volatile __RXB1DLCbits_t __at 0xf55 RXB1DLCbits;
+extern volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-extern __sfr __at 0xf56 RXB1D0;
+extern __sfr __at (0xf56) RXB1D0;
 typedef union {
        struct {
                unsigned RXB1D00:1;
@@ -1357,9 +1357,9 @@ typedef union {
        };
 } __RXB1D0bits_t;
 
-extern volatile __RXB1D0bits_t __at 0xf56 RXB1D0bits;
+extern volatile __RXB1D0bits_t __at (0xf56) RXB1D0bits;
 
-extern __sfr __at 0xf57 RXB1D1;
+extern __sfr __at (0xf57) RXB1D1;
 typedef union {
        struct {
                unsigned RXB1D10:1;
@@ -1373,9 +1373,9 @@ typedef union {
        };
 } __RXB1D1bits_t;
 
-extern volatile __RXB1D1bits_t __at 0xf57 RXB1D1bits;
+extern volatile __RXB1D1bits_t __at (0xf57) RXB1D1bits;
 
-extern __sfr __at 0xf58 RXB1D2;
+extern __sfr __at (0xf58) RXB1D2;
 typedef union {
        struct {
                unsigned RXB1D20:1;
@@ -1389,9 +1389,9 @@ typedef union {
        };
 } __RXB1D2bits_t;
 
-extern volatile __RXB1D2bits_t __at 0xf58 RXB1D2bits;
+extern volatile __RXB1D2bits_t __at (0xf58) RXB1D2bits;
 
-extern __sfr __at 0xf59 RXB1D3;
+extern __sfr __at (0xf59) RXB1D3;
 typedef union {
        struct {
                unsigned RXB1D30:1;
@@ -1405,9 +1405,9 @@ typedef union {
        };
 } __RXB1D3bits_t;
 
-extern volatile __RXB1D3bits_t __at 0xf59 RXB1D3bits;
+extern volatile __RXB1D3bits_t __at (0xf59) RXB1D3bits;
 
-extern __sfr __at 0xf5a RXB1D4;
+extern __sfr __at (0xf5a) RXB1D4;
 typedef union {
        struct {
                unsigned RXB1D40:1;
@@ -1421,9 +1421,9 @@ typedef union {
        };
 } __RXB1D4bits_t;
 
-extern volatile __RXB1D4bits_t __at 0xf5a RXB1D4bits;
+extern volatile __RXB1D4bits_t __at (0xf5a) RXB1D4bits;
 
-extern __sfr __at 0xf5b RXB1D5;
+extern __sfr __at (0xf5b) RXB1D5;
 typedef union {
        struct {
                unsigned RXB1D50:1;
@@ -1437,9 +1437,9 @@ typedef union {
        };
 } __RXB1D5bits_t;
 
-extern volatile __RXB1D5bits_t __at 0xf5b RXB1D5bits;
+extern volatile __RXB1D5bits_t __at (0xf5b) RXB1D5bits;
 
-extern __sfr __at 0xf5c RXB1D6;
+extern __sfr __at (0xf5c) RXB1D6;
 typedef union {
        struct {
                unsigned RXB1D60:1;
@@ -1453,9 +1453,9 @@ typedef union {
        };
 } __RXB1D6bits_t;
 
-extern volatile __RXB1D6bits_t __at 0xf5c RXB1D6bits;
+extern volatile __RXB1D6bits_t __at (0xf5c) RXB1D6bits;
 
-extern __sfr __at 0xf5d RXB1D7;
+extern __sfr __at (0xf5d) RXB1D7;
 typedef union {
        struct {
                unsigned RXB1D70:1;
@@ -1469,9 +1469,9 @@ typedef union {
        };
 } __RXB1D7bits_t;
 
-extern volatile __RXB1D7bits_t __at 0xf5d RXB1D7bits;
+extern volatile __RXB1D7bits_t __at (0xf5d) RXB1D7bits;
 
-extern __sfr __at 0xf5e CANSTATRO1;
+extern __sfr __at (0xf5e) CANSTATRO1;
 typedef union {
        struct {
                unsigned :1;
@@ -1485,9 +1485,9 @@ typedef union {
        };
 } __CANSTATRO1bits_t;
 
-extern volatile __CANSTATRO1bits_t __at 0xf5e CANSTATRO1bits;
+extern volatile __CANSTATRO1bits_t __at (0xf5e) CANSTATRO1bits;
 
-extern __sfr __at 0xf60 RXB0CON;
+extern __sfr __at (0xf60) RXB0CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -1501,9 +1501,9 @@ typedef union {
        };
 } __RXB0CONbits_t;
 
-extern volatile __RXB0CONbits_t __at 0xf60 RXB0CONbits;
+extern volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-extern __sfr __at 0xf61 RXB0SIDH;
+extern __sfr __at (0xf61) RXB0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1517,9 +1517,9 @@ typedef union {
        };
 } __RXB0SIDHbits_t;
 
-extern volatile __RXB0SIDHbits_t __at 0xf61 RXB0SIDHbits;
+extern volatile __RXB0SIDHbits_t __at (0xf61) RXB0SIDHbits;
 
-extern __sfr __at 0xf62 RXB0SIDL;
+extern __sfr __at (0xf62) RXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1533,9 +1533,9 @@ typedef union {
        };
 } __RXB0SIDLbits_t;
 
-extern volatile __RXB0SIDLbits_t __at 0xf62 RXB0SIDLbits;
+extern volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-extern __sfr __at 0xf63 RXB0EIDH;
+extern __sfr __at (0xf63) RXB0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1549,9 +1549,9 @@ typedef union {
        };
 } __RXB0EIDHbits_t;
 
-extern volatile __RXB0EIDHbits_t __at 0xf63 RXB0EIDHbits;
+extern volatile __RXB0EIDHbits_t __at (0xf63) RXB0EIDHbits;
 
-extern __sfr __at 0xf64 RXB0EIDL;
+extern __sfr __at (0xf64) RXB0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1565,9 +1565,9 @@ typedef union {
        };
 } __RXB0EIDLbits_t;
 
-extern volatile __RXB0EIDLbits_t __at 0xf64 RXB0EIDLbits;
+extern volatile __RXB0EIDLbits_t __at (0xf64) RXB0EIDLbits;
 
-extern __sfr __at 0xf65 RXB0DLC;
+extern __sfr __at (0xf65) RXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1581,17 +1581,17 @@ typedef union {
        };
 } __RXB0DLCbits_t;
 
-extern volatile __RXB0DLCbits_t __at 0xf65 RXB0DLCbits;
+extern volatile __RXB0DLCbits_t __at (0xf65) RXB0DLCbits;
 
-extern __sfr __at 0xf66 RXB0D0;
-extern __sfr __at 0xf67 RXB0D1;
-extern __sfr __at 0xf68 RXB0D2;
-extern __sfr __at 0xf69 RXB0D3;
-extern __sfr __at 0xf6a RXB0D4;
-extern __sfr __at 0xf6b RXB0D5;
-extern __sfr __at 0xf6c RXB0D6;
-extern __sfr __at 0xf6d RXB0D7;
-extern __sfr __at 0xf6e CANSTAT;
+extern __sfr __at (0xf66) RXB0D0;
+extern __sfr __at (0xf67) RXB0D1;
+extern __sfr __at (0xf68) RXB0D2;
+extern __sfr __at (0xf69) RXB0D3;
+extern __sfr __at (0xf6a) RXB0D4;
+extern __sfr __at (0xf6b) RXB0D5;
+extern __sfr __at (0xf6c) RXB0D6;
+extern __sfr __at (0xf6d) RXB0D7;
+extern __sfr __at (0xf6e) CANSTAT;
 typedef union {
        struct {
                unsigned :1;
@@ -1605,9 +1605,9 @@ typedef union {
        };
 } __CANSTATbits_t;
 
-extern volatile __CANSTATbits_t __at 0xf6e CANSTATbits;
+extern volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-extern __sfr __at 0xf6f CANCON;
+extern __sfr __at (0xf6f) CANCON;
 typedef union {
        struct {
                unsigned WIN0:1;
@@ -1621,9 +1621,9 @@ typedef union {
        };
 } __CANCONbits_t;
 
-extern volatile __CANCONbits_t __at 0xf6f CANCONbits;
+extern volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-extern __sfr __at 0xf70 BRGCON1;
+extern __sfr __at (0xf70) BRGCON1;
 typedef union {
        struct {
                unsigned BRP0:1;
@@ -1637,9 +1637,9 @@ typedef union {
        };
 } __BRGCON1bits_t;
 
-extern volatile __BRGCON1bits_t __at 0xf70 BRGCON1bits;
+extern volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-extern __sfr __at 0xf71 BRGCON2;
+extern __sfr __at (0xf71) BRGCON2;
 typedef union {
        struct {
                unsigned PRSEG0:1;
@@ -1653,9 +1653,9 @@ typedef union {
        };
 } __BRGCON2bits_t;
 
-extern volatile __BRGCON2bits_t __at 0xf71 BRGCON2bits;
+extern volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-extern __sfr __at 0xf72 BRGCON3;
+extern __sfr __at (0xf72) BRGCON3;
 typedef union {
        struct {
                unsigned SEG2PH0:1;
@@ -1669,9 +1669,9 @@ typedef union {
        };
 } __BRGCON3bits_t;
 
-extern volatile __BRGCON3bits_t __at 0xf72 BRGCON3bits;
+extern volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-extern __sfr __at 0xf73 CIOCON;
+extern __sfr __at (0xf73) CIOCON;
 typedef union {
        struct {
                unsigned :1;
@@ -1685,9 +1685,9 @@ typedef union {
        };
 } __CIOCONbits_t;
 
-extern volatile __CIOCONbits_t __at 0xf73 CIOCONbits;
+extern volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-extern __sfr __at 0xf74 COMSTAT;
+extern __sfr __at (0xf74) COMSTAT;
 typedef union {
        struct {
                unsigned EWARN:1;
@@ -1701,9 +1701,9 @@ typedef union {
        };
 } __COMSTATbits_t;
 
-extern volatile __COMSTATbits_t __at 0xf74 COMSTATbits;
+extern volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-extern __sfr __at 0xf75 RXERRCNT;
+extern __sfr __at (0xf75) RXERRCNT;
 typedef union {
        struct {
                unsigned REC0:1;
@@ -1717,9 +1717,9 @@ typedef union {
        };
 } __RXERRCNTbits_t;
 
-extern volatile __RXERRCNTbits_t __at 0xf75 RXERRCNTbits;
+extern volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-extern __sfr __at 0xf76 TXERRCNT;
+extern __sfr __at (0xf76) TXERRCNT;
 typedef union {
        struct {
                unsigned TEC0:1;
@@ -1733,9 +1733,9 @@ typedef union {
        };
 } __TXERRCNTbits_t;
 
-extern volatile __TXERRCNTbits_t __at 0xf76 TXERRCNTbits;
+extern volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -1782,9 +1782,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;
@@ -1809,9 +1809,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -1847,9 +1847,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -1863,9 +1863,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;
@@ -1879,9 +1879,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -1895,9 +1895,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -1911,9 +1911,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;
@@ -1927,9 +1927,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -1943,9 +1943,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -1959,9 +1959,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;
@@ -1975,9 +1975,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;
@@ -1991,9 +1991,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 CCP2IE:1;
@@ -2007,9 +2007,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 CCP2IF:1;
@@ -2023,9 +2023,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 CCP2IP:1;
@@ -2039,9 +2039,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned RX0IE:1;
@@ -2055,9 +2055,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned RX0IF:1;
@@ -2071,9 +2071,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned RX0IP:1;
@@ -2087,9 +2087,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -2103,12 +2103,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -2122,9 +2122,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;
@@ -2138,12 +2138,12 @@ 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 0xfb1 T3CON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -2157,11 +2157,11 @@ 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 (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -2175,11 +2175,11 @@ typedef union {
        };
 } __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 0xfc1 ADCON1;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -2193,9 +2193,9 @@ typedef union {
        };
 } __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;
@@ -2209,11 +2209,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -2227,9 +2227,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -2243,9 +2243,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -2259,11 +2259,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -2277,11 +2277,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;
@@ -2295,11 +2295,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;
@@ -2313,9 +2313,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;
@@ -2340,9 +2340,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;
@@ -2367,9 +2367,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;
@@ -2383,12 +2383,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -2402,32 +2402,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;
@@ -2452,9 +2452,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;
@@ -2468,9 +2468,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;
@@ -2484,18 +2484,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -2509,11 +2509,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 */

diff --git a/device/include/pic16/pic18f252.h b/device/include/pic16/pic18f252.h
index aa55d395eb95d7491ee5d5ca454fb857ab163979..f913396263e76a4e8fb6e4dca00ac7f4699da865 100644 (file)
--- a/device/include/pic16/pic18f252.h
+++ b/device/include/pic16/pic18f252.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F252_H__
 #define __PIC18F252_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 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -127,9 +127,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -143,9 +143,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;
@@ -159,9 +159,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -175,9 +175,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -191,9 +191,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;
@@ -207,9 +207,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -223,9 +223,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -239,9 +239,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;
@@ -255,9 +255,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;
@@ -271,9 +271,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 CCP2IE:1;
@@ -287,9 +287,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 CCP2IF:1;
@@ -303,9 +303,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 CCP2IP:1;
@@ -319,9 +319,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;
@@ -335,12 +335,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -354,9 +354,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;
@@ -370,12 +370,12 @@ 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 0xfb1 T3CON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -389,11 +389,11 @@ 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 0xfba CCP2CON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -407,11 +407,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -425,11 +425,11 @@ typedef union {
        };
 } __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 0xfc1 ADCON1;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -443,9 +443,9 @@ typedef union {
        };
 } __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;
@@ -459,11 +459,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -477,9 +477,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -493,9 +493,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -509,11 +509,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -527,11 +527,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;
@@ -545,11 +545,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;
@@ -563,9 +563,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;
@@ -590,9 +590,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;
@@ -617,9 +617,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;
@@ -633,9 +633,9 @@ 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 (0xfd5) T0CON;
 typedef union {
        struct {
                unsigned T0PS0:1;
@@ -649,11 +649,11 @@ typedef union {
        };
 } __T0CONbits_t;
 
-extern volatile __T0CONbits_t __at 0xfd5 T0CONbits;
+extern volatile __T0CONbits_t __at (0xfd5) T0CONbits;
 
-extern __sfr __at 0xfd6 TMR0L;
-extern __sfr __at 0xfd7 TMR0H;
-extern __sfr __at 0xfd8 STATUS;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -667,32 +667,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;
@@ -717,9 +717,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;
@@ -733,9 +733,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;
@@ -749,18 +749,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -774,11 +774,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 */

diff --git a/device/include/pic16/pic18f2550.h b/device/include/pic16/pic18f2550.h
index de04ad728976b7dab392012349c41dc3e421177f..e8b5a103e45fd9df13fbb29420bea53d60ffe76e 100644 (file)
--- a/device/include/pic16/pic18f2550.h
+++ b/device/include/pic16/pic18f2550.h
@@ -17,15 +17,15 @@
 #ifndef __PIC18F2550_H__
 #define __PIC18F2550_H__ 1
 
-extern __sfr __at 0xF62 SPPDATA;
+extern __sfr __at (0xF62) SPPDATA;
 typedef union {
        struct {
                unsigned DATA           : 8;
        };
 } __SPPDATA_t;
-extern volatile __SPPDATA_t __at 0xF62 SPPDATAbits;
+extern volatile __SPPDATA_t __at (0xF62) SPPDATAbits;
 
-extern __sfr __at 0xF63 SPPCFG;
+extern __sfr __at (0xF63) SPPCFG;
 typedef union {
        struct {
                unsigned WS             : 4;
@@ -34,9 +34,9 @@ typedef union {
                unsigned CLKCFG         : 2;
        };
 } __SPPCFG_t;
-extern volatile __SPPCFG_t __at 0xF63 SPPCFGbits;
+extern volatile __SPPCFG_t __at (0xF63) SPPCFGbits;
 
-extern __sfr __at 0xF64 SPPEPS;
+extern __sfr __at (0xF64) SPPEPS;
 typedef union {
        struct {
                unsigned ADDR           : 4;
@@ -46,9 +46,9 @@ typedef union {
                unsigned RDSPP          : 1;
        };
 } __SPPEPS_t;
-extern volatile __SPPEPS_t __at 0xF64 SPPEPSbits;
+extern volatile __SPPEPS_t __at (0xF64) SPPEPSbits;
 
-extern __sfr __at 0xF65 SPPCON;
+extern __sfr __at (0xF65) SPPCON;
 typedef union {
        struct {
                unsigned SPPEN          : 1;
@@ -61,17 +61,17 @@ typedef union {
                unsigned                : 1;
        };
 } __SPPCON_t;
-extern volatile __SPPCON_t __at 0xF65 SPPCONbits;
+extern volatile __SPPCON_t __at (0xF65) SPPCONbits;
 
-extern __sfr __at 0xF66 UFRML;
+extern __sfr __at (0xF66) UFRML;
 typedef union {
        struct {
                unsigned FRM            : 8;
        };
 } __UFRML_t;
-extern volatile __UFRML_t __at 0xF66 UFRMLbits;
+extern volatile __UFRML_t __at (0xF66) UFRMLbits;
 
-extern __sfr __at 0xF67 UFRMH;
+extern __sfr __at (0xF67) UFRMH;
 typedef union {
        struct {
                unsigned FRM            : 3;
@@ -82,9 +82,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UFRMH_t;
-extern volatile __UFRMH_t __at 0xF67 UFRMHbits;
+extern volatile __UFRMH_t __at (0xF67) UFRMHbits;
 
-extern __sfr __at 0xF68 UIR;
+extern __sfr __at (0xF68) UIR;
 typedef union {
        struct {
                unsigned URSTIF         : 1;
@@ -97,9 +97,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UIR_t;
-extern volatile __UIR_t __at 0xF68 UIRbits;
+extern volatile __UIR_t __at (0xF68) UIRbits;
 
-extern __sfr __at 0xF69 UIE;
+extern __sfr __at (0xF69) UIE;
 typedef union {
        struct {
                unsigned URSTIE         : 1;
@@ -112,9 +112,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UIE_t;
-extern volatile __UIE_t __at 0xF69 UIEbits;
+extern volatile __UIE_t __at (0xF69) UIEbits;
 
-extern __sfr __at 0xF6A UEIR;
+extern __sfr __at (0xF6A) UEIR;
 typedef union {
        struct {
                unsigned PIDEF          : 1;
@@ -127,9 +127,9 @@ typedef union {
                unsigned BTSEF          : 1;
        };
 } __UEIR_t;
-extern volatile __UEIR_t __at 0xF6A UEIRbits;
+extern volatile __UEIR_t __at (0xF6A) UEIRbits;
 
-extern __sfr __at 0xF6B UEIE;
+extern __sfr __at (0xF6B) UEIE;
 typedef union {
        struct {
                unsigned PIDEE          : 1;
@@ -142,9 +142,9 @@ typedef union {
                unsigned BTSEE          : 1;
        };
 } __UEIE_t;
-extern volatile __UEIE_t __at 0xF6B UEIEbits;
+extern volatile __UEIE_t __at (0xF6B) UEIEbits;
 
-extern __sfr __at 0xF6C USTAT;
+extern __sfr __at (0xF6C) USTAT;
 typedef union {
        struct {
                unsigned                : 1;
@@ -154,9 +154,9 @@ typedef union {
                unsigned                : 1;
        };
 } __USTAT_t;
-extern volatile __USTAT_t __at 0xF6C USTATbits;
+extern volatile __USTAT_t __at (0xF6C) USTATbits;
 
-extern __sfr __at 0xF6D UCON;
+extern __sfr __at (0xF6D) UCON;
 typedef union {
        struct {
                unsigned                : 1;
@@ -169,18 +169,18 @@ typedef union {
                unsigned                : 1;
        };
 } __UCON_t;
-extern volatile __UCON_t __at 0xF6D UCONbits;
+extern volatile __UCON_t __at (0xF6D) UCONbits;
 
-extern __sfr __at 0xF6E UADDR;
+extern __sfr __at (0xF6E) UADDR;
 typedef union {
        struct {
                unsigned ADDR           : 7;
                unsigned                : 1;
        };
 } __UADDR_t;
-extern volatile __UADDR_t __at 0xF6E UADDRbits;
+extern volatile __UADDR_t __at (0xF6E) UADDRbits;
 
-extern __sfr __at 0xF6F UCFG;
+extern __sfr __at (0xF6F) UCFG;
 typedef union {
        struct {
                unsigned PPB            : 2;
@@ -192,9 +192,9 @@ typedef union {
                unsigned UTEYE          : 1;
        };
 } __UCFG_t;
-extern volatile __UCFG_t __at 0xF6F UCFGbits;
+extern volatile __UCFG_t __at (0xF6F) UCFGbits;
 
-extern __sfr __at 0xF70 UEP0;
+extern __sfr __at (0xF70) UEP0;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -207,9 +207,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP0_t;
-extern volatile __UEP0_t __at 0xF70 UEP0bits;
+extern volatile __UEP0_t __at (0xF70) UEP0bits;
 
-extern __sfr __at 0xF71 UEP1;
+extern __sfr __at (0xF71) UEP1;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -222,9 +222,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP1_t;
-extern volatile __UEP1_t __at 0xF71 UEP1bits;
+extern volatile __UEP1_t __at (0xF71) UEP1bits;
 
-extern __sfr __at 0xF72 UEP2;
+extern __sfr __at (0xF72) UEP2;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -237,9 +237,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP2_t;
-extern volatile __UEP2_t __at 0xF72 UEP2bits;
+extern volatile __UEP2_t __at (0xF72) UEP2bits;
 
-extern __sfr __at 0xF73 UEP3;
+extern __sfr __at (0xF73) UEP3;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -252,9 +252,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP3_t;
-extern volatile __UEP3_t __at 0xF73 UEP3bits;
+extern volatile __UEP3_t __at (0xF73) UEP3bits;
 
-extern __sfr __at 0xF74 UEP4;
+extern __sfr __at (0xF74) UEP4;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -267,9 +267,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP4_t;
-extern volatile __UEP4_t __at 0xF74 UEP4bits;
+extern volatile __UEP4_t __at (0xF74) UEP4bits;
 
-extern __sfr __at 0xF75 UEP5;
+extern __sfr __at (0xF75) UEP5;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -282,9 +282,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP5_t;
-extern volatile __UEP5_t __at 0xF75 UEP5bits;
+extern volatile __UEP5_t __at (0xF75) UEP5bits;
 
-extern __sfr __at 0xF76 UEP6;
+extern __sfr __at (0xF76) UEP6;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -297,9 +297,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP6_t;
-extern volatile __UEP6_t __at 0xF76 UEP6bits;
+extern volatile __UEP6_t __at (0xF76) UEP6bits;
 
-extern __sfr __at 0xF77 UEP7;
+extern __sfr __at (0xF77) UEP7;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -312,9 +312,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP7_t;
-extern volatile __UEP7_t __at 0xF77 UEP7bits;
+extern volatile __UEP7_t __at (0xF77) UEP7bits;
 
-extern __sfr __at 0xF78 UEP8;
+extern __sfr __at (0xF78) UEP8;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -327,9 +327,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP8_t;
-extern volatile __UEP8_t __at 0xF78 UEP8bits;
+extern volatile __UEP8_t __at (0xF78) UEP8bits;
 
-extern __sfr __at 0xF79 UEP9;
+extern __sfr __at (0xF79) UEP9;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -342,9 +342,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP9_t;
-extern volatile __UEP9_t __at 0xF79 UEP9bits;
+extern volatile __UEP9_t __at (0xF79) UEP9bits;
 
-extern __sfr __at 0xF7A UEP10;
+extern __sfr __at (0xF7A) UEP10;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -357,9 +357,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP10_t;
-extern volatile __UEP10_t __at 0xF7A UEP10bits;
+extern volatile __UEP10_t __at (0xF7A) UEP10bits;
 
-extern __sfr __at 0xF7B UEP11;
+extern __sfr __at (0xF7B) UEP11;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -372,9 +372,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP11_t;
-extern volatile __UEP11_t __at 0xF7B UEP11bits;
+extern volatile __UEP11_t __at (0xF7B) UEP11bits;
 
-extern __sfr __at 0xF7C UEP12;
+extern __sfr __at (0xF7C) UEP12;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -387,9 +387,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP12_t;
-extern volatile __UEP12_t __at 0xF7C UEP12bits;
+extern volatile __UEP12_t __at (0xF7C) UEP12bits;
 
-extern __sfr __at 0xF7D UEP13;
+extern __sfr __at (0xF7D) UEP13;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -402,9 +402,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP13_t;
-extern volatile __UEP13_t __at 0xF7D UEP13bits;
+extern volatile __UEP13_t __at (0xF7D) UEP13bits;
 
-extern __sfr __at 0xF7E UEP14;
+extern __sfr __at (0xF7E) UEP14;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -417,9 +417,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP14_t;
-extern volatile __UEP14_t __at 0xF7E UEP14bits;
+extern volatile __UEP14_t __at (0xF7E) UEP14bits;
 
-extern __sfr __at 0xF7F UEP15;
+extern __sfr __at (0xF7F) UEP15;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -432,9 +432,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP15_t;
-extern volatile __UEP15_t __at 0xF7F UEP15bits;
+extern volatile __UEP15_t __at (0xF7F) UEP15bits;
 
-extern __sfr __at 0xF80 PORTA;
+extern __sfr __at (0xF80) PORTA;
 typedef union {
        struct {
                unsigned RA0            : 1;
@@ -471,9 +471,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTA_t;
-extern volatile __PORTA_t __at 0xF80 PORTAbits;
+extern volatile __PORTA_t __at (0xF80) PORTAbits;
 
-extern __sfr __at 0xF81 PORTB;
+extern __sfr __at (0xF81) PORTB;
 typedef union {
        struct {
                unsigned RB0            : 1;
@@ -500,9 +500,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTB_t;
-extern volatile __PORTB_t __at 0xF81 PORTBbits;
+extern volatile __PORTB_t __at (0xF81) PORTBbits;
 
-extern __sfr __at 0xF82 PORTC;
+extern __sfr __at (0xF82) PORTC;
 typedef union {
        struct {
                unsigned RC0            : 1;
@@ -549,9 +549,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTC_t;
-extern volatile __PORTC_t __at 0xF82 PORTCbits;
+extern volatile __PORTC_t __at (0xF82) PORTCbits;
 
-extern __sfr __at 0xF84 PORTE;
+extern __sfr __at (0xF84) PORTE;
 typedef union {
        struct {
                unsigned                : 1;
@@ -578,9 +578,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTE_t;
-extern volatile __PORTE_t __at 0xF84 PORTEbits;
+extern volatile __PORTE_t __at (0xF84) PORTEbits;
 
-extern __sfr __at 0xF89 LATA;
+extern __sfr __at (0xF89) LATA;
 typedef union {
        struct {
                unsigned LATA0          : 1;
@@ -593,9 +593,9 @@ typedef union {
                unsigned                : 1;
        };
 } __LATA_t;
-extern volatile __LATA_t __at 0xF89 LATAbits;
+extern volatile __LATA_t __at (0xF89) LATAbits;
 
-extern __sfr __at 0xF8A LATB;
+extern __sfr __at (0xF8A) LATB;
 typedef union {
        struct {
                unsigned LATB0          : 1;
@@ -608,9 +608,9 @@ typedef union {
                unsigned LATB7          : 1;
        };
 } __LATB_t;
-extern volatile __LATB_t __at 0xF8A LATBbits;
+extern volatile __LATB_t __at (0xF8A) LATBbits;
 
-extern __sfr __at 0xF8B LATC;
+extern __sfr __at (0xF8B) LATC;
 typedef union {
        struct {
                unsigned LATC0          : 1;
@@ -623,9 +623,9 @@ typedef union {
                unsigned LATC7          : 1;
        };
 } __LATC_t;
-extern volatile __LATC_t __at 0xF8B LATCbits;
+extern volatile __LATC_t __at (0xF8B) LATCbits;
 
-extern __sfr __at 0xF92 TRISA;
+extern __sfr __at (0xF92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0         : 1;
@@ -638,9 +638,9 @@ typedef union {
                unsigned                : 1;
        };
 } __TRISA_t;
-extern volatile __TRISA_t __at 0xF92 TRISAbits;
+extern volatile __TRISA_t __at (0xF92) TRISAbits;
 
-extern __sfr __at 0xF93 TRISB;
+extern __sfr __at (0xF93) TRISB;
 typedef union {
        struct {
                unsigned TRISB0         : 1;
@@ -653,9 +653,9 @@ typedef union {
                unsigned TRISB7         : 1;
        };
 } __TRISB_t;
-extern volatile __TRISB_t __at 0xF93 TRISBbits;
+extern volatile __TRISB_t __at (0xF93) TRISBbits;
 
-extern __sfr __at 0xF94 TRISC;
+extern __sfr __at (0xF94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0         : 1;
@@ -668,9 +668,9 @@ typedef union {
                unsigned TRISC7         : 1;
        };
 } __TRISC_t;
-extern volatile __TRISC_t __at 0xF94 TRISCbits;
+extern volatile __TRISC_t __at (0xF94) TRISCbits;
 
-extern __sfr __at 0xF9B OSCTUNE;
+extern __sfr __at (0xF9B) OSCTUNE;
 typedef union {
        struct {
                unsigned TUN            : 5;
@@ -679,9 +679,9 @@ typedef union {
                unsigned HF256DIV       : 1;
        };
 } __OSCTUNE_t;
-extern volatile __OSCTUNE_t __at 0xF9B OSCTUNEbits;
+extern volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;
 
-extern __sfr __at 0xF9D PIE1;
+extern __sfr __at (0xF9D) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE         : 1;
@@ -694,9 +694,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PIE1_t;
-extern volatile __PIE1_t __at 0xF9D PIE1bits;
+extern volatile __PIE1_t __at (0xF9D) PIE1bits;
 
-extern __sfr __at 0xF9E PIR1;
+extern __sfr __at (0xF9E) PIR1;
 typedef union {
        struct {
                unsigned TMR1IF         : 1;
@@ -709,9 +709,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PIR1_t;
-extern volatile __PIR1_t __at 0xF9E PIR1bits;
+extern volatile __PIR1_t __at (0xF9E) PIR1bits;
 
-extern __sfr __at 0xF9F IPR1;
+extern __sfr __at (0xF9F) IPR1;
 typedef union {
        struct {
                unsigned TMR1IP         : 1;
@@ -724,9 +724,9 @@ typedef union {
                unsigned                : 1;
        };
 } __IPR1_t;
-extern volatile __IPR1_t __at 0xF9F IPR1bits;
+extern volatile __IPR1_t __at (0xF9F) IPR1bits;
 
-extern __sfr __at 0xFA0 PIE2;
+extern __sfr __at (0xFA0) PIE2;
 typedef union {
        struct {
                unsigned CCP2IE         : 1;
@@ -739,9 +739,9 @@ typedef union {
                unsigned OSCFIE         : 1;
        };
 } __PIE2_t;
-extern volatile __PIE2_t __at 0xFA0 PIE2bits;
+extern volatile __PIE2_t __at (0xFA0) PIE2bits;
 
-extern __sfr __at 0xFA1 PIR2;
+extern __sfr __at (0xFA1) PIR2;
 typedef union {
        struct {
                unsigned CCP2IF         : 1;
@@ -754,9 +754,9 @@ typedef union {
                unsigned OSCFIF         : 1;
        };
 } __PIR2_t;
-extern volatile __PIR2_t __at 0xFA1 PIR2bits;
+extern volatile __PIR2_t __at (0xFA1) PIR2bits;
 
-extern __sfr __at 0xFA2 IPR2;
+extern __sfr __at (0xFA2) IPR2;
 typedef union {
        struct {
                unsigned CCP2IP         : 1;
@@ -769,9 +769,9 @@ typedef union {
                unsigned OSCFIP         : 1;
        };
 } __IPR2_t;
-extern volatile __IPR2_t __at 0xFA2 IPR2bits;
+extern volatile __IPR2_t __at (0xFA2) IPR2bits;
 
-extern __sfr __at 0xFA6 EECON1;
+extern __sfr __at (0xFA6) EECON1;
 typedef union {
        struct {
                unsigned RD             : 1;
@@ -784,15 +784,15 @@ typedef union {
                unsigned EEPGD          : 1;
        };
 } __EECON1_t;
-extern volatile __EECON1_t __at 0xFA6 EECON1bits;
+extern volatile __EECON1_t __at (0xFA6) EECON1bits;
 
-extern __sfr __at 0xFA7 EECON2;
+extern __sfr __at (0xFA7) EECON2;
 
-extern __sfr __at 0xFA8 EEDATA;
+extern __sfr __at (0xFA8) EEDATA;
 
-extern __sfr __at 0xFA9 EEADR;
+extern __sfr __at (0xFA9) EEADR;
 
-extern __sfr __at 0xFAB RCSTA;
+extern __sfr __at (0xFAB) RCSTA;
 typedef union {
        struct {
                unsigned RX9D           : 1;
@@ -805,9 +805,9 @@ typedef union {
                unsigned SPEN           : 1;
        };
 } __RCSTA_t;
-extern volatile __RCSTA_t __at 0xFAB RCSTAbits;
+extern volatile __RCSTA_t __at (0xFAB) RCSTAbits;
 
-extern __sfr __at 0xFAC TXSTA;
+extern __sfr __at (0xFAC) TXSTA;
 typedef union {
        struct {
                unsigned TX9D           : 1;
@@ -820,17 +820,17 @@ typedef union {
                unsigned CSRC           : 1;
        };
 } __TXSTA_t;
-extern volatile __TXSTA_t __at 0xFAC TXSTAbits;
+extern volatile __TXSTA_t __at (0xFAC) TXSTAbits;
 
-extern __sfr __at 0xFAD TXREG;
+extern __sfr __at (0xFAD) TXREG;
 
-extern __sfr __at 0xFAE RCREG;
+extern __sfr __at (0xFAE) RCREG;
 
-extern __sfr __at 0xFAF SPBRG;
+extern __sfr __at (0xFAF) SPBRG;
 
-extern __sfr __at 0xFB0 SPBRGH;
+extern __sfr __at (0xFB0) SPBRGH;
 
-extern __sfr __at 0xFB1 T3CON;
+extern __sfr __at (0xFB1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON         : 1;
@@ -842,13 +842,13 @@ typedef union {
                unsigned RD16           : 1;
        };
 } __T3CON_t;
-extern volatile __T3CON_t __at 0xFB1 T3CONbits;
+extern volatile __T3CON_t __at (0xFB1) T3CONbits;
 
-extern __sfr __at 0xFB2 TMR3L;
+extern __sfr __at (0xFB2) TMR3L;
 
-extern __sfr __at 0xFB3 TMR3H;
+extern __sfr __at (0xFB3) TMR3H;
 
-extern __sfr __at 0xFB4 CMCON;
+extern __sfr __at (0xFB4) CMCON;
 typedef union {
        struct {
                unsigned CM             : 3;
@@ -859,9 +859,9 @@ typedef union {
                unsigned C2OUT          : 1;
        };
 } __CMCON_t;
-extern volatile __CMCON_t __at 0xFB4 CMCONbits;
+extern volatile __CMCON_t __at (0xFB4) CMCONbits;
 
-extern __sfr __at 0xFB5 CVRCON;
+extern __sfr __at (0xFB5) CVRCON;
 typedef union {
        struct {
                unsigned CVR            : 4;
@@ -871,9 +871,9 @@ typedef union {
                unsigned CVREN          : 1;
        };
 } __CVRCON_t;
-extern volatile __CVRCON_t __at 0xFB5 CVRCONbits;
+extern volatile __CVRCON_t __at (0xFB5) CVRCONbits;
 
-extern __sfr __at 0xFB6 ECCP1AS;
+extern __sfr __at (0xFB6) ECCP1AS;
 typedef union {
        struct {
                unsigned                : 1;
@@ -883,9 +883,9 @@ typedef union {
                unsigned ECCPASE        : 1;
        };
 } __ECCP1AS_t;
-extern volatile __ECCP1AS_t __at 0xFB6 ECCP1ASbits;
+extern volatile __ECCP1AS_t __at (0xFB6) ECCP1ASbits;
 
-extern __sfr __at 0xFB7 ECCP1DEL;
+extern __sfr __at (0xFB7) ECCP1DEL;
 typedef union {
        struct {
                unsigned                : 1;
@@ -898,9 +898,9 @@ typedef union {
                unsigned PRSEN          : 1;
        };
 } __ECCP1DEL_t;
-extern volatile __ECCP1DEL_t __at 0xFB7 ECCP1DELbits;
+extern volatile __ECCP1DEL_t __at (0xFB7) ECCP1DELbits;
 
-extern __sfr __at 0xFB8 BAUDCON;
+extern __sfr __at (0xFB8) BAUDCON;
 typedef union {
        struct {
                unsigned ABDEN          : 1;
@@ -913,9 +913,9 @@ typedef union {
                unsigned ABDOVF         : 1;
        };
 } __BAUDCON_t;
-extern volatile __BAUDCON_t __at 0xFB8 BAUDCONbits;
+extern volatile __BAUDCON_t __at (0xFB8) BAUDCONbits;
 
-extern __sfr __at 0xFBA CCP2CON;
+extern __sfr __at (0xFBA) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M          : 4;
@@ -924,13 +924,13 @@ typedef union {
                unsigned                : 1;
        };
 } __CCP2CON_t;
-extern volatile __CCP2CON_t __at 0xFBA CCP2CONbits;
+extern volatile __CCP2CON_t __at (0xFBA) CCP2CONbits;
 
-extern __sfr __at 0xFBB CCPR2L;
+extern __sfr __at (0xFBB) CCPR2L;
 
-extern __sfr __at 0xFBC CCPR2H;
+extern __sfr __at (0xFBC) CCPR2H;
 
-extern __sfr __at 0xFBD CCP1CON;
+extern __sfr __at (0xFBD) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M          : 4;
@@ -939,13 +939,13 @@ typedef union {
                unsigned                : 1;
        };
 } __CCP1CON_t;
-extern volatile __CCP1CON_t __at 0xFBD CCP1CONbits;
+extern volatile __CCP1CON_t __at (0xFBD) CCP1CONbits;
 
-extern __sfr __at 0xFBE CCPR1L;
+extern __sfr __at (0xFBE) CCPR1L;
 
-extern __sfr __at 0xFBF CCPR1H;
+extern __sfr __at (0xFBF) CCPR1H;
 
-extern __sfr __at 0xFC0 ADCON2;
+extern __sfr __at (0xFC0) ADCON2;
 typedef union {
        struct {
                unsigned ADCS           : 3;
@@ -954,9 +954,9 @@ typedef union {
                unsigned ADFM           : 1;
        };
 } __ADCON2_t;
-extern volatile __ADCON2_t __at 0xFC0 ADCON2bits;
+extern volatile __ADCON2_t __at (0xFC0) ADCON2bits;
 
-extern __sfr __at 0xFC1 ADCON1;
+extern __sfr __at (0xFC1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG           : 4;
@@ -965,9 +965,9 @@ typedef union {
                unsigned                : 1;
        };
 } __ADCON1_t;
-extern volatile __ADCON1_t __at 0xFC1 ADCON1bits;
+extern volatile __ADCON1_t __at (0xFC1) ADCON1bits;
 
-extern __sfr __at 0xFC2 ADCON0;
+extern __sfr __at (0xFC2) ADCON0;
 typedef union {
        struct {
                unsigned ADON           : 1;
@@ -977,13 +977,13 @@ typedef union {
                unsigned                : 1;
        };
 } __ADCON0_t;
-extern volatile __ADCON0_t __at 0xFC2 ADCON0bits;
+extern volatile __ADCON0_t __at (0xFC2) ADCON0bits;
 
-extern __sfr __at 0xFC3 ADRESL;
+extern __sfr __at (0xFC3) ADRESL;
 
-extern __sfr __at 0xFC4 ADRESH;
+extern __sfr __at (0xFC4) ADRESH;
 
-extern __sfr __at 0xFC5 SSPCON2;
+extern __sfr __at (0xFC5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN            : 1;
@@ -996,9 +996,9 @@ typedef union {
                unsigned GCEN           : 1;
        };
 } __SSPCON2_t;
-extern volatile __SSPCON2_t __at 0xFC5 SSPCON2bits;
+extern volatile __SSPCON2_t __at (0xFC5) SSPCON2bits;
 
-extern __sfr __at 0xFC6 SSPCON1;
+extern __sfr __at (0xFC6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM           : 4;
@@ -1008,9 +1008,9 @@ typedef union {
                unsigned WCOL           : 1;
        };
 } __SSPCON1_t;
-extern volatile __SSPCON1_t __at 0xFC6 SSPCON1bits;
+extern volatile __SSPCON1_t __at (0xFC6) SSPCON1bits;
 
-extern __sfr __at 0xFC7 SSPSTAT;
+extern __sfr __at (0xFC7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF             : 1;
@@ -1023,13 +1023,13 @@ typedef union {
                unsigned SMP            : 1;
        };
 } __SSPSTAT_t;
-extern volatile __SSPSTAT_t __at 0xFC7 SSPSTATbits;
+extern volatile __SSPSTAT_t __at (0xFC7) SSPSTATbits;
 
-extern __sfr __at 0xFC8 SSPADD;
+extern __sfr __at (0xFC8) SSPADD;
 
-extern __sfr __at 0xFC9 SSPBUF;
+extern __sfr __at (0xFC9) SSPBUF;
 
-extern __sfr __at 0xFCA T2CON;
+extern __sfr __at (0xFCA) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS         : 2;
@@ -1038,13 +1038,13 @@ typedef union {
                unsigned                : 1;
        };
 } __T2CON_t;
-extern volatile __T2CON_t __at 0xFCA T2CONbits;
+extern volatile __T2CON_t __at (0xFCA) T2CONbits;
 
-extern __sfr __at 0xFCB PR2;
+extern __sfr __at (0xFCB) PR2;
 
-extern __sfr __at 0xFCC TMR2;
+extern __sfr __at (0xFCC) TMR2;
 
-extern __sfr __at 0xFCD T1CON;
+extern __sfr __at (0xFCD) T1CON;
 typedef union {
        struct {
                unsigned TMR1ON         : 1;
@@ -1056,13 +1056,13 @@ typedef union {
                unsigned RD16           : 1;
        };
 } __T1CON_t;
-extern volatile __T1CON_t __at 0xFCD T1CONbits;
+extern volatile __T1CON_t __at (0xFCD) T1CONbits;
 
-extern __sfr __at 0xFCE TMR1L;
+extern __sfr __at (0xFCE) TMR1L;
 
-extern __sfr __at 0xFCF TMR1H;
+extern __sfr __at (0xFCF) TMR1H;
 
-extern __sfr __at 0xFD0 RCON;
+extern __sfr __at (0xFD0) RCON;
 typedef union {
        struct {
                unsigned nBOR           : 1;
@@ -1075,9 +1075,9 @@ typedef union {
                unsigned IPEN           : 1;
        };
 } __RCON_t;
-extern volatile __RCON_t __at 0xFD0 RCONbits;
+extern volatile __RCON_t __at (0xFD0) RCONbits;
 
-extern __sfr __at 0xFD1 WDTCON;
+extern __sfr __at (0xFD1) WDTCON;
 typedef union {
        struct {
                unsigned SWDTEN         : 1;
@@ -1090,9 +1090,9 @@ typedef union {
                unsigned                : 1;
        };
 } __WDTCON_t;
-extern volatile __WDTCON_t __at 0xFD1 WDTCONbits;
+extern volatile __WDTCON_t __at (0xFD1) WDTCONbits;
 
-extern __sfr __at 0xFD2 HLVDCON;
+extern __sfr __at (0xFD2) HLVDCON;
 typedef union {
        struct {
                unsigned HLVDL          : 4;
@@ -1102,9 +1102,9 @@ typedef union {
                unsigned VDIRMAG        : 1;
        };
 } __HLVDCON_t;
-extern volatile __HLVDCON_t __at 0xFD2 HLVDCONbits;
+extern volatile __HLVDCON_t __at (0xFD2) HLVDCONbits;
 
-extern __sfr __at 0xFD3 OSCCON;
+extern __sfr __at (0xFD3) OSCCON;
 typedef union {
        struct {
                unsigned SCS            : 2;
@@ -1114,9 +1114,9 @@ typedef union {
                unsigned IDLEN          : 1;
        };
 } __OSCCON_t;
-extern volatile __OSCCON_t __at 0xFD3 OSCCONbits;
+extern volatile __OSCCON_t __at (0xFD3) OSCCONbits;
 
-extern __sfr __at 0xFD5 T0CON;
+extern __sfr __at (0xFD5) T0CON;
 typedef union {
        struct {
                unsigned T0PS           : 3;
@@ -1127,13 +1127,13 @@ typedef union {
                unsigned TMR0ON         : 1;
        };
 } __T0CON_t;
-extern volatile __T0CON_t __at 0xFD5 T0CONbits;
+extern volatile __T0CON_t __at (0xFD5) T0CONbits;
 
-extern __sfr __at 0xFD6 TMR0L;
+extern __sfr __at (0xFD6) TMR0L;
 
-extern __sfr __at 0xFD7 TMR0H;
+extern __sfr __at (0xFD7) TMR0H;
 
-extern __sfr __at 0xFD8 STATUS;
+extern __sfr __at (0xFD8) STATUS;
 typedef union {
        struct {
                unsigned C              : 1;
@@ -1146,11 +1146,11 @@ typedef union {
                unsigned                : 1;
        };
 } __STATUS_t;
-extern volatile __STATUS_t __at 0xFD8 STATUSbits;
+extern volatile __STATUS_t __at (0xFD8) STATUSbits;
 
-extern __sfr __at 0xFD9 FSR2L;
+extern __sfr __at (0xFD9) FSR2L;
 
-extern __sfr __at 0xFDA FSR2H;
+extern __sfr __at (0xFDA) FSR2H;
 typedef union {
        struct {
                unsigned FSR2H          : 4;
@@ -1160,19 +1160,19 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR2H_t;
-extern volatile __FSR2H_t __at 0xFDA FSR2Hbits;
+extern volatile __FSR2H_t __at (0xFDA) FSR2Hbits;
 
-extern __sfr __at 0xFDB PLUSW2;
+extern __sfr __at (0xFDB) PLUSW2;
 
-extern __sfr __at 0xFDC PREINC2;
+extern __sfr __at (0xFDC) PREINC2;
 
-extern __sfr __at 0xFDD POSTDEC2;
+extern __sfr __at (0xFDD) POSTDEC2;
 
-extern __sfr __at 0xFDE POSTINC2;
+extern __sfr __at (0xFDE) POSTINC2;
 
-extern __sfr __at 0xFDF INDF2;
+extern __sfr __at (0xFDF) INDF2;
 
-extern __sfr __at 0xFE0 BSR;
+extern __sfr __at (0xFE0) BSR;
 typedef union {
        struct {
                unsigned BSR            : 4;
@@ -1182,11 +1182,11 @@ typedef union {
                unsigned                : 1;
        };
 } __BSR_t;
-extern volatile __BSR_t __at 0xFE0 BSRbits;
+extern volatile __BSR_t __at (0xFE0) BSRbits;
 
-extern __sfr __at 0xFE1 FSR1L;
+extern __sfr __at (0xFE1) FSR1L;
 
-extern __sfr __at 0xFE2 FSR1H;
+extern __sfr __at (0xFE2) FSR1H;
 typedef union {
        struct {
                unsigned FSR1H          : 4;
@@ -1196,23 +1196,23 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR1H_t;
-extern volatile __FSR1H_t __at 0xFE2 FSR1Hbits;
+extern volatile __FSR1H_t __at (0xFE2) FSR1Hbits;
 
-extern __sfr __at 0xFE3 PLUSW1;
+extern __sfr __at (0xFE3) PLUSW1;
 
-extern __sfr __at 0xFE4 PREINC1;
+extern __sfr __at (0xFE4) PREINC1;
 
-extern __sfr __at 0xFE5 POSTDEC1;
+extern __sfr __at (0xFE5) POSTDEC1;
 
-extern __sfr __at 0xFE6 POSTINC1;
+extern __sfr __at (0xFE6) POSTINC1;
 
-extern __sfr __at 0xFE7 INDF1;
+extern __sfr __at (0xFE7) INDF1;
 
-extern __sfr __at 0xFE8 WREG;
+extern __sfr __at (0xFE8) WREG;
 
-extern __sfr __at 0xFE9 FSR0L;
+extern __sfr __at (0xFE9) FSR0L;
 
-extern __sfr __at 0xFEA FSR0H;
+extern __sfr __at (0xFEA) FSR0H;
 typedef union {
        struct {
                unsigned FSR0H          : 4;
@@ -1222,19 +1222,19 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR0H_t;
-extern volatile __FSR0H_t __at 0xFEA FSR0Hbits;
+extern volatile __FSR0H_t __at (0xFEA) FSR0Hbits;
 
-extern __sfr __at 0xFEB PLUSW0;
+extern __sfr __at (0xFEB) PLUSW0;
 
-extern __sfr __at 0xFEC PREINC0;
+extern __sfr __at (0xFEC) PREINC0;
 
-extern __sfr __at 0xFED POSTDEC0;
+extern __sfr __at (0xFED) POSTDEC0;
 
-extern __sfr __at 0xFEE POSTINC0;
+extern __sfr __at (0xFEE) POSTINC0;
 
-extern __sfr __at 0xFEF INDF0;
+extern __sfr __at (0xFEF) INDF0;
 
-extern __sfr __at 0xFF0 INTCON3;
+extern __sfr __at (0xFF0) INTCON3;
 typedef union {
        struct {
                unsigned INT1IF         : 1;
@@ -1247,9 +1247,9 @@ typedef union {
                unsigned INT2IP         : 1;
        };
 } __INTCON3_t;
-extern volatile __INTCON3_t __at 0xFF0 INTCON3bits;
+extern volatile __INTCON3_t __at (0xFF0) INTCON3bits;
 
-extern __sfr __at 0xFF1 INTCON2;
+extern __sfr __at (0xFF1) INTCON2;
 typedef union {
        struct {
                unsigned RBIP           : 1;
@@ -1262,9 +1262,9 @@ typedef union {
                unsigned nRBPU          : 1;
        };
 } __INTCON2_t;
-extern volatile __INTCON2_t __at 0xFF1 INTCON2bits;
+extern volatile __INTCON2_t __at (0xFF1) INTCON2bits;
 
-extern __sfr __at 0xFF2 INTCON;
+extern __sfr __at (0xFF2) INTCON;
 typedef union {
        struct {
                unsigned RBIF           : 1;
@@ -1297,19 +1297,19 @@ typedef union {
                unsigned GIEH           : 1;
        };
 } __INTCON_t;
-extern volatile __INTCON_t __at 0xFF2 INTCONbits;
+extern volatile __INTCON_t __at (0xFF2) INTCONbits;
 
-extern __sfr __at 0xFF3 PRODL;
+extern __sfr __at (0xFF3) PRODL;
 
-extern __sfr __at 0xFF4 PRODH;
+extern __sfr __at (0xFF4) PRODH;
 
-extern __sfr __at 0xFF5 TABLAT;
+extern __sfr __at (0xFF5) TABLAT;
 
-extern __sfr __at 0xFF6 TBLPTRL;
+extern __sfr __at (0xFF6) TBLPTRL;
 
-extern __sfr __at 0xFF7 TBLPTRH;
+extern __sfr __at (0xFF7) TBLPTRH;
 
-extern __sfr __at 0xFF8 TBLPTRU;
+extern __sfr __at (0xFF8) TBLPTRU;
 typedef union {
        struct {
                unsigned TBLPTRU        : 5;
@@ -1318,19 +1318,19 @@ typedef union {
                unsigned                : 1;
        };
 } __TBLPTRU_t;
-extern volatile __TBLPTRU_t __at 0xFF8 TBLPTRUbits;
+extern volatile __TBLPTRU_t __at (0xFF8) TBLPTRUbits;
 
-extern __sfr __at 0xFF9 PCL;
+extern __sfr __at (0xFF9) PCL;
 
-extern __sfr __at 0xFFA PCLATH;
+extern __sfr __at (0xFFA) PCLATH;
 typedef union {
        struct {
                unsigned PCH            : 8;
        };
 } __PCLATH_t;
-extern volatile __PCLATH_t __at 0xFFA PCLATHbits;
+extern volatile __PCLATH_t __at (0xFFA) PCLATHbits;
 
-extern __sfr __at 0xFFB PCLATU;
+extern __sfr __at (0xFFB) PCLATU;
 typedef union {
        struct {
                unsigned PCU            : 5;
@@ -1339,9 +1339,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PCLATU_t;
-extern volatile __PCLATU_t __at 0xFFB PCLATUbits;
+extern volatile __PCLATU_t __at (0xFFB) PCLATUbits;
 
-extern __sfr __at 0xFFC STKPTR;
+extern __sfr __at (0xFFC) STKPTR;
 typedef union {
        struct {
                unsigned STKPTR         : 5;
@@ -1350,13 +1350,13 @@ typedef union {
                unsigned STKFUL         : 1;
        };
 } __STKPTR_t;
-extern volatile __STKPTR_t __at 0xFFC STKPTRbits;
+extern volatile __STKPTR_t __at (0xFFC) STKPTRbits;
 
-extern __sfr __at 0xFFD TOSL;
+extern __sfr __at (0xFFD) TOSL;
 
-extern __sfr __at 0xFFE TOSH;
+extern __sfr __at (0xFFE) TOSH;
 
-extern __sfr __at 0xFFF TOSU;
+extern __sfr __at (0xFFF) TOSU;
 typedef union {
        struct {
                unsigned TOSU           : 5;
@@ -1365,7 +1365,7 @@ typedef union {
                unsigned                : 1;
        };
 } __TOSU_t;
-extern volatile __TOSU_t __at 0xFFF TOSUbits;
+extern volatile __TOSU_t __at (0xFFF) TOSUbits;
 
 /* Configuration register locations */
 #define        CONFIG1L        0x300000

diff --git a/device/include/pic16/pic18f258.h b/device/include/pic16/pic18f258.h
index 1f2cd933b03036c06ee2547958c0e1d9ba91fa18..4f6cbfd3aa465d742e7a69a7266aba77fd8a8623 100644 (file)
--- a/device/include/pic16/pic18f258.h
+++ b/device/include/pic16/pic18f258.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F258_H__
 #define __PIC18F258_H__
 
-extern __sfr __at 0xf00 RXF0SIDH;
+extern __sfr __at (0xf00) RXF0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RXF0SIDHbits_t;
 
-extern volatile __RXF0SIDHbits_t __at 0xf00 RXF0SIDHbits;
+extern volatile __RXF0SIDHbits_t __at (0xf00) RXF0SIDHbits;
 
-extern __sfr __at 0xf01 RXF0SIDL;
+extern __sfr __at (0xf01) RXF0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -45,9 +45,9 @@ typedef union {
        };
 } __RXF0SIDLbits_t;
 
-extern volatile __RXF0SIDLbits_t __at 0xf01 RXF0SIDLbits;
+extern volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-extern __sfr __at 0xf02 RXF0EIDH;
+extern __sfr __at (0xf02) RXF0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -61,9 +61,9 @@ typedef union {
        };
 } __RXF0EIDHbits_t;
 
-extern volatile __RXF0EIDHbits_t __at 0xf02 RXF0EIDHbits;
+extern volatile __RXF0EIDHbits_t __at (0xf02) RXF0EIDHbits;
 
-extern __sfr __at 0xf03 RXF0EIDL;
+extern __sfr __at (0xf03) RXF0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -77,9 +77,9 @@ typedef union {
        };
 } __RXF0EIDLbits_t;
 
-extern volatile __RXF0EIDLbits_t __at 0xf03 RXF0EIDLbits;
+extern volatile __RXF0EIDLbits_t __at (0xf03) RXF0EIDLbits;
 
-extern __sfr __at 0xf04 RXF1SIDH;
+extern __sfr __at (0xf04) RXF1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -93,9 +93,9 @@ typedef union {
        };
 } __RXF1SIDHbits_t;
 
-extern volatile __RXF1SIDHbits_t __at 0xf04 RXF1SIDHbits;
+extern volatile __RXF1SIDHbits_t __at (0xf04) RXF1SIDHbits;
 
-extern __sfr __at 0xf05 RXF1SIDL;
+extern __sfr __at (0xf05) RXF1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -109,9 +109,9 @@ typedef union {
        };
 } __RXF1SIDLbits_t;
 
-extern volatile __RXF1SIDLbits_t __at 0xf05 RXF1SIDLbits;
+extern volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-extern __sfr __at 0xf06 RXF1EIDH;
+extern __sfr __at (0xf06) RXF1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -125,9 +125,9 @@ typedef union {
        };
 } __RXF1EIDHbits_t;
 
-extern volatile __RXF1EIDHbits_t __at 0xf06 RXF1EIDHbits;
+extern volatile __RXF1EIDHbits_t __at (0xf06) RXF1EIDHbits;
 
-extern __sfr __at 0xf07 RXF1EIDL;
+extern __sfr __at (0xf07) RXF1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -141,9 +141,9 @@ typedef union {
        };
 } __RXF1EIDLbits_t;
 
-extern volatile __RXF1EIDLbits_t __at 0xf07 RXF1EIDLbits;
+extern volatile __RXF1EIDLbits_t __at (0xf07) RXF1EIDLbits;
 
-extern __sfr __at 0xf08 RXF2SIDH;
+extern __sfr __at (0xf08) RXF2SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -157,9 +157,9 @@ typedef union {
        };
 } __RXF2SIDHbits_t;
 
-extern volatile __RXF2SIDHbits_t __at 0xf08 RXF2SIDHbits;
+extern volatile __RXF2SIDHbits_t __at (0xf08) RXF2SIDHbits;
 
-extern __sfr __at 0xf09 RXF2SIDL;
+extern __sfr __at (0xf09) RXF2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -173,9 +173,9 @@ typedef union {
        };
 } __RXF2SIDLbits_t;
 
-extern volatile __RXF2SIDLbits_t __at 0xf09 RXF2SIDLbits;
+extern volatile __RXF2SIDLbits_t __at (0xf09) RXF2SIDLbits;
 
-extern __sfr __at 0xf0a RXF2EIDH;
+extern __sfr __at (0xf0a) RXF2EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -189,9 +189,9 @@ typedef union {
        };
 } __RXF2EIDHbits_t;
 
-extern volatile __RXF2EIDHbits_t __at 0xf0a RXF2EIDHbits;
+extern volatile __RXF2EIDHbits_t __at (0xf0a) RXF2EIDHbits;
 
-extern __sfr __at 0xf0b RXF2EIDL;
+extern __sfr __at (0xf0b) RXF2EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -205,9 +205,9 @@ typedef union {
        };
 } __RXF2EIDLbits_t;
 
-extern volatile __RXF2EIDLbits_t __at 0xf0b RXF2EIDLbits;
+extern volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-extern __sfr __at 0xf0c RXF3SIDH;
+extern __sfr __at (0xf0c) RXF3SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -221,9 +221,9 @@ typedef union {
        };
 } __RXF3SIDHbits_t;
 
-extern volatile __RXF3SIDHbits_t __at 0xf0c RXF3SIDHbits;
+extern volatile __RXF3SIDHbits_t __at (0xf0c) RXF3SIDHbits;
 
-extern __sfr __at 0xf0d RXF3SIDL;
+extern __sfr __at (0xf0d) RXF3SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -237,9 +237,9 @@ typedef union {
        };
 } __RXF3SIDLbits_t;
 
-extern volatile __RXF3SIDLbits_t __at 0xf0d RXF3SIDLbits;
+extern volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-extern __sfr __at 0xf0e RXF3EIDH;
+extern __sfr __at (0xf0e) RXF3EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -253,9 +253,9 @@ typedef union {
        };
 } __RXF3EIDHbits_t;
 
-extern volatile __RXF3EIDHbits_t __at 0xf0e RXF3EIDHbits;
+extern volatile __RXF3EIDHbits_t __at (0xf0e) RXF3EIDHbits;
 
-extern __sfr __at 0xf0f RXF3EIDL;
+extern __sfr __at (0xf0f) RXF3EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -269,9 +269,9 @@ typedef union {
        };
 } __RXF3EIDLbits_t;
 
-extern volatile __RXF3EIDLbits_t __at 0xf0f RXF3EIDLbits;
+extern volatile __RXF3EIDLbits_t __at (0xf0f) RXF3EIDLbits;
 
-extern __sfr __at 0xf10 RXF4SIDH;
+extern __sfr __at (0xf10) RXF4SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -285,9 +285,9 @@ typedef union {
        };
 } __RXF4SIDHbits_t;
 
-extern volatile __RXF4SIDHbits_t __at 0xf10 RXF4SIDHbits;
+extern volatile __RXF4SIDHbits_t __at (0xf10) RXF4SIDHbits;
 
-extern __sfr __at 0xf11 RXF4SIDL;
+extern __sfr __at (0xf11) RXF4SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -301,9 +301,9 @@ typedef union {
        };
 } __RXF4SIDLbits_t;
 
-extern volatile __RXF4SIDLbits_t __at 0xf11 RXF4SIDLbits;
+extern volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-extern __sfr __at 0xf12 RXF4EIDH;
+extern __sfr __at (0xf12) RXF4EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -317,9 +317,9 @@ typedef union {
        };
 } __RXF4EIDHbits_t;
 
-extern volatile __RXF4EIDHbits_t __at 0xf12 RXF4EIDHbits;
+extern volatile __RXF4EIDHbits_t __at (0xf12) RXF4EIDHbits;
 
-extern __sfr __at 0xf13 RXF4EIDL;
+extern __sfr __at (0xf13) RXF4EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -333,9 +333,9 @@ typedef union {
        };
 } __RXF4EIDLbits_t;
 
-extern volatile __RXF4EIDLbits_t __at 0xf13 RXF4EIDLbits;
+extern volatile __RXF4EIDLbits_t __at (0xf13) RXF4EIDLbits;
 
-extern __sfr __at 0xf14 RXF5SIDH;
+extern __sfr __at (0xf14) RXF5SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -349,9 +349,9 @@ typedef union {
        };
 } __RXF5SIDHbits_t;
 
-extern volatile __RXF5SIDHbits_t __at 0xf14 RXF5SIDHbits;
+extern volatile __RXF5SIDHbits_t __at (0xf14) RXF5SIDHbits;
 
-extern __sfr __at 0xf15 RXF5SIDL;
+extern __sfr __at (0xf15) RXF5SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -365,9 +365,9 @@ typedef union {
        };
 } __RXF5SIDLbits_t;
 
-extern volatile __RXF5SIDLbits_t __at 0xf15 RXF5SIDLbits;
+extern volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-extern __sfr __at 0xf16 RXF5EIDH;
+extern __sfr __at (0xf16) RXF5EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -381,9 +381,9 @@ typedef union {
        };
 } __RXF5EIDHbits_t;
 
-extern volatile __RXF5EIDHbits_t __at 0xf16 RXF5EIDHbits;
+extern volatile __RXF5EIDHbits_t __at (0xf16) RXF5EIDHbits;
 
-extern __sfr __at 0xf17 RXF5EIDL;
+extern __sfr __at (0xf17) RXF5EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -397,9 +397,9 @@ typedef union {
        };
 } __RXF5EIDLbits_t;
 
-extern volatile __RXF5EIDLbits_t __at 0xf17 RXF5EIDLbits;
+extern volatile __RXF5EIDLbits_t __at (0xf17) RXF5EIDLbits;
 
-extern __sfr __at 0xf18 RXM0SIDH;
+extern __sfr __at (0xf18) RXM0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -413,9 +413,9 @@ typedef union {
        };
 } __RXM0SIDHbits_t;
 
-extern volatile __RXM0SIDHbits_t __at 0xf18 RXM0SIDHbits;
+extern volatile __RXM0SIDHbits_t __at (0xf18) RXM0SIDHbits;
 
-extern __sfr __at 0xf19 RXM0SIDL;
+extern __sfr __at (0xf19) RXM0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -429,9 +429,9 @@ typedef union {
        };
 } __RXM0SIDLbits_t;
 
-extern volatile __RXM0SIDLbits_t __at 0xf19 RXM0SIDLbits;
+extern volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-extern __sfr __at 0xf1a RXM0EIDH;
+extern __sfr __at (0xf1a) RXM0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -445,9 +445,9 @@ typedef union {
        };
 } __RXM0EIDHbits_t;
 
-extern volatile __RXM0EIDHbits_t __at 0xf1a RXM0EIDHbits;
+extern volatile __RXM0EIDHbits_t __at (0xf1a) RXM0EIDHbits;
 
-extern __sfr __at 0xf1b RXM0EIDL;
+extern __sfr __at (0xf1b) RXM0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -461,9 +461,9 @@ typedef union {
        };
 } __RXM0EIDLbits_t;
 
-extern volatile __RXM0EIDLbits_t __at 0xf1b RXM0EIDLbits;
+extern volatile __RXM0EIDLbits_t __at (0xf1b) RXM0EIDLbits;
 
-extern __sfr __at 0xf1c RXM1SIDH;
+extern __sfr __at (0xf1c) RXM1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -477,9 +477,9 @@ typedef union {
        };
 } __RXM1SIDHbits_t;
 
-extern volatile __RXM1SIDHbits_t __at 0xf1c RXM1SIDHbits;
+extern volatile __RXM1SIDHbits_t __at (0xf1c) RXM1SIDHbits;
 
-extern __sfr __at 0xf1d RXM1SIDL;
+extern __sfr __at (0xf1d) RXM1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -493,9 +493,9 @@ typedef union {
        };
 } __RXM1SIDLbits_t;
 
-extern volatile __RXM1SIDLbits_t __at 0xf1d RXM1SIDLbits;
+extern volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-extern __sfr __at 0xf1e RXM1EIDH;
+extern __sfr __at (0xf1e) RXM1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -509,9 +509,9 @@ typedef union {
        };
 } __RXM1EIDHbits_t;
 
-extern volatile __RXM1EIDHbits_t __at 0xf1e RXM1EIDHbits;
+extern volatile __RXM1EIDHbits_t __at (0xf1e) RXM1EIDHbits;
 
-extern __sfr __at 0xf1f RXM1EIDL;
+extern __sfr __at (0xf1f) RXM1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -525,9 +525,9 @@ typedef union {
        };
 } __RXM1EIDLbits_t;
 
-extern volatile __RXM1EIDLbits_t __at 0xf1f RXM1EIDLbits;
+extern volatile __RXM1EIDLbits_t __at (0xf1f) RXM1EIDLbits;
 
-extern __sfr __at 0xf20 TXB2CON;
+extern __sfr __at (0xf20) TXB2CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -541,9 +541,9 @@ typedef union {
        };
 } __TXB2CONbits_t;
 
-extern volatile __TXB2CONbits_t __at 0xf20 TXB2CONbits;
+extern volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-extern __sfr __at 0xf21 TXB2SIDH;
+extern __sfr __at (0xf21) TXB2SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -557,9 +557,9 @@ typedef union {
        };
 } __TXB2SIDHbits_t;
 
-extern volatile __TXB2SIDHbits_t __at 0xf21 TXB2SIDHbits;
+extern volatile __TXB2SIDHbits_t __at (0xf21) TXB2SIDHbits;
 
-extern __sfr __at 0xf22 TXB2SIDL;
+extern __sfr __at (0xf22) TXB2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -573,9 +573,9 @@ typedef union {
        };
 } __TXB2SIDLbits_t;
 
-extern volatile __TXB2SIDLbits_t __at 0xf22 TXB2SIDLbits;
+extern volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-extern __sfr __at 0xf23 TXB2EIDH;
+extern __sfr __at (0xf23) TXB2EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -589,9 +589,9 @@ typedef union {
        };
 } __TXB2EIDHbits_t;
 
-extern volatile __TXB2EIDHbits_t __at 0xf23 TXB2EIDHbits;
+extern volatile __TXB2EIDHbits_t __at (0xf23) TXB2EIDHbits;
 
-extern __sfr __at 0xf24 TXB2EIDL;
+extern __sfr __at (0xf24) TXB2EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -605,9 +605,9 @@ typedef union {
        };
 } __TXB2EIDLbits_t;
 
-extern volatile __TXB2EIDLbits_t __at 0xf24 TXB2EIDLbits;
+extern volatile __TXB2EIDLbits_t __at (0xf24) TXB2EIDLbits;
 
-extern __sfr __at 0xf25 TXB2DLC;
+extern __sfr __at (0xf25) TXB2DLC;
 typedef union {
        struct {
                unsigned TXB2DLC0:1;
@@ -621,9 +621,9 @@ typedef union {
        };
 } __TXB2DLCbits_t;
 
-extern volatile __TXB2DLCbits_t __at 0xf25 TXB2DLCbits;
+extern volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-extern __sfr __at 0xf26 TXB2D0;
+extern __sfr __at (0xf26) TXB2D0;
 typedef union {
        struct {
                unsigned TXB2D00:1;
@@ -637,9 +637,9 @@ typedef union {
        };
 } __TXB2D0bits_t;
 
-extern volatile __TXB2D0bits_t __at 0xf26 TXB2D0bits;
+extern volatile __TXB2D0bits_t __at (0xf26) TXB2D0bits;
 
-extern __sfr __at 0xf27 TXB2D1;
+extern __sfr __at (0xf27) TXB2D1;
 typedef union {
        struct {
                unsigned TXB2D10:1;
@@ -653,9 +653,9 @@ typedef union {
        };
 } __TXB2D1bits_t;
 
-extern volatile __TXB2D1bits_t __at 0xf27 TXB2D1bits;
+extern volatile __TXB2D1bits_t __at (0xf27) TXB2D1bits;
 
-extern __sfr __at 0xf28 TXB2D2;
+extern __sfr __at (0xf28) TXB2D2;
 typedef union {
        struct {
                unsigned TXB2D20:1;
@@ -669,9 +669,9 @@ typedef union {
        };
 } __TXB2D2bits_t;
 
-extern volatile __TXB2D2bits_t __at 0xf28 TXB2D2bits;
+extern volatile __TXB2D2bits_t __at (0xf28) TXB2D2bits;
 
-extern __sfr __at 0xf29 TXB2D3;
+extern __sfr __at (0xf29) TXB2D3;
 typedef union {
        struct {
                unsigned TXB2D30:1;
@@ -685,9 +685,9 @@ typedef union {
        };
 } __TXB2D3bits_t;
 
-extern volatile __TXB2D3bits_t __at 0xf29 TXB2D3bits;
+extern volatile __TXB2D3bits_t __at (0xf29) TXB2D3bits;
 
-extern __sfr __at 0xf2a TXB2D4;
+extern __sfr __at (0xf2a) TXB2D4;
 typedef union {
        struct {
                unsigned TXB2D40:1;
@@ -701,9 +701,9 @@ typedef union {
        };
 } __TXB2D4bits_t;
 
-extern volatile __TXB2D4bits_t __at 0xf2a TXB2D4bits;
+extern volatile __TXB2D4bits_t __at (0xf2a) TXB2D4bits;
 
-extern __sfr __at 0xf2b TXB2D5;
+extern __sfr __at (0xf2b) TXB2D5;
 typedef union {
        struct {
                unsigned TXB2D50:1;
@@ -717,9 +717,9 @@ typedef union {
        };
 } __TXB2D5bits_t;
 
-extern volatile __TXB2D5bits_t __at 0xf2b TXB2D5bits;
+extern volatile __TXB2D5bits_t __at (0xf2b) TXB2D5bits;
 
-extern __sfr __at 0xf2c TXB2D6;
+extern __sfr __at (0xf2c) TXB2D6;
 typedef union {
        struct {
                unsigned TXB2D60:1;
@@ -733,9 +733,9 @@ typedef union {
        };
 } __TXB2D6bits_t;
 
-extern volatile __TXB2D6bits_t __at 0xf2c TXB2D6bits;
+extern volatile __TXB2D6bits_t __at (0xf2c) TXB2D6bits;
 
-extern __sfr __at 0xf2d TXB2D7;
+extern __sfr __at (0xf2d) TXB2D7;
 typedef union {
        struct {
                unsigned TXB2D70:1;
@@ -749,9 +749,9 @@ typedef union {
        };
 } __TXB2D7bits_t;
 
-extern volatile __TXB2D7bits_t __at 0xf2d TXB2D7bits;
+extern volatile __TXB2D7bits_t __at (0xf2d) TXB2D7bits;
 
-extern __sfr __at 0xf2e CANSTATRO4;
+extern __sfr __at (0xf2e) CANSTATRO4;
 typedef union {
        struct {
                unsigned :1;
@@ -765,9 +765,9 @@ typedef union {
        };
 } __CANSTATRO4bits_t;
 
-extern volatile __CANSTATRO4bits_t __at 0xf2e CANSTATRO4bits;
+extern volatile __CANSTATRO4bits_t __at (0xf2e) CANSTATRO4bits;
 
-extern __sfr __at 0xf30 TXB1CON;
+extern __sfr __at (0xf30) TXB1CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -781,9 +781,9 @@ typedef union {
        };
 } __TXB1CONbits_t;
 
-extern volatile __TXB1CONbits_t __at 0xf30 TXB1CONbits;
+extern volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-extern __sfr __at 0xf31 TXB1SIDH;
+extern __sfr __at (0xf31) TXB1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -797,9 +797,9 @@ typedef union {
        };
 } __TXB1SIDHbits_t;
 
-extern volatile __TXB1SIDHbits_t __at 0xf31 TXB1SIDHbits;
+extern volatile __TXB1SIDHbits_t __at (0xf31) TXB1SIDHbits;
 
-extern __sfr __at 0xf32 TXB1SIDL;
+extern __sfr __at (0xf32) TXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -813,9 +813,9 @@ typedef union {
        };
 } __TXB1SIDLbits_t;
 
-extern volatile __TXB1SIDLbits_t __at 0xf32 TXB1SIDLbits;
+extern volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-extern __sfr __at 0xf33 TXB1EIDH;
+extern __sfr __at (0xf33) TXB1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -829,9 +829,9 @@ typedef union {
        };
 } __TXB1EIDHbits_t;
 
-extern volatile __TXB1EIDHbits_t __at 0xf33 TXB1EIDHbits;
+extern volatile __TXB1EIDHbits_t __at (0xf33) TXB1EIDHbits;
 
-extern __sfr __at 0xf34 TXB1EIDL;
+extern __sfr __at (0xf34) TXB1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -845,9 +845,9 @@ typedef union {
        };
 } __TXB1EIDLbits_t;
 
-extern volatile __TXB1EIDLbits_t __at 0xf34 TXB1EIDLbits;
+extern volatile __TXB1EIDLbits_t __at (0xf34) TXB1EIDLbits;
 
-extern __sfr __at 0xf35 TXB1DLC;
+extern __sfr __at (0xf35) TXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -861,9 +861,9 @@ typedef union {
        };
 } __TXB1DLCbits_t;
 
-extern volatile __TXB1DLCbits_t __at 0xf35 TXB1DLCbits;
+extern volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-extern __sfr __at 0xf36 TXB1D0;
+extern __sfr __at (0xf36) TXB1D0;
 typedef union {
        struct {
                unsigned TXB1D00:1;
@@ -877,9 +877,9 @@ typedef union {
        };
 } __TXB1D0bits_t;
 
-extern volatile __TXB1D0bits_t __at 0xf36 TXB1D0bits;
+extern volatile __TXB1D0bits_t __at (0xf36) TXB1D0bits;
 
-extern __sfr __at 0xf37 TXB1D1;
+extern __sfr __at (0xf37) TXB1D1;
 typedef union {
        struct {
                unsigned TXB1D10:1;
@@ -893,9 +893,9 @@ typedef union {
        };
 } __TXB1D1bits_t;
 
-extern volatile __TXB1D1bits_t __at 0xf37 TXB1D1bits;
+extern volatile __TXB1D1bits_t __at (0xf37) TXB1D1bits;
 
-extern __sfr __at 0xf38 TXB1D2;
+extern __sfr __at (0xf38) TXB1D2;
 typedef union {
        struct {
                unsigned TXB1D20:1;
@@ -909,9 +909,9 @@ typedef union {
        };
 } __TXB1D2bits_t;
 
-extern volatile __TXB1D2bits_t __at 0xf38 TXB1D2bits;
+extern volatile __TXB1D2bits_t __at (0xf38) TXB1D2bits;
 
-extern __sfr __at 0xf39 TXB1D3;
+extern __sfr __at (0xf39) TXB1D3;
 typedef union {
        struct {
                unsigned TXB1D30:1;
@@ -925,9 +925,9 @@ typedef union {
        };
 } __TXB1D3bits_t;
 
-extern volatile __TXB1D3bits_t __at 0xf39 TXB1D3bits;
+extern volatile __TXB1D3bits_t __at (0xf39) TXB1D3bits;
 
-extern __sfr __at 0xf3a TXB1D4;
+extern __sfr __at (0xf3a) TXB1D4;
 typedef union {
        struct {
                unsigned TXB1D40:1;
@@ -941,9 +941,9 @@ typedef union {
        };
 } __TXB1D4bits_t;
 
-extern volatile __TXB1D4bits_t __at 0xf3a TXB1D4bits;
+extern volatile __TXB1D4bits_t __at (0xf3a) TXB1D4bits;
 
-extern __sfr __at 0xf3b TXB1D5;
+extern __sfr __at (0xf3b) TXB1D5;
 typedef union {
        struct {
                unsigned TXB1D50:1;
@@ -957,9 +957,9 @@ typedef union {
        };
 } __TXB1D5bits_t;
 
-extern volatile __TXB1D5bits_t __at 0xf3b TXB1D5bits;
+extern volatile __TXB1D5bits_t __at (0xf3b) TXB1D5bits;
 
-extern __sfr __at 0xf3c TXB1D6;
+extern __sfr __at (0xf3c) TXB1D6;
 typedef union {
        struct {
                unsigned TXB1D60:1;
@@ -973,9 +973,9 @@ typedef union {
        };
 } __TXB1D6bits_t;
 
-extern volatile __TXB1D6bits_t __at 0xf3c TXB1D6bits;
+extern volatile __TXB1D6bits_t __at (0xf3c) TXB1D6bits;
 
-extern __sfr __at 0xf3d TXB1D7;
+extern __sfr __at (0xf3d) TXB1D7;
 typedef union {
        struct {
                unsigned TXB1D70:1;
@@ -989,9 +989,9 @@ typedef union {
        };
 } __TXB1D7bits_t;
 
-extern volatile __TXB1D7bits_t __at 0xf3d TXB1D7bits;
+extern volatile __TXB1D7bits_t __at (0xf3d) TXB1D7bits;
 
-extern __sfr __at 0xf3e CANSTATRO3;
+extern __sfr __at (0xf3e) CANSTATRO3;
 typedef union {
        struct {
                unsigned :1;
@@ -1005,9 +1005,9 @@ typedef union {
        };
 } __CANSTATRO3bits_t;
 
-extern volatile __CANSTATRO3bits_t __at 0xf3e CANSTATRO3bits;
+extern volatile __CANSTATRO3bits_t __at (0xf3e) CANSTATRO3bits;
 
-extern __sfr __at 0xf40 TXB0CON;
+extern __sfr __at (0xf40) TXB0CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -1021,9 +1021,9 @@ typedef union {
        };
 } __TXB0CONbits_t;
 
-extern volatile __TXB0CONbits_t __at 0xf40 TXB0CONbits;
+extern volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-extern __sfr __at 0xf41 TXB0SIDH;
+extern __sfr __at (0xf41) TXB0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1037,9 +1037,9 @@ typedef union {
        };
 } __TXB0SIDHbits_t;
 
-extern volatile __TXB0SIDHbits_t __at 0xf41 TXB0SIDHbits;
+extern volatile __TXB0SIDHbits_t __at (0xf41) TXB0SIDHbits;
 
-extern __sfr __at 0xf42 TXB0SIDL;
+extern __sfr __at (0xf42) TXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1053,9 +1053,9 @@ typedef union {
        };
 } __TXB0SIDLbits_t;
 
-extern volatile __TXB0SIDLbits_t __at 0xf42 TXB0SIDLbits;
+extern volatile __TXB0SIDLbits_t __at (0xf42) TXB0SIDLbits;
 
-extern __sfr __at 0xf43 TXB0EIDH;
+extern __sfr __at (0xf43) TXB0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1069,9 +1069,9 @@ typedef union {
        };
 } __TXB0EIDHbits_t;
 
-extern volatile __TXB0EIDHbits_t __at 0xf43 TXB0EIDHbits;
+extern volatile __TXB0EIDHbits_t __at (0xf43) TXB0EIDHbits;
 
-extern __sfr __at 0xf44 TXB0EIDL;
+extern __sfr __at (0xf44) TXB0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1085,9 +1085,9 @@ typedef union {
        };
 } __TXB0EIDLbits_t;
 
-extern volatile __TXB0EIDLbits_t __at 0xf44 TXB0EIDLbits;
+extern volatile __TXB0EIDLbits_t __at (0xf44) TXB0EIDLbits;
 
-extern __sfr __at 0xf45 TXB0DLC;
+extern __sfr __at (0xf45) TXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1101,9 +1101,9 @@ typedef union {
        };
 } __TXB0DLCbits_t;
 
-extern volatile __TXB0DLCbits_t __at 0xf45 TXB0DLCbits;
+extern volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-extern __sfr __at 0xf46 TXB0D0;
+extern __sfr __at (0xf46) TXB0D0;
 typedef union {
        struct {
                unsigned TXB0D00:1;
@@ -1117,9 +1117,9 @@ typedef union {
        };
 } __TXB0D0bits_t;
 
-extern volatile __TXB0D0bits_t __at 0xf46 TXB0D0bits;
+extern volatile __TXB0D0bits_t __at (0xf46) TXB0D0bits;
 
-extern __sfr __at 0xf47 TXB0D1;
+extern __sfr __at (0xf47) TXB0D1;
 typedef union {
        struct {
                unsigned TXB0D10:1;
@@ -1133,9 +1133,9 @@ typedef union {
        };
 } __TXB0D1bits_t;
 
-extern volatile __TXB0D1bits_t __at 0xf47 TXB0D1bits;
+extern volatile __TXB0D1bits_t __at (0xf47) TXB0D1bits;
 
-extern __sfr __at 0xf48 TXB0D2;
+extern __sfr __at (0xf48) TXB0D2;
 typedef union {
        struct {
                unsigned TXB0D20:1;
@@ -1149,9 +1149,9 @@ typedef union {
        };
 } __TXB0D2bits_t;
 
-extern volatile __TXB0D2bits_t __at 0xf48 TXB0D2bits;
+extern volatile __TXB0D2bits_t __at (0xf48) TXB0D2bits;
 
-extern __sfr __at 0xf49 TXB0D3;
+extern __sfr __at (0xf49) TXB0D3;
 typedef union {
        struct {
                unsigned TXB0D30:1;
@@ -1165,9 +1165,9 @@ typedef union {
        };
 } __TXB0D3bits_t;
 
-extern volatile __TXB0D3bits_t __at 0xf49 TXB0D3bits;
+extern volatile __TXB0D3bits_t __at (0xf49) TXB0D3bits;
 
-extern __sfr __at 0xf4a TXB0D4;
+extern __sfr __at (0xf4a) TXB0D4;
 typedef union {
        struct {
                unsigned TXB0D40:1;
@@ -1181,9 +1181,9 @@ typedef union {
        };
 } __TXB0D4bits_t;
 
-extern volatile __TXB0D4bits_t __at 0xf4a TXB0D4bits;
+extern volatile __TXB0D4bits_t __at (0xf4a) TXB0D4bits;
 
-extern __sfr __at 0xf4b TXB0D5;
+extern __sfr __at (0xf4b) TXB0D5;
 typedef union {
        struct {
                unsigned TXB0D50:1;
@@ -1197,9 +1197,9 @@ typedef union {
        };
 } __TXB0D5bits_t;
 
-extern volatile __TXB0D5bits_t __at 0xf4b TXB0D5bits;
+extern volatile __TXB0D5bits_t __at (0xf4b) TXB0D5bits;
 
-extern __sfr __at 0xf4c TXB0D6;
+extern __sfr __at (0xf4c) TXB0D6;
 typedef union {
        struct {
                unsigned TXB0D60:1;
@@ -1213,9 +1213,9 @@ typedef union {
        };
 } __TXB0D6bits_t;
 
-extern volatile __TXB0D6bits_t __at 0xf4c TXB0D6bits;
+extern volatile __TXB0D6bits_t __at (0xf4c) TXB0D6bits;
 
-extern __sfr __at 0xf4d TXB0D7;
+extern __sfr __at (0xf4d) TXB0D7;
 typedef union {
        struct {
                unsigned TXB0D70:1;
@@ -1229,9 +1229,9 @@ typedef union {
        };
 } __TXB0D7bits_t;
 
-extern volatile __TXB0D7bits_t __at 0xf4d TXB0D7bits;
+extern volatile __TXB0D7bits_t __at (0xf4d) TXB0D7bits;
 
-extern __sfr __at 0xf4e CANSTATRO2;
+extern __sfr __at (0xf4e) CANSTATRO2;
 typedef union {
        struct {
                unsigned :1;
@@ -1245,9 +1245,9 @@ typedef union {
        };
 } __CANSTATRO2bits_t;
 
-extern volatile __CANSTATRO2bits_t __at 0xf4e CANSTATRO2bits;
+extern volatile __CANSTATRO2bits_t __at (0xf4e) CANSTATRO2bits;
 
-extern __sfr __at 0xf50 RXB1CON;
+extern __sfr __at (0xf50) RXB1CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -1261,9 +1261,9 @@ typedef union {
        };
 } __RXB1CONbits_t;
 
-extern volatile __RXB1CONbits_t __at 0xf50 RXB1CONbits;
+extern volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-extern __sfr __at 0xf51 RXB1SIDH;
+extern __sfr __at (0xf51) RXB1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1277,9 +1277,9 @@ typedef union {
        };
 } __RXB1SIDHbits_t;
 
-extern volatile __RXB1SIDHbits_t __at 0xf51 RXB1SIDHbits;
+extern volatile __RXB1SIDHbits_t __at (0xf51) RXB1SIDHbits;
 
-extern __sfr __at 0xf52 RXB1SIDL;
+extern __sfr __at (0xf52) RXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1293,9 +1293,9 @@ typedef union {
        };
 } __RXB1SIDLbits_t;
 
-extern volatile __RXB1SIDLbits_t __at 0xf52 RXB1SIDLbits;
+extern volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-extern __sfr __at 0xf53 RXB1EIDH;
+extern __sfr __at (0xf53) RXB1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1309,9 +1309,9 @@ typedef union {
        };
 } __RXB1EIDHbits_t;
 
-extern volatile __RXB1EIDHbits_t __at 0xf53 RXB1EIDHbits;
+extern volatile __RXB1EIDHbits_t __at (0xf53) RXB1EIDHbits;
 
-extern __sfr __at 0xf54 RXB1EIDL;
+extern __sfr __at (0xf54) RXB1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1325,9 +1325,9 @@ typedef union {
        };
 } __RXB1EIDLbits_t;
 
-extern volatile __RXB1EIDLbits_t __at 0xf54 RXB1EIDLbits;
+extern volatile __RXB1EIDLbits_t __at (0xf54) RXB1EIDLbits;
 
-extern __sfr __at 0xf55 RXB1DLC;
+extern __sfr __at (0xf55) RXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1341,9 +1341,9 @@ typedef union {
        };
 } __RXB1DLCbits_t;
 
-extern volatile __RXB1DLCbits_t __at 0xf55 RXB1DLCbits;
+extern volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-extern __sfr __at 0xf56 RXB1D0;
+extern __sfr __at (0xf56) RXB1D0;
 typedef union {
        struct {
                unsigned RXB1D00:1;
@@ -1357,9 +1357,9 @@ typedef union {
        };
 } __RXB1D0bits_t;
 
-extern volatile __RXB1D0bits_t __at 0xf56 RXB1D0bits;
+extern volatile __RXB1D0bits_t __at (0xf56) RXB1D0bits;
 
-extern __sfr __at 0xf57 RXB1D1;
+extern __sfr __at (0xf57) RXB1D1;
 typedef union {
        struct {
                unsigned RXB1D10:1;
@@ -1373,9 +1373,9 @@ typedef union {
        };
 } __RXB1D1bits_t;
 
-extern volatile __RXB1D1bits_t __at 0xf57 RXB1D1bits;
+extern volatile __RXB1D1bits_t __at (0xf57) RXB1D1bits;
 
-extern __sfr __at 0xf58 RXB1D2;
+extern __sfr __at (0xf58) RXB1D2;
 typedef union {
        struct {
                unsigned RXB1D20:1;
@@ -1389,9 +1389,9 @@ typedef union {
        };
 } __RXB1D2bits_t;
 
-extern volatile __RXB1D2bits_t __at 0xf58 RXB1D2bits;
+extern volatile __RXB1D2bits_t __at (0xf58) RXB1D2bits;
 
-extern __sfr __at 0xf59 RXB1D3;
+extern __sfr __at (0xf59) RXB1D3;
 typedef union {
        struct {
                unsigned RXB1D30:1;
@@ -1405,9 +1405,9 @@ typedef union {
        };
 } __RXB1D3bits_t;
 
-extern volatile __RXB1D3bits_t __at 0xf59 RXB1D3bits;
+extern volatile __RXB1D3bits_t __at (0xf59) RXB1D3bits;
 
-extern __sfr __at 0xf5a RXB1D4;
+extern __sfr __at (0xf5a) RXB1D4;
 typedef union {
        struct {
                unsigned RXB1D40:1;
@@ -1421,9 +1421,9 @@ typedef union {
        };
 } __RXB1D4bits_t;
 
-extern volatile __RXB1D4bits_t __at 0xf5a RXB1D4bits;
+extern volatile __RXB1D4bits_t __at (0xf5a) RXB1D4bits;
 
-extern __sfr __at 0xf5b RXB1D5;
+extern __sfr __at (0xf5b) RXB1D5;
 typedef union {
        struct {
                unsigned RXB1D50:1;
@@ -1437,9 +1437,9 @@ typedef union {
        };
 } __RXB1D5bits_t;
 
-extern volatile __RXB1D5bits_t __at 0xf5b RXB1D5bits;
+extern volatile __RXB1D5bits_t __at (0xf5b) RXB1D5bits;
 
-extern __sfr __at 0xf5c RXB1D6;
+extern __sfr __at (0xf5c) RXB1D6;
 typedef union {
        struct {
                unsigned RXB1D60:1;
@@ -1453,9 +1453,9 @@ typedef union {
        };
 } __RXB1D6bits_t;
 
-extern volatile __RXB1D6bits_t __at 0xf5c RXB1D6bits;
+extern volatile __RXB1D6bits_t __at (0xf5c) RXB1D6bits;
 
-extern __sfr __at 0xf5d RXB1D7;
+extern __sfr __at (0xf5d) RXB1D7;
 typedef union {
        struct {
                unsigned RXB1D70:1;
@@ -1469,9 +1469,9 @@ typedef union {
        };
 } __RXB1D7bits_t;
 
-extern volatile __RXB1D7bits_t __at 0xf5d RXB1D7bits;
+extern volatile __RXB1D7bits_t __at (0xf5d) RXB1D7bits;
 
-extern __sfr __at 0xf5e CANSTATRO1;
+extern __sfr __at (0xf5e) CANSTATRO1;
 typedef union {
        struct {
                unsigned :1;
@@ -1485,9 +1485,9 @@ typedef union {
        };
 } __CANSTATRO1bits_t;
 
-extern volatile __CANSTATRO1bits_t __at 0xf5e CANSTATRO1bits;
+extern volatile __CANSTATRO1bits_t __at (0xf5e) CANSTATRO1bits;
 
-extern __sfr __at 0xf60 RXB0CON;
+extern __sfr __at (0xf60) RXB0CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -1501,9 +1501,9 @@ typedef union {
        };
 } __RXB0CONbits_t;
 
-extern volatile __RXB0CONbits_t __at 0xf60 RXB0CONbits;
+extern volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-extern __sfr __at 0xf61 RXB0SIDH;
+extern __sfr __at (0xf61) RXB0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1517,9 +1517,9 @@ typedef union {
        };
 } __RXB0SIDHbits_t;
 
-extern volatile __RXB0SIDHbits_t __at 0xf61 RXB0SIDHbits;
+extern volatile __RXB0SIDHbits_t __at (0xf61) RXB0SIDHbits;
 
-extern __sfr __at 0xf62 RXB0SIDL;
+extern __sfr __at (0xf62) RXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1533,9 +1533,9 @@ typedef union {
        };
 } __RXB0SIDLbits_t;
 
-extern volatile __RXB0SIDLbits_t __at 0xf62 RXB0SIDLbits;
+extern volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-extern __sfr __at 0xf63 RXB0EIDH;
+extern __sfr __at (0xf63) RXB0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1549,9 +1549,9 @@ typedef union {
        };
 } __RXB0EIDHbits_t;
 
-extern volatile __RXB0EIDHbits_t __at 0xf63 RXB0EIDHbits;
+extern volatile __RXB0EIDHbits_t __at (0xf63) RXB0EIDHbits;
 
-extern __sfr __at 0xf64 RXB0EIDL;
+extern __sfr __at (0xf64) RXB0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1565,9 +1565,9 @@ typedef union {
        };
 } __RXB0EIDLbits_t;
 
-extern volatile __RXB0EIDLbits_t __at 0xf64 RXB0EIDLbits;
+extern volatile __RXB0EIDLbits_t __at (0xf64) RXB0EIDLbits;
 
-extern __sfr __at 0xf65 RXB0DLC;
+extern __sfr __at (0xf65) RXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1581,17 +1581,17 @@ typedef union {
        };
 } __RXB0DLCbits_t;
 
-extern volatile __RXB0DLCbits_t __at 0xf65 RXB0DLCbits;
+extern volatile __RXB0DLCbits_t __at (0xf65) RXB0DLCbits;
 
-extern __sfr __at 0xf66 RXB0D0;
-extern __sfr __at 0xf67 RXB0D1;
-extern __sfr __at 0xf68 RXB0D2;
-extern __sfr __at 0xf69 RXB0D3;
-extern __sfr __at 0xf6a RXB0D4;
-extern __sfr __at 0xf6b RXB0D5;
-extern __sfr __at 0xf6c RXB0D6;
-extern __sfr __at 0xf6d RXB0D7;
-extern __sfr __at 0xf6e CANSTAT;
+extern __sfr __at (0xf66) RXB0D0;
+extern __sfr __at (0xf67) RXB0D1;
+extern __sfr __at (0xf68) RXB0D2;
+extern __sfr __at (0xf69) RXB0D3;
+extern __sfr __at (0xf6a) RXB0D4;
+extern __sfr __at (0xf6b) RXB0D5;
+extern __sfr __at (0xf6c) RXB0D6;
+extern __sfr __at (0xf6d) RXB0D7;
+extern __sfr __at (0xf6e) CANSTAT;
 typedef union {
        struct {
                unsigned :1;
@@ -1605,9 +1605,9 @@ typedef union {
        };
 } __CANSTATbits_t;
 
-extern volatile __CANSTATbits_t __at 0xf6e CANSTATbits;
+extern volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-extern __sfr __at 0xf6f CANCON;
+extern __sfr __at (0xf6f) CANCON;
 typedef union {
        struct {
                unsigned WIN0:1;
@@ -1621,9 +1621,9 @@ typedef union {
        };
 } __CANCONbits_t;
 
-extern volatile __CANCONbits_t __at 0xf6f CANCONbits;
+extern volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-extern __sfr __at 0xf70 BRGCON1;
+extern __sfr __at (0xf70) BRGCON1;
 typedef union {
        struct {
                unsigned BRP0:1;
@@ -1637,9 +1637,9 @@ typedef union {
        };
 } __BRGCON1bits_t;
 
-extern volatile __BRGCON1bits_t __at 0xf70 BRGCON1bits;
+extern volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-extern __sfr __at 0xf71 BRGCON2;
+extern __sfr __at (0xf71) BRGCON2;
 typedef union {
        struct {
                unsigned PRSEG0:1;
@@ -1653,9 +1653,9 @@ typedef union {
        };
 } __BRGCON2bits_t;
 
-extern volatile __BRGCON2bits_t __at 0xf71 BRGCON2bits;
+extern volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-extern __sfr __at 0xf72 BRGCON3;
+extern __sfr __at (0xf72) BRGCON3;
 typedef union {
        struct {
                unsigned SEG2PH0:1;
@@ -1669,9 +1669,9 @@ typedef union {
        };
 } __BRGCON3bits_t;
 
-extern volatile __BRGCON3bits_t __at 0xf72 BRGCON3bits;
+extern volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-extern __sfr __at 0xf73 CIOCON;
+extern __sfr __at (0xf73) CIOCON;
 typedef union {
        struct {
                unsigned :1;
@@ -1685,9 +1685,9 @@ typedef union {
        };
 } __CIOCONbits_t;
 
-extern volatile __CIOCONbits_t __at 0xf73 CIOCONbits;
+extern volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-extern __sfr __at 0xf74 COMSTAT;
+extern __sfr __at (0xf74) COMSTAT;
 typedef union {
        struct {
                unsigned EWARN:1;
@@ -1701,9 +1701,9 @@ typedef union {
        };
 } __COMSTATbits_t;
 
-extern volatile __COMSTATbits_t __at 0xf74 COMSTATbits;
+extern volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-extern __sfr __at 0xf75 RXERRCNT;
+extern __sfr __at (0xf75) RXERRCNT;
 typedef union {
        struct {
                unsigned REC0:1;
@@ -1717,9 +1717,9 @@ typedef union {
        };
 } __RXERRCNTbits_t;
 
-extern volatile __RXERRCNTbits_t __at 0xf75 RXERRCNTbits;
+extern volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-extern __sfr __at 0xf76 TXERRCNT;
+extern __sfr __at (0xf76) TXERRCNT;
 typedef union {
        struct {
                unsigned TEC0:1;
@@ -1733,9 +1733,9 @@ typedef union {
        };
 } __TXERRCNTbits_t;
 
-extern volatile __TXERRCNTbits_t __at 0xf76 TXERRCNTbits;
+extern volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -1782,9 +1782,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;
@@ -1809,9 +1809,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -1847,9 +1847,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -1863,9 +1863,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;
@@ -1879,9 +1879,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -1895,9 +1895,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -1911,9 +1911,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;
@@ -1927,9 +1927,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -1943,9 +1943,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -1959,9 +1959,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;
@@ -1975,9 +1975,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;
@@ -1991,9 +1991,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 CCP2IE:1;
@@ -2007,9 +2007,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 CCP2IF:1;
@@ -2023,9 +2023,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 CCP2IP:1;
@@ -2039,9 +2039,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned RX0IE:1;
@@ -2055,9 +2055,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned RX0IF:1;
@@ -2071,9 +2071,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned RX0IP:1;
@@ -2087,9 +2087,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -2103,12 +2103,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -2122,9 +2122,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;
@@ -2138,12 +2138,12 @@ 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 0xfb1 T3CON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -2157,11 +2157,11 @@ 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 (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -2175,11 +2175,11 @@ typedef union {
        };
 } __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 0xfc1 ADCON1;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -2193,9 +2193,9 @@ typedef union {
        };
 } __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;
@@ -2209,11 +2209,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -2227,9 +2227,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -2243,9 +2243,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -2259,11 +2259,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -2277,11 +2277,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;
@@ -2295,11 +2295,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;
@@ -2313,9 +2313,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;
@@ -2340,9 +2340,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;
@@ -2367,9 +2367,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;
@@ -2383,12 +2383,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -2402,32 +2402,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;
@@ -2452,9 +2452,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;
@@ -2468,9 +2468,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;
@@ -2484,18 +2484,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -2509,11 +2509,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 */

diff --git a/device/include/pic16/pic18f4331.h b/device/include/pic16/pic18f4331.h
index d6e5f5ee032c7ded32910cf0f1fa91eb8cd62676..7658dcb4809b711697bab8fef6909e70cf6f4d4e 100644 (file)
--- a/device/include/pic16/pic18f4331.h
+++ b/device/include/pic16/pic18f4331.h
@@ -17,7 +17,7 @@
 #ifndef __PIC18F4331_H__
 #define __PIC18F4331_H__ 1
 
-extern __sfr __at 0xF60 DFLTCON;
+extern __sfr __at (0xF60) DFLTCON;
 typedef union {
        struct {
                unsigned FLTCK          : 3;
@@ -28,9 +28,9 @@ typedef union {
                unsigned                : 1;
        };
 } __DFLTCON_t;
-extern volatile __DFLTCON_t __at 0xF60 DFLTCONbits;
+extern volatile __DFLTCON_t __at (0xF60) DFLTCONbits;
 
-extern __sfr __at 0xF61 CAP3CON;
+extern __sfr __at (0xF61) CAP3CON;
 typedef union {
        struct {
                unsigned CAP3M          : 4;
@@ -40,9 +40,9 @@ typedef union {
                unsigned                : 1;
        };
 } __CAP3CON_t;
-extern volatile __CAP3CON_t __at 0xF61 CAP3CONbits;
+extern volatile __CAP3CON_t __at (0xF61) CAP3CONbits;
 
-extern __sfr __at 0xF62 CAP2CON;
+extern __sfr __at (0xF62) CAP2CON;
 typedef union {
        struct {
                unsigned CAP2M          : 4;
@@ -52,9 +52,9 @@ typedef union {
                unsigned                : 1;
        };
 } __CAP2CON_t;
-extern volatile __CAP2CON_t __at 0xF62 CAP2CONbits;
+extern volatile __CAP2CON_t __at (0xF62) CAP2CONbits;
 
-extern __sfr __at 0xF63 CAP1CON;
+extern __sfr __at (0xF63) CAP1CON;
 typedef union {
        struct {
                unsigned CAP1M          : 4;
@@ -64,37 +64,37 @@ typedef union {
                unsigned                : 1;
        };
 } __CAP1CON_t;
-extern volatile __CAP1CON_t __at 0xF63 CAP1CONbits;
+extern volatile __CAP1CON_t __at (0xF63) CAP1CONbits;
 
-extern __sfr __at 0xF64 CAP3BUFL;
+extern __sfr __at (0xF64) CAP3BUFL;
 
-extern __sfr __at 0xF65 CAP3BUFH;
+extern __sfr __at (0xF65) CAP3BUFH;
 
-extern __sfr __at 0xF66 CAP2BUFL;
+extern __sfr __at (0xF66) CAP2BUFL;
 
-extern __sfr __at 0xF67 CAP2BUFH;
+extern __sfr __at (0xF67) CAP2BUFH;
 
-extern __sfr __at 0xF68 CAP1BUFL;
+extern __sfr __at (0xF68) CAP1BUFL;
 
-extern __sfr __at 0xF69 CAP1BUFH;
+extern __sfr __at (0xF69) CAP1BUFH;
 
-extern __sfr __at 0xF6A OVDCONS;
+extern __sfr __at (0xF6A) OVDCONS;
 typedef union {
        struct {
                unsigned POUT           : 8;
        };
 } __OVDCONS_t;
-extern volatile __OVDCONS_t __at 0xF6A OVDCONSbits;
+extern volatile __OVDCONS_t __at (0xF6A) OVDCONSbits;
 
-extern __sfr __at 0xF6B OVDCOND;
+extern __sfr __at (0xF6B) OVDCOND;
 typedef union {
        struct {
                unsigned POVD           : 8;
        };
 } __OVDCOND_t;
-extern volatile __OVDCOND_t __at 0xF6B OVDCONDbits;
+extern volatile __OVDCOND_t __at (0xF6B) OVDCONDbits;
 
-extern __sfr __at 0xF6C FLTCONFIG;
+extern __sfr __at (0xF6C) FLTCONFIG;
 typedef union {
        struct {
                unsigned FLTAEN         : 1;
@@ -107,18 +107,18 @@ typedef union {
                unsigned                : 1;
        };
 } __FLTCONFIG_t;
-extern volatile __FLTCONFIG_t __at 0xF6C FLTCONFIGbits;
+extern volatile __FLTCONFIG_t __at (0xF6C) FLTCONFIGbits;
 
-extern __sfr __at 0xF6D DTCON;
+extern __sfr __at (0xF6D) DTCON;
 typedef union {
        struct {
                unsigned DTA            : 6;
                unsigned DTAPS          : 2;
        };
 } __DTCON_t;
-extern volatile __DTCON_t __at 0xF6D DTCONbits;
+extern volatile __DTCON_t __at (0xF6D) DTCONbits;
 
-extern __sfr __at 0xF6E PWMCON1;
+extern __sfr __at (0xF6E) PWMCON1;
 typedef union {
        struct {
                unsigned OSYNC          : 1;
@@ -128,9 +128,9 @@ typedef union {
                unsigned SEVOPS         : 4;
        };
 } __PWMCON1_t;
-extern volatile __PWMCON1_t __at 0xF6E PWMCON1bits;
+extern volatile __PWMCON1_t __at (0xF6E) PWMCON1bits;
 
-extern __sfr __at 0xF6F PWMCON0;
+extern __sfr __at (0xF6F) PWMCON0;
 typedef union {
        struct {
                unsigned PMOD           : 4;
@@ -138,9 +138,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PWMCON0_t;
-extern volatile __PWMCON0_t __at 0xF6F PWMCON0bits;
+extern volatile __PWMCON0_t __at (0xF6F) PWMCON0bits;
 
-extern __sfr __at 0xF70 SEVTCMPH;
+extern __sfr __at (0xF70) SEVTCMPH;
 typedef union {
        struct {
                unsigned SEVTCMPH       : 4;
@@ -150,11 +150,11 @@ typedef union {
                unsigned                : 1;
        };
 } __SEVTCMPH_t;
-extern volatile __SEVTCMPH_t __at 0xF70 SEVTCMPHbits;
+extern volatile __SEVTCMPH_t __at (0xF70) SEVTCMPHbits;
 
-extern __sfr __at 0xF71 SEVTCMPL;
+extern __sfr __at (0xF71) SEVTCMPL;
 
-extern __sfr __at 0xF72 PDC3H;
+extern __sfr __at (0xF72) PDC3H;
 typedef union {
        struct {
                unsigned PDC3H          : 6;
@@ -162,11 +162,11 @@ typedef union {
                unsigned                : 1;
        };
 } __PDC3H_t;
-extern volatile __PDC3H_t __at 0xF72 PDC3Hbits;
+extern volatile __PDC3H_t __at (0xF72) PDC3Hbits;
 
-extern __sfr __at 0xF73 PDC3L;
+extern __sfr __at (0xF73) PDC3L;
 
-extern __sfr __at 0xF74 PDC2H;
+extern __sfr __at (0xF74) PDC2H;
 typedef union {
        struct {
                unsigned PDC2H          : 6;
@@ -174,11 +174,11 @@ typedef union {
                unsigned                : 1;
        };
 } __PDC2H_t;
-extern volatile __PDC2H_t __at 0xF74 PDC2Hbits;
+extern volatile __PDC2H_t __at (0xF74) PDC2Hbits;
 
-extern __sfr __at 0xF75 PDC2L;
+extern __sfr __at (0xF75) PDC2L;
 
-extern __sfr __at 0xF76 PDC1H;
+extern __sfr __at (0xF76) PDC1H;
 typedef union {
        struct {
                unsigned PDC1H          : 6;
@@ -186,11 +186,11 @@ typedef union {
                unsigned                : 1;
        };
 } __PDC1H_t;
-extern volatile __PDC1H_t __at 0xF76 PDC1Hbits;
+extern volatile __PDC1H_t __at (0xF76) PDC1Hbits;
 
-extern __sfr __at 0xF77 PDC1L;
+extern __sfr __at (0xF77) PDC1L;
 
-extern __sfr __at 0xF78 PDC0H;
+extern __sfr __at (0xF78) PDC0H;
 typedef union {
        struct {
                unsigned PDC0H          : 6;
@@ -198,11 +198,11 @@ typedef union {
                unsigned                : 1;
        };
 } __PDC0H_t;
-extern volatile __PDC0H_t __at 0xF78 PDC0Hbits;
+extern volatile __PDC0H_t __at (0xF78) PDC0Hbits;
 
-extern __sfr __at 0xF79 PDC0L;
+extern __sfr __at (0xF79) PDC0L;
 
-extern __sfr __at 0xF7A PTPERH;
+extern __sfr __at (0xF7A) PTPERH;
 typedef union {
        struct {
                unsigned PTPERH         : 4;
@@ -212,11 +212,11 @@ typedef union {
                unsigned                : 1;
        };
 } __PTPERH_t;
-extern volatile __PTPERH_t __at 0xF7A PTPERHbits;
+extern volatile __PTPERH_t __at (0xF7A) PTPERHbits;
 
-extern __sfr __at 0xF7B PTPERL;
+extern __sfr __at (0xF7B) PTPERL;
 
-extern __sfr __at 0xF7C PTMRH;
+extern __sfr __at (0xF7C) PTMRH;
 typedef union {
        struct {
                unsigned PTMRH          : 4;
@@ -226,11 +226,11 @@ typedef union {
                unsigned                : 1;
        };
 } __PTMRH_t;
-extern volatile __PTMRH_t __at 0xF7C PTMRHbits;
+extern volatile __PTMRH_t __at (0xF7C) PTMRHbits;
 
-extern __sfr __at 0xF7D PTMRL;
+extern __sfr __at (0xF7D) PTMRL;
 
-extern __sfr __at 0xF7E PTCON1;
+extern __sfr __at (0xF7E) PTCON1;
 typedef union {
        struct {
                unsigned                : 1;
@@ -243,9 +243,9 @@ typedef union {
                unsigned PTEN           : 1;
        };
 } __PTCON1_t;
-extern volatile __PTCON1_t __at 0xF7E PTCON1bits;
+extern volatile __PTCON1_t __at (0xF7E) PTCON1bits;
 
-extern __sfr __at 0xF7F PTCON0;
+extern __sfr __at (0xF7F) PTCON0;
 typedef union {
        struct {
                unsigned PTMOD          : 2;
@@ -253,9 +253,9 @@ typedef union {
                unsigned PTOPS          : 4;
        };
 } __PTCON0_t;
-extern volatile __PTCON0_t __at 0xF7F PTCON0bits;
+extern volatile __PTCON0_t __at (0xF7F) PTCON0bits;
 
-extern __sfr __at 0xF80 PORTA;
+extern __sfr __at (0xF80) PORTA;
 typedef union {
        struct {
                unsigned RA0            : 1;
@@ -292,9 +292,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTA_t;
-extern volatile __PORTA_t __at 0xF80 PORTAbits;
+extern volatile __PORTA_t __at (0xF80) PORTAbits;
 
-extern __sfr __at 0xF81 PORTB;
+extern __sfr __at (0xF81) PORTB;
 typedef union {
        struct {
                unsigned RB0            : 1;
@@ -321,9 +321,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTB_t;
-extern volatile __PORTB_t __at 0xF81 PORTBbits;
+extern volatile __PORTB_t __at (0xF81) PORTBbits;
 
-extern __sfr __at 0xF82 PORTC;
+extern __sfr __at (0xF82) PORTC;
 typedef union {
        struct {
                unsigned RC0            : 1;
@@ -360,9 +360,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTC_t;
-extern volatile __PORTC_t __at 0xF82 PORTCbits;
+extern volatile __PORTC_t __at (0xF82) PORTCbits;
 
-extern __sfr __at 0xF83 PORTD;
+extern __sfr __at (0xF83) PORTD;
 typedef union {
        struct {
                unsigned RD0            : 1;
@@ -389,9 +389,9 @@ typedef union {
                unsigned PWM7           :1;
        };
 } __PORTD_t;
-extern volatile __PORTD_t __at 0xF83 PORTDbits;
+extern volatile __PORTD_t __at (0xF83) PORTDbits;
 
-extern __sfr __at 0xF84 PORTE;
+extern __sfr __at (0xF84) PORTE;
 typedef union {
        struct {
                unsigned RE0            : 1;
@@ -418,13 +418,13 @@ typedef union {
                unsigned                :1;
        };
 } __PORTE_t;
-extern volatile __PORTE_t __at 0xF84 PORTEbits;
+extern volatile __PORTE_t __at (0xF84) PORTEbits;
 
-extern __sfr __at 0xF87 TMR5L;
+extern __sfr __at (0xF87) TMR5L;
 
-extern __sfr __at 0xF88 TMR5H;
+extern __sfr __at (0xF88) TMR5H;
 
-extern __sfr __at 0xF89 LATA;
+extern __sfr __at (0xF89) LATA;
 typedef union {
        struct {
                unsigned LATA0          : 1;
@@ -437,9 +437,9 @@ typedef union {
                unsigned LATA7          : 1;
        };
 } __LATA_t;
-extern volatile __LATA_t __at 0xF89 LATAbits;
+extern volatile __LATA_t __at (0xF89) LATAbits;
 
-extern __sfr __at 0xF8A LATB;
+extern __sfr __at (0xF8A) LATB;
 typedef union {
        struct {
                unsigned LATB0          : 1;
@@ -452,9 +452,9 @@ typedef union {
                unsigned LATB7          : 1;
        };
 } __LATB_t;
-extern volatile __LATB_t __at 0xF8A LATBbits;
+extern volatile __LATB_t __at (0xF8A) LATBbits;
 
-extern __sfr __at 0xF8B LATC;
+extern __sfr __at (0xF8B) LATC;
 typedef union {
        struct {
                unsigned LATC0          : 1;
@@ -467,9 +467,9 @@ typedef union {
                unsigned LATC7          : 1;
        };
 } __LATC_t;
-extern volatile __LATC_t __at 0xF8B LATCbits;
+extern volatile __LATC_t __at (0xF8B) LATCbits;
 
-extern __sfr __at 0xF8C LATD;
+extern __sfr __at (0xF8C) LATD;
 typedef union {
        struct {
                unsigned LATD0          : 1;
@@ -482,9 +482,9 @@ typedef union {
                unsigned LATD7          : 1;
        };
 } __LATD_t;
-extern volatile __LATD_t __at 0xF8C LATDbits;
+extern volatile __LATD_t __at (0xF8C) LATDbits;
 
-extern __sfr __at 0xF8D LATE;
+extern __sfr __at (0xF8D) LATE;
 typedef union {
        struct {
                unsigned LATE0          : 1;
@@ -497,13 +497,13 @@ typedef union {
                unsigned                : 1;
        };
 } __LATE_t;
-extern volatile __LATE_t __at 0xF8D LATEbits;
+extern volatile __LATE_t __at (0xF8D) LATEbits;
 
-extern __sfr __at 0xF90 PR5L;
+extern __sfr __at (0xF90) PR5L;
 
-extern __sfr __at 0xF91 PR5H;
+extern __sfr __at (0xF91) PR5H;
 
-extern __sfr __at 0xF92 TRISA;
+extern __sfr __at (0xF92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0         : 1;
@@ -516,9 +516,9 @@ typedef union {
                unsigned TRISA7         : 1;
        };
 } __TRISA_t;
-extern volatile __TRISA_t __at 0xF92 TRISAbits;
+extern volatile __TRISA_t __at (0xF92) TRISAbits;
 
-extern __sfr __at 0xF93 TRISB;
+extern __sfr __at (0xF93) TRISB;
 typedef union {
        struct {
                unsigned TRISB0         : 1;
@@ -531,9 +531,9 @@ typedef union {
                unsigned TRISB7         : 1;
        };
 } __TRISB_t;
-extern volatile __TRISB_t __at 0xF93 TRISBbits;
+extern volatile __TRISB_t __at (0xF93) TRISBbits;
 
-extern __sfr __at 0xF94 TRISC;
+extern __sfr __at (0xF94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0         : 1;
@@ -546,9 +546,9 @@ typedef union {
                unsigned TRISC7         : 1;
        };
 } __TRISC_t;
-extern volatile __TRISC_t __at 0xF94 TRISCbits;
+extern volatile __TRISC_t __at (0xF94) TRISCbits;
 
-extern __sfr __at 0xF95 TRISD;
+extern __sfr __at (0xF95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0         : 1;
@@ -561,9 +561,9 @@ typedef union {
                unsigned TRISD7         : 1;
        };
 } __TRISD_t;
-extern volatile __TRISD_t __at 0xF95 TRISDbits;
+extern volatile __TRISD_t __at (0xF95) TRISDbits;
 
-extern __sfr __at 0xF96 TRISE;
+extern __sfr __at (0xF96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0         : 1;
@@ -576,9 +576,9 @@ typedef union {
                unsigned                : 1;
        };
 } __TRISE_t;
-extern volatile __TRISE_t __at 0xF96 TRISEbits;
+extern volatile __TRISE_t __at (0xF96) TRISEbits;
 
-extern __sfr __at 0xF99 ADCHS;
+extern __sfr __at (0xF99) ADCHS;
 typedef union {
        struct {
                unsigned SASEL          : 2;
@@ -587,9 +587,9 @@ typedef union {
                unsigned SDSEL          : 2;
        };
 } __ADCHS_t;
-extern volatile __ADCHS_t __at 0xF99 ADCHSbits;
+extern volatile __ADCHS_t __at (0xF99) ADCHSbits;
 
-extern __sfr __at 0xF9A ADCON3;
+extern __sfr __at (0xF9A) ADCON3;
 typedef union {
        struct {
                unsigned SSRC           : 5;
@@ -597,9 +597,9 @@ typedef union {
                unsigned ADRS           : 2;
        };
 } __ADCON3_t;
-extern volatile __ADCON3_t __at 0xF9A ADCON3bits;
+extern volatile __ADCON3_t __at (0xF9A) ADCON3bits;
 
-extern __sfr __at 0xF9B OSCTUNE;
+extern __sfr __at (0xF9B) OSCTUNE;
 typedef union {
        struct {
                unsigned TUN            : 6;
@@ -607,9 +607,9 @@ typedef union {
                unsigned                : 1;
        };
 } __OSCTUNE_t;
-extern volatile __OSCTUNE_t __at 0xF9B OSCTUNEbits;
+extern volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;
 
-extern __sfr __at 0xF9D PIE1;
+extern __sfr __at (0xF9D) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE         : 1;
@@ -622,9 +622,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PIE1_t;
-extern volatile __PIE1_t __at 0xF9D PIE1bits;
+extern volatile __PIE1_t __at (0xF9D) PIE1bits;
 
-extern __sfr __at 0xF9E PIR1;
+extern __sfr __at (0xF9E) PIR1;
 typedef union {
        struct {
                unsigned TMR1IF         : 1;
@@ -637,9 +637,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PIR1_t;
-extern volatile __PIR1_t __at 0xF9E PIR1bits;
+extern volatile __PIR1_t __at (0xF9E) PIR1bits;
 
-extern __sfr __at 0xF9F IPR1;
+extern __sfr __at (0xF9F) IPR1;
 typedef union {
        struct {
                unsigned TMR1IP         : 1;
@@ -652,9 +652,9 @@ typedef union {
                unsigned                : 1;
        };
 } __IPR1_t;
-extern volatile __IPR1_t __at 0xF9F IPR1bits;
+extern volatile __IPR1_t __at (0xF9F) IPR1bits;
 
-extern __sfr __at 0xFA0 PIE2;
+extern __sfr __at (0xFA0) PIE2;
 typedef union {
        struct {
                unsigned CCP2IE         : 1;
@@ -667,9 +667,9 @@ typedef union {
                unsigned OSFIE          : 1;
        };
 } __PIE2_t;
-extern volatile __PIE2_t __at 0xFA0 PIE2bits;
+extern volatile __PIE2_t __at (0xFA0) PIE2bits;
 
-extern __sfr __at 0xFA1 PIR2;
+extern __sfr __at (0xFA1) PIR2;
 typedef union {
        struct {
                unsigned CCP2IF         : 1;
@@ -682,9 +682,9 @@ typedef union {
                unsigned OSFIF          : 1;
        };
 } __PIR2_t;
-extern volatile __PIR2_t __at 0xFA1 PIR2bits;
+extern volatile __PIR2_t __at (0xFA1) PIR2bits;
 
-extern __sfr __at 0xFA2 IPR2;
+extern __sfr __at (0xFA2) IPR2;
 typedef union {
        struct {
                unsigned CCP2IP         : 1;
@@ -697,9 +697,9 @@ typedef union {
                unsigned OSFIP          : 1;
        };
 } __IPR2_t;
-extern volatile __IPR2_t __at 0xFA2 IPR2bits;
+extern volatile __IPR2_t __at (0xFA2) IPR2bits;
 
-extern __sfr __at 0xFA3 PIE3;
+extern __sfr __at (0xFA3) PIE3;
 typedef union {
        struct {
                unsigned TMR5IE         : 1;
@@ -712,9 +712,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PIE3_t;
-extern volatile __PIE3_t __at 0xFA3 PIE3bits;
+extern volatile __PIE3_t __at (0xFA3) PIE3bits;
 
-extern __sfr __at 0xFA4 PIR3;
+extern __sfr __at (0xFA4) PIR3;
 typedef union {
        struct {
                unsigned TMR5IF         : 1;
@@ -727,9 +727,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PIR3_t;
-extern volatile __PIR3_t __at 0xFA4 PIR3bits;
+extern volatile __PIR3_t __at (0xFA4) PIR3bits;
 
-extern __sfr __at 0xFA5 IPR3;
+extern __sfr __at (0xFA5) IPR3;
 typedef union {
        struct {
                unsigned TMR5IP         : 1;
@@ -742,9 +742,9 @@ typedef union {
                unsigned                : 1;
        };
 } __IPR3_t;
-extern volatile __IPR3_t __at 0xFA5 IPR3bits;
+extern volatile __IPR3_t __at (0xFA5) IPR3bits;
 
-extern __sfr __at 0xFA6 EECON1;
+extern __sfr __at (0xFA6) EECON1;
 typedef union {
        struct {
                unsigned RD             : 1;
@@ -757,15 +757,15 @@ typedef union {
                unsigned EEPGD          : 1;
        };
 } __EECON1_t;
-extern volatile __EECON1_t __at 0xFA6 EECON1bits;
+extern volatile __EECON1_t __at (0xFA6) EECON1bits;
 
-extern __sfr __at 0xFA7 EECON2;
+extern __sfr __at (0xFA7) EECON2;
 
-extern __sfr __at 0xFA8 EEDATA;
+extern __sfr __at (0xFA8) EEDATA;
 
-extern __sfr __at 0xFA9 EEADR;
+extern __sfr __at (0xFA9) EEADR;
 
-extern __sfr __at 0xFAA BAUDCTL;
+extern __sfr __at (0xFAA) BAUDCTL;
 typedef union {
        struct {
                unsigned ABDEN          : 1;
@@ -778,9 +778,9 @@ typedef union {
                unsigned                : 1;
        };
 } __BAUDCTL_t;
-extern volatile __BAUDCTL_t __at 0xFAA BAUDCTLbits;
+extern volatile __BAUDCTL_t __at (0xFAA) BAUDCTLbits;
 
-extern __sfr __at 0xFAB RCSTA;
+extern __sfr __at (0xFAB) RCSTA;
 typedef union {
        struct {
                unsigned RX9D           : 1;
@@ -793,9 +793,9 @@ typedef union {
                unsigned SPEN           : 1;
        };
 } __RCSTA_t;
-extern volatile __RCSTA_t __at 0xFAB RCSTAbits;
+extern volatile __RCSTA_t __at (0xFAB) RCSTAbits;
 
-extern __sfr __at 0xFAC TXSTA;
+extern __sfr __at (0xFAC) TXSTA;
 typedef union {
        struct {
                unsigned TX9D           : 1;
@@ -808,17 +808,17 @@ typedef union {
                unsigned CSRC           : 1;
        };
 } __TXSTA_t;
-extern volatile __TXSTA_t __at 0xFAC TXSTAbits;
+extern volatile __TXSTA_t __at (0xFAC) TXSTAbits;
 
-extern __sfr __at 0xFAD TXREG;
+extern __sfr __at (0xFAD) TXREG;
 
-extern __sfr __at 0xFAE RCREG;
+extern __sfr __at (0xFAE) RCREG;
 
-extern __sfr __at 0xFAF SPBRG;
+extern __sfr __at (0xFAF) SPBRG;
 
-extern __sfr __at 0xFB0 SPBRGH;
+extern __sfr __at (0xFB0) SPBRGH;
 
-extern __sfr __at 0xFB6 QEICON;
+extern __sfr __at (0xFB6) QEICON;
 typedef union {
        struct {
                unsigned PDEC           : 2;
@@ -828,9 +828,9 @@ typedef union {
                unsigned nVELM          : 1;
        };
 } __QEICON_t;
-extern volatile __QEICON_t __at 0xFB6 QEICONbits;
+extern volatile __QEICON_t __at (0xFB6) QEICONbits;
 
-extern __sfr __at 0xFB7 T5CON;
+extern __sfr __at (0xFB7) T5CON;
 typedef union {
        struct {
                unsigned TMR5ON         : 1;
@@ -842,9 +842,9 @@ typedef union {
                unsigned T5SEN          : 1;
        };
 } __T5CON_t;
-extern volatile __T5CON_t __at 0xFB7 T5CONbits;
+extern volatile __T5CON_t __at (0xFB7) T5CONbits;
 
-extern __sfr __at 0xFB8 ANSEL0;
+extern __sfr __at (0xFB8) ANSEL0;
 typedef union {
        struct {
                unsigned AN0            : 1;
@@ -857,9 +857,9 @@ typedef union {
                unsigned AN7            : 1;
        };
 } __ANSEL0_t;
-extern volatile __ANSEL0_t __at 0xFB8 ANSEL0bits;
+extern volatile __ANSEL0_t __at (0xFB8) ANSEL0bits;
 
-extern __sfr __at 0xFB9 ANSEL1;
+extern __sfr __at (0xFB9) ANSEL1;
 typedef union {
        struct {
                unsigned ANS8           : 1;
@@ -872,9 +872,9 @@ typedef union {
                unsigned                : 1;
        };
 } __ANSEL1_t;
-extern volatile __ANSEL1_t __at 0xFB9 ANSEL1bits;
+extern volatile __ANSEL1_t __at (0xFB9) ANSEL1bits;
 
-extern __sfr __at 0xFBA CCP2CON;
+extern __sfr __at (0xFBA) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M          : 4;
@@ -883,13 +883,13 @@ typedef union {
                unsigned                : 1;
        };
 } __CCP2CON_t;
-extern volatile __CCP2CON_t __at 0xFBA CCP2CONbits;
+extern volatile __CCP2CON_t __at (0xFBA) CCP2CONbits;
 
-extern __sfr __at 0xFBB CCPR2L;
+extern __sfr __at (0xFBB) CCPR2L;
 
-extern __sfr __at 0xFBC CCPR2H;
+extern __sfr __at (0xFBC) CCPR2H;
 
-extern __sfr __at 0xFBD CCP1CON;
+extern __sfr __at (0xFBD) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M          : 4;
@@ -898,13 +898,13 @@ typedef union {
                unsigned                : 1;
        };
 } __CCP1CON_t;
-extern volatile __CCP1CON_t __at 0xFBD CCP1CONbits;
+extern volatile __CCP1CON_t __at (0xFBD) CCP1CONbits;
 
-extern __sfr __at 0xFBE CCPR1L;
+extern __sfr __at (0xFBE) CCPR1L;
 
-extern __sfr __at 0xFBF CCPR1H;
+extern __sfr __at (0xFBF) CCPR1H;
 
-extern __sfr __at 0xFC0 ADCON2;
+extern __sfr __at (0xFC0) ADCON2;
 typedef union {
        struct {
                unsigned ADCS           : 3;
@@ -912,9 +912,9 @@ typedef union {
                unsigned ADFM           : 1;
        };
 } __ADCON2_t;
-extern volatile __ADCON2_t __at 0xFC0 ADCON2bits;
+extern volatile __ADCON2_t __at (0xFC0) ADCON2bits;
 
-extern __sfr __at 0xFC1 ADCON1;
+extern __sfr __at (0xFC1) ADCON1;
 typedef union {
        struct {
                unsigned ADPNT          : 2;
@@ -925,9 +925,9 @@ typedef union {
                unsigned VCFG           : 2;
        };
 } __ADCON1_t;
-extern volatile __ADCON1_t __at 0xFC1 ADCON1bits;
+extern volatile __ADCON1_t __at (0xFC1) ADCON1bits;
 
-extern __sfr __at 0xFC2 ADCON0;
+extern __sfr __at (0xFC2) ADCON0;
 typedef union {
        struct {
                unsigned ADON           : 1;
@@ -939,13 +939,13 @@ typedef union {
                unsigned                : 1;
        };
 } __ADCON0_t;
-extern volatile __ADCON0_t __at 0xFC2 ADCON0bits;
+extern volatile __ADCON0_t __at (0xFC2) ADCON0bits;
 
-extern __sfr __at 0xFC3 ADRESL;
+extern __sfr __at (0xFC3) ADRESL;
 
-extern __sfr __at 0xFC4 ADRESH;
+extern __sfr __at (0xFC4) ADRESH;
 
-extern __sfr __at 0xFC6 SSPCON;
+extern __sfr __at (0xFC6) SSPCON;
 typedef union {
        struct {
                unsigned SSPM           : 4;
@@ -955,9 +955,9 @@ typedef union {
                unsigned WCOL           : 1;
        };
 } __SSPCON_t;
-extern volatile __SSPCON_t __at 0xFC6 SSPCONbits;
+extern volatile __SSPCON_t __at (0xFC6) SSPCONbits;
 
-extern __sfr __at 0xFC7 SSPSTAT;
+extern __sfr __at (0xFC7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF             : 1;
@@ -970,13 +970,13 @@ typedef union {
                unsigned SMP            : 1;
        };
 } __SSPSTAT_t;
-extern volatile __SSPSTAT_t __at 0xFC7 SSPSTATbits;
+extern volatile __SSPSTAT_t __at (0xFC7) SSPSTATbits;
 
-extern __sfr __at 0xFC8 SSPADD;
+extern __sfr __at (0xFC8) SSPADD;
 
-extern __sfr __at 0xFC9 SSPBUF;
+extern __sfr __at (0xFC9) SSPBUF;
 
-extern __sfr __at 0xFCA T2CON;
+extern __sfr __at (0xFCA) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS         : 2;
@@ -985,13 +985,13 @@ typedef union {
                unsigned                : 1;
        };
 } __T2CON_t;
-extern volatile __T2CON_t __at 0xFCA T2CONbits;
+extern volatile __T2CON_t __at (0xFCA) T2CONbits;
 
-extern __sfr __at 0xFCB PR2;
+extern __sfr __at (0xFCB) PR2;
 
-extern __sfr __at 0xFCC TMR2;
+extern __sfr __at (0xFCC) TMR2;
 
-extern __sfr __at 0xFCD T1CON;
+extern __sfr __at (0xFCD) T1CON;
 typedef union {
        struct {
                unsigned TMR1ON         : 1;
@@ -1003,13 +1003,13 @@ typedef union {
                unsigned RD16           : 1;
        };
 } __T1CON_t;
-extern volatile __T1CON_t __at 0xFCD T1CONbits;
+extern volatile __T1CON_t __at (0xFCD) T1CONbits;
 
-extern __sfr __at 0xFCE TMR1L;
+extern __sfr __at (0xFCE) TMR1L;
 
-extern __sfr __at 0xFCF TMR1H;
+extern __sfr __at (0xFCF) TMR1H;
 
-extern __sfr __at 0xFD0 RCON;
+extern __sfr __at (0xFD0) RCON;
 typedef union {
        struct {
                unsigned nBOR           : 1;
@@ -1022,18 +1022,18 @@ typedef union {
                unsigned IPEN           : 1;
        };
 } __RCON_t;
-extern volatile __RCON_t __at 0xFD0 RCONbits;
+extern volatile __RCON_t __at (0xFD0) RCONbits;
 
-extern __sfr __at 0xFD1 WDTCON;
+extern __sfr __at (0xFD1) WDTCON;
 typedef union {
        struct {
                unsigned SWDTEN         : 1;
                unsigned WDT            : 7;
        };
 } __WDTCON_t;
-extern volatile __WDTCON_t __at 0xFD1 WDTCONbits;
+extern volatile __WDTCON_t __at (0xFD1) WDTCONbits;
 
-extern __sfr __at 0xFD2 LVDCON;
+extern __sfr __at (0xFD2) LVDCON;
 typedef union {
        struct {
                unsigned LVDL           : 4;
@@ -1043,9 +1043,9 @@ typedef union {
                unsigned                : 1;
        };
 } __LVDCON_t;
-extern volatile __LVDCON_t __at 0xFD2 LVDCONbits;
+extern volatile __LVDCON_t __at (0xFD2) LVDCONbits;
 
-extern __sfr __at 0xFD3 OSCCON;
+extern __sfr __at (0xFD3) OSCCON;
 typedef union {
        struct {
                unsigned SCS            : 2;
@@ -1055,9 +1055,9 @@ typedef union {
                unsigned IDLEN          : 1;
        };
 } __OSCCON_t;
-extern volatile __OSCCON_t __at 0xFD3 OSCCONbits;
+extern volatile __OSCCON_t __at (0xFD3) OSCCONbits;
 
-extern __sfr __at 0xFD5 T0CON;
+extern __sfr __at (0xFD5) T0CON;
 typedef union {
        struct {
                unsigned T0PS           : 4;
@@ -1067,13 +1067,13 @@ typedef union {
                unsigned TMR0ON         : 1;
        };
 } __T0CON_t;
-extern volatile __T0CON_t __at 0xFD5 T0CONbits;
+extern volatile __T0CON_t __at (0xFD5) T0CONbits;
 
-extern __sfr __at 0xFD6 TMR0L;
+extern __sfr __at (0xFD6) TMR0L;
 
-extern __sfr __at 0xFD7 TMR0H;
+extern __sfr __at (0xFD7) TMR0H;
 
-extern __sfr __at 0xFD8 STATUS;
+extern __sfr __at (0xFD8) STATUS;
 typedef union {
        struct {
                unsigned C              : 1;
@@ -1086,11 +1086,11 @@ typedef union {
                unsigned                : 1;
        };
 } __STATUS_t;
-extern volatile __STATUS_t __at 0xFD8 STATUSbits;
+extern volatile __STATUS_t __at (0xFD8) STATUSbits;
 
-extern __sfr __at 0xFD9 FSR2L;
+extern __sfr __at (0xFD9) FSR2L;
 
-extern __sfr __at 0xFDA FSR2H;
+extern __sfr __at (0xFDA) FSR2H;
 typedef union {
        struct {
                unsigned FSR2H          : 4;
@@ -1100,19 +1100,19 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR2H_t;
-extern volatile __FSR2H_t __at 0xFDA FSR2Hbits;
+extern volatile __FSR2H_t __at (0xFDA) FSR2Hbits;
 
-extern __sfr __at 0xFDB PLUSW2;
+extern __sfr __at (0xFDB) PLUSW2;
 
-extern __sfr __at 0xFDC PREINC2;
+extern __sfr __at (0xFDC) PREINC2;
 
-extern __sfr __at 0xFDD POSTDEC2;
+extern __sfr __at (0xFDD) POSTDEC2;
 
-extern __sfr __at 0xFDE POSTINC2;
+extern __sfr __at (0xFDE) POSTINC2;
 
-extern __sfr __at 0xFDF INDF2;
+extern __sfr __at (0xFDF) INDF2;
 
-extern __sfr __at 0xFE0 BSR;
+extern __sfr __at (0xFE0) BSR;
 typedef union {
        struct {
                unsigned BSR            : 4;
@@ -1122,11 +1122,11 @@ typedef union {
                unsigned                : 1;
        };
 } __BSR_t;
-extern volatile __BSR_t __at 0xFE0 BSRbits;
+extern volatile __BSR_t __at (0xFE0) BSRbits;
 
-extern __sfr __at 0xFE1 FSR1L;
+extern __sfr __at (0xFE1) FSR1L;
 
-extern __sfr __at 0xFE2 FSR1H;
+extern __sfr __at (0xFE2) FSR1H;
 typedef union {
        struct {
                unsigned FSR1H          : 4;
@@ -1136,23 +1136,23 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR1H_t;
-extern volatile __FSR1H_t __at 0xFE2 FSR1Hbits;
+extern volatile __FSR1H_t __at (0xFE2) FSR1Hbits;
 
-extern __sfr __at 0xFE3 PLUSW1;
+extern __sfr __at (0xFE3) PLUSW1;
 
-extern __sfr __at 0xFE4 PREINC1;
+extern __sfr __at (0xFE4) PREINC1;
 
-extern __sfr __at 0xFE5 POSTDEC1;
+extern __sfr __at (0xFE5) POSTDEC1;
 
-extern __sfr __at 0xFE6 POSTINC1;
+extern __sfr __at (0xFE6) POSTINC1;
 
-extern __sfr __at 0xFE7 INDF1;
+extern __sfr __at (0xFE7) INDF1;
 
-extern __sfr __at 0xFE8 WREG;
+extern __sfr __at (0xFE8) WREG;
 
-extern __sfr __at 0xFE9 FSR0L;
+extern __sfr __at (0xFE9) FSR0L;
 
-extern __sfr __at 0xFEA FSR0H;
+extern __sfr __at (0xFEA) FSR0H;
 typedef union {
        struct {
                unsigned FSR0H          : 4;
@@ -1162,19 +1162,19 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR0H_t;
-extern volatile __FSR0H_t __at 0xFEA FSR0Hbits;
+extern volatile __FSR0H_t __at (0xFEA) FSR0Hbits;
 
-extern __sfr __at 0xFEB PLUSW0;
+extern __sfr __at (0xFEB) PLUSW0;
 
-extern __sfr __at 0xFEC PREINC0;
+extern __sfr __at (0xFEC) PREINC0;
 
-extern __sfr __at 0xFED POSTDEC0;
+extern __sfr __at (0xFED) POSTDEC0;
 
-extern __sfr __at 0xFEE POSTINC0;
+extern __sfr __at (0xFEE) POSTINC0;
 
-extern __sfr __at 0xFEF INDF0;
+extern __sfr __at (0xFEF) INDF0;
 
-extern __sfr __at 0xFF0 INTCON3;
+extern __sfr __at (0xFF0) INTCON3;
 typedef union {
        struct {
                unsigned INT1IF         : 1;
@@ -1187,9 +1187,9 @@ typedef union {
                unsigned INT2IP         : 1;
        };
 } __INTCON3_t;
-extern volatile __INTCON3_t __at 0xFF0 INTCON3bits;
+extern volatile __INTCON3_t __at (0xFF0) INTCON3bits;
 
-extern __sfr __at 0xFF1 INTCON2;
+extern __sfr __at (0xFF1) INTCON2;
 typedef union {
        struct {
                unsigned RBIP           : 1;
@@ -1202,9 +1202,9 @@ typedef union {
                unsigned nRBPU          : 1;
        };
 } __INTCON2_t;
-extern volatile __INTCON2_t __at 0xFF1 INTCON2bits;
+extern volatile __INTCON2_t __at (0xFF1) INTCON2bits;
 
-extern __sfr __at 0xFF2 INTCON;
+extern __sfr __at (0xFF2) INTCON;
 typedef union {
        struct {
                unsigned RBIF           : 1;
@@ -1237,19 +1237,19 @@ typedef union {
                unsigned GIEH           : 1;
        };
 } __INTCON_t;
-extern volatile __INTCON_t __at 0xFF2 INTCONbits;
+extern volatile __INTCON_t __at (0xFF2) INTCONbits;
 
-extern __sfr __at 0xFF3 PRODL;
+extern __sfr __at (0xFF3) PRODL;
 
-extern __sfr __at 0xFF4 PRODH;
+extern __sfr __at (0xFF4) PRODH;
 
-extern __sfr __at 0xFF5 TABLAT;
+extern __sfr __at (0xFF5) TABLAT;
 
-extern __sfr __at 0xFF6 TBLPTRL;
+extern __sfr __at (0xFF6) TBLPTRL;
 
-extern __sfr __at 0xFF7 TBLPTRH;
+extern __sfr __at (0xFF7) TBLPTRH;
 
-extern __sfr __at 0xFF8 TBLPTRU;
+extern __sfr __at (0xFF8) TBLPTRU;
 typedef union {
        struct {
                unsigned TBLPTRU        : 5;
@@ -1258,19 +1258,19 @@ typedef union {
                unsigned                : 1;
        };
 } __TBLPTRU_t;
-extern volatile __TBLPTRU_t __at 0xFF8 TBLPTRUbits;
+extern volatile __TBLPTRU_t __at (0xFF8) TBLPTRUbits;
 
-extern __sfr __at 0xFF9 PCL;
+extern __sfr __at (0xFF9) PCL;
 
-extern __sfr __at 0xFFA PCLATH;
+extern __sfr __at (0xFFA) PCLATH;
 typedef union {
        struct {
                unsigned PCH            : 8;
        };
 } __PCLATH_t;
-extern volatile __PCLATH_t __at 0xFFA PCLATHbits;
+extern volatile __PCLATH_t __at (0xFFA) PCLATHbits;
 
-extern __sfr __at 0xFFB PCLATU;
+extern __sfr __at (0xFFB) PCLATU;
 typedef union {
        struct {
                unsigned PCU            : 5;
@@ -1279,9 +1279,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PCLATU_t;
-extern volatile __PCLATU_t __at 0xFFB PCLATUbits;
+extern volatile __PCLATU_t __at (0xFFB) PCLATUbits;
 
-extern __sfr __at 0xFFC STKPTR;
+extern __sfr __at (0xFFC) STKPTR;
 typedef union {
        struct {
                unsigned STKPTR         : 5;
@@ -1290,13 +1290,13 @@ typedef union {
                unsigned STKFUL         : 1;
        };
 } __STKPTR_t;
-extern volatile __STKPTR_t __at 0xFFC STKPTRbits;
+extern volatile __STKPTR_t __at (0xFFC) STKPTRbits;
 
-extern __sfr __at 0xFFD TOSL;
+extern __sfr __at (0xFFD) TOSL;
 
-extern __sfr __at 0xFFE TOSH;
+extern __sfr __at (0xFFE) TOSH;
 
-extern __sfr __at 0xFFF TOSU;
+extern __sfr __at (0xFFF) TOSU;
 typedef union {
        struct {
                unsigned TOSU           : 5;
@@ -1305,7 +1305,7 @@ typedef union {
                unsigned                : 1;
        };
 } __TOSU_t;
-extern volatile __TOSU_t __at 0xFFF TOSUbits;
+extern volatile __TOSU_t __at (0xFFF) TOSUbits;
 
 /* Configuration register locations */
 #define        CONFIG1H        0x300001

diff --git a/device/include/pic16/pic18f442.h b/device/include/pic16/pic18f442.h
index 8aba53c67391711436c768210a82614abc31a702..f4c101b43af03ba00c32532831a22ea13a187f8e 100644 (file)
--- a/device/include/pic16/pic18f442.h
+++ b/device/include/pic16/pic18f442.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F442_H__
 #define __PIC18F442_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 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -127,9 +127,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -154,9 +154,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -192,9 +192,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -208,9 +208,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;
@@ -224,9 +224,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -240,9 +240,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -256,9 +256,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -272,9 +272,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -288,9 +288,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;
@@ -304,9 +304,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -320,9 +320,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -336,9 +336,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned :1;
@@ -352,9 +352,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -368,9 +368,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;
@@ -384,9 +384,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;
@@ -400,9 +400,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 CCP2IE:1;
@@ -416,9 +416,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 CCP2IF:1;
@@ -432,9 +432,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 CCP2IP:1;
@@ -448,9 +448,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;
@@ -464,12 +464,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -483,9 +483,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;
@@ -499,12 +499,12 @@ 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 0xfb1 T3CON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -518,11 +518,11 @@ 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 0xfba CCP2CON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -536,11 +536,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -554,11 +554,11 @@ typedef union {
        };
 } __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 0xfc1 ADCON1;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -572,9 +572,9 @@ typedef union {
        };
 } __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;
@@ -588,11 +588,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -606,9 +606,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -622,9 +622,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -638,11 +638,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -656,11 +656,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;
@@ -674,11 +674,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;
@@ -692,9 +692,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;
@@ -719,9 +719,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;
@@ -746,9 +746,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;
@@ -762,9 +762,9 @@ 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 (0xfd5) T0CON;
 typedef union {
        struct {
                unsigned T0PS0:1;
@@ -778,11 +778,11 @@ typedef union {
        };
 } __T0CONbits_t;
 
-extern volatile __T0CONbits_t __at 0xfd5 T0CONbits;
+extern volatile __T0CONbits_t __at (0xfd5) T0CONbits;
 
-extern __sfr __at 0xfd6 TMR0L;
-extern __sfr __at 0xfd7 TMR0H;
-extern __sfr __at 0xfd8 STATUS;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -796,32 +796,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;
@@ -846,9 +846,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;
@@ -862,9 +862,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;
@@ -878,18 +878,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;
@@ -903,11 +903,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 */

diff --git a/device/include/pic16/pic18f4455.h b/device/include/pic16/pic18f4455.h
index a5a50bf150d72fba8132680338b37426dcf392f6..73daaacacde95914266c4e276cd6dddf61f38d4f 100644 (file)
--- a/device/include/pic16/pic18f4455.h
+++ b/device/include/pic16/pic18f4455.h
@@ -17,15 +17,15 @@
 #ifndef __PIC18F4455_H__
 #define __PIC18F4455_H__ 1
 
-extern __sfr __at 0xF62 SPPDATA;
+extern __sfr __at (0xF62) SPPDATA;
 typedef union {
        struct {
                unsigned DATA           : 8;
        };
 } __SPPDATA_t;
-extern volatile __SPPDATA_t __at 0xF62 SPPDATAbits;
+extern volatile __SPPDATA_t __at (0xF62) SPPDATAbits;
 
-extern __sfr __at 0xF63 SPPCFG;
+extern __sfr __at (0xF63) SPPCFG;
 typedef union {
        struct {
                unsigned WS             : 4;
@@ -34,9 +34,9 @@ typedef union {
                unsigned CLKCFG         : 2;
        };
 } __SPPCFG_t;
-extern volatile __SPPCFG_t __at 0xF63 SPPCFGbits;
+extern volatile __SPPCFG_t __at (0xF63) SPPCFGbits;
 
-extern __sfr __at 0xF64 SPPEPS;
+extern __sfr __at (0xF64) SPPEPS;
 typedef union {
        struct {
                unsigned ADDR           : 4;
@@ -46,9 +46,9 @@ typedef union {
                unsigned RDSPP          : 1;
        };
 } __SPPEPS_t;
-extern volatile __SPPEPS_t __at 0xF64 SPPEPSbits;
+extern volatile __SPPEPS_t __at (0xF64) SPPEPSbits;
 
-extern __sfr __at 0xF65 SPPCON;
+extern __sfr __at (0xF65) SPPCON;
 typedef union {
        struct {
                unsigned SPPEN          : 1;
@@ -61,17 +61,17 @@ typedef union {
                unsigned                : 1;
        };
 } __SPPCON_t;
-extern volatile __SPPCON_t __at 0xF65 SPPCONbits;
+extern volatile __SPPCON_t __at (0xF65) SPPCONbits;
 
-extern __sfr __at 0xF66 UFRML;
+extern __sfr __at (0xF66) UFRML;
 typedef union {
        struct {
                unsigned FRM            : 8;
        };
 } __UFRML_t;
-extern volatile __UFRML_t __at 0xF66 UFRMLbits;
+extern volatile __UFRML_t __at (0xF66) UFRMLbits;
 
-extern __sfr __at 0xF67 UFRMH;
+extern __sfr __at (0xF67) UFRMH;
 typedef union {
        struct {
                unsigned FRM            : 3;
@@ -82,9 +82,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UFRMH_t;
-extern volatile __UFRMH_t __at 0xF67 UFRMHbits;
+extern volatile __UFRMH_t __at (0xF67) UFRMHbits;
 
-extern __sfr __at 0xF68 UIR;
+extern __sfr __at (0xF68) UIR;
 typedef union {
        struct {
                unsigned URSTIF         : 1;
@@ -97,9 +97,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UIR_t;
-extern volatile __UIR_t __at 0xF68 UIRbits;
+extern volatile __UIR_t __at (0xF68) UIRbits;
 
-extern __sfr __at 0xF69 UIE;
+extern __sfr __at (0xF69) UIE;
 typedef union {
        struct {
                unsigned URSTIE         : 1;
@@ -112,9 +112,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UIE_t;
-extern volatile __UIE_t __at 0xF69 UIEbits;
+extern volatile __UIE_t __at (0xF69) UIEbits;
 
-extern __sfr __at 0xF6A UEIR;
+extern __sfr __at (0xF6A) UEIR;
 typedef union {
        struct {
                unsigned PIDEF          : 1;
@@ -127,9 +127,9 @@ typedef union {
                unsigned BTSEF          : 1;
        };
 } __UEIR_t;
-extern volatile __UEIR_t __at 0xF6A UEIRbits;
+extern volatile __UEIR_t __at (0xF6A) UEIRbits;
 
-extern __sfr __at 0xF6B UEIE;
+extern __sfr __at (0xF6B) UEIE;
 typedef union {
        struct {
                unsigned PIDEE          : 1;
@@ -142,9 +142,9 @@ typedef union {
                unsigned BTSEE          : 1;
        };
 } __UEIE_t;
-extern volatile __UEIE_t __at 0xF6B UEIEbits;
+extern volatile __UEIE_t __at (0xF6B) UEIEbits;
 
-extern __sfr __at 0xF6C USTAT;
+extern __sfr __at (0xF6C) USTAT;
 typedef union {
        struct {
                unsigned                : 1;
@@ -154,9 +154,9 @@ typedef union {
                unsigned                : 1;
        };
 } __USTAT_t;
-extern volatile __USTAT_t __at 0xF6C USTATbits;
+extern volatile __USTAT_t __at (0xF6C) USTATbits;
 
-extern __sfr __at 0xF6D UCON;
+extern __sfr __at (0xF6D) UCON;
 typedef union {
        struct {
                unsigned                : 1;
@@ -169,18 +169,18 @@ typedef union {
                unsigned                : 1;
        };
 } __UCON_t;
-extern volatile __UCON_t __at 0xF6D UCONbits;
+extern volatile __UCON_t __at (0xF6D) UCONbits;
 
-extern __sfr __at 0xF6E UADDR;
+extern __sfr __at (0xF6E) UADDR;
 typedef union {
        struct {
                unsigned ADDR           : 7;
                unsigned                : 1;
        };
 } __UADDR_t;
-extern volatile __UADDR_t __at 0xF6E UADDRbits;
+extern volatile __UADDR_t __at (0xF6E) UADDRbits;
 
-extern __sfr __at 0xF6F UCFG;
+extern __sfr __at (0xF6F) UCFG;
 typedef union {
        struct {
                unsigned PPB            : 2;
@@ -192,9 +192,9 @@ typedef union {
                unsigned UTEYE          : 1;
        };
 } __UCFG_t;
-extern volatile __UCFG_t __at 0xF6F UCFGbits;
+extern volatile __UCFG_t __at (0xF6F) UCFGbits;
 
-extern __sfr __at 0xF70 UEP0;
+extern __sfr __at (0xF70) UEP0;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -207,9 +207,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP0_t;
-extern volatile __UEP0_t __at 0xF70 UEP0bits;
+extern volatile __UEP0_t __at (0xF70) UEP0bits;
 
-extern __sfr __at 0xF71 UEP1;
+extern __sfr __at (0xF71) UEP1;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -222,9 +222,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP1_t;
-extern volatile __UEP1_t __at 0xF71 UEP1bits;
+extern volatile __UEP1_t __at (0xF71) UEP1bits;
 
-extern __sfr __at 0xF72 UEP2;
+extern __sfr __at (0xF72) UEP2;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -237,9 +237,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP2_t;
-extern volatile __UEP2_t __at 0xF72 UEP2bits;
+extern volatile __UEP2_t __at (0xF72) UEP2bits;
 
-extern __sfr __at 0xF73 UEP3;
+extern __sfr __at (0xF73) UEP3;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -252,9 +252,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP3_t;
-extern volatile __UEP3_t __at 0xF73 UEP3bits;
+extern volatile __UEP3_t __at (0xF73) UEP3bits;
 
-extern __sfr __at 0xF74 UEP4;
+extern __sfr __at (0xF74) UEP4;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -267,9 +267,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP4_t;
-extern volatile __UEP4_t __at 0xF74 UEP4bits;
+extern volatile __UEP4_t __at (0xF74) UEP4bits;
 
-extern __sfr __at 0xF75 UEP5;
+extern __sfr __at (0xF75) UEP5;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -282,9 +282,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP5_t;
-extern volatile __UEP5_t __at 0xF75 UEP5bits;
+extern volatile __UEP5_t __at (0xF75) UEP5bits;
 
-extern __sfr __at 0xF76 UEP6;
+extern __sfr __at (0xF76) UEP6;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -297,9 +297,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP6_t;
-extern volatile __UEP6_t __at 0xF76 UEP6bits;
+extern volatile __UEP6_t __at (0xF76) UEP6bits;
 
-extern __sfr __at 0xF77 UEP7;
+extern __sfr __at (0xF77) UEP7;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -312,9 +312,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP7_t;
-extern volatile __UEP7_t __at 0xF77 UEP7bits;
+extern volatile __UEP7_t __at (0xF77) UEP7bits;
 
-extern __sfr __at 0xF78 UEP8;
+extern __sfr __at (0xF78) UEP8;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -327,9 +327,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP8_t;
-extern volatile __UEP8_t __at 0xF78 UEP8bits;
+extern volatile __UEP8_t __at (0xF78) UEP8bits;
 
-extern __sfr __at 0xF79 UEP9;
+extern __sfr __at (0xF79) UEP9;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -342,9 +342,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP9_t;
-extern volatile __UEP9_t __at 0xF79 UEP9bits;
+extern volatile __UEP9_t __at (0xF79) UEP9bits;
 
-extern __sfr __at 0xF7A UEP10;
+extern __sfr __at (0xF7A) UEP10;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -357,9 +357,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP10_t;
-extern volatile __UEP10_t __at 0xF7A UEP10bits;
+extern volatile __UEP10_t __at (0xF7A) UEP10bits;
 
-extern __sfr __at 0xF7B UEP11;
+extern __sfr __at (0xF7B) UEP11;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -372,9 +372,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP11_t;
-extern volatile __UEP11_t __at 0xF7B UEP11bits;
+extern volatile __UEP11_t __at (0xF7B) UEP11bits;
 
-extern __sfr __at 0xF7C UEP12;
+extern __sfr __at (0xF7C) UEP12;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -387,9 +387,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP12_t;
-extern volatile __UEP12_t __at 0xF7C UEP12bits;
+extern volatile __UEP12_t __at (0xF7C) UEP12bits;
 
-extern __sfr __at 0xF7D UEP13;
+extern __sfr __at (0xF7D) UEP13;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -402,9 +402,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP13_t;
-extern volatile __UEP13_t __at 0xF7D UEP13bits;
+extern volatile __UEP13_t __at (0xF7D) UEP13bits;
 
-extern __sfr __at 0xF7E UEP14;
+extern __sfr __at (0xF7E) UEP14;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -417,9 +417,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP14_t;
-extern volatile __UEP14_t __at 0xF7E UEP14bits;
+extern volatile __UEP14_t __at (0xF7E) UEP14bits;
 
-extern __sfr __at 0xF7F UEP15;
+extern __sfr __at (0xF7F) UEP15;
 typedef union {
        struct {
                unsigned EPSTALL        : 1;
@@ -432,9 +432,9 @@ typedef union {
                unsigned                : 1;
        };
 } __UEP15_t;
-extern volatile __UEP15_t __at 0xF7F UEP15bits;
+extern volatile __UEP15_t __at (0xF7F) UEP15bits;
 
-extern __sfr __at 0xF80 PORTA;
+extern __sfr __at (0xF80) PORTA;
 typedef union {
        struct {
                unsigned RA0            : 1;
@@ -471,9 +471,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTA_t;
-extern volatile __PORTA_t __at 0xF80 PORTAbits;
+extern volatile __PORTA_t __at (0xF80) PORTAbits;
 
-extern __sfr __at 0xF81 PORTB;
+extern __sfr __at (0xF81) PORTB;
 typedef union {
        struct {
                unsigned RB0            : 1;
@@ -500,9 +500,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTB_t;
-extern volatile __PORTB_t __at 0xF81 PORTBbits;
+extern volatile __PORTB_t __at (0xF81) PORTBbits;
 
-extern __sfr __at 0xF82 PORTC;
+extern __sfr __at (0xF82) PORTC;
 typedef union {
        struct {
                unsigned RC0            : 1;
@@ -549,9 +549,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTC_t;
-extern volatile __PORTC_t __at 0xF82 PORTCbits;
+extern volatile __PORTC_t __at (0xF82) PORTCbits;
 
-extern __sfr __at 0xF83 PORTD;
+extern __sfr __at (0xF83) PORTD;
 typedef union {
        struct {
                unsigned RD0            : 1;
@@ -578,9 +578,9 @@ typedef union {
                unsigned ECCPD          :1;
        };
 } __PORTD_t;
-extern volatile __PORTD_t __at 0xF83 PORTDbits;
+extern volatile __PORTD_t __at (0xF83) PORTDbits;
 
-extern __sfr __at 0xF84 PORTE;
+extern __sfr __at (0xF84) PORTE;
 typedef union {
        struct {
                unsigned RE0            : 1;
@@ -607,9 +607,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTE_t;
-extern volatile __PORTE_t __at 0xF84 PORTEbits;
+extern volatile __PORTE_t __at (0xF84) PORTEbits;
 
-extern __sfr __at 0xF89 LATA;
+extern __sfr __at (0xF89) LATA;
 typedef union {
        struct {
                unsigned LATA0          : 1;
@@ -622,9 +622,9 @@ typedef union {
                unsigned                : 1;
        };
 } __LATA_t;
-extern volatile __LATA_t __at 0xF89 LATAbits;
+extern volatile __LATA_t __at (0xF89) LATAbits;
 
-extern __sfr __at 0xF8A LATB;
+extern __sfr __at (0xF8A) LATB;
 typedef union {
        struct {
                unsigned LATB0          : 1;
@@ -637,9 +637,9 @@ typedef union {
                unsigned LATB7          : 1;
        };
 } __LATB_t;
-extern volatile __LATB_t __at 0xF8A LATBbits;
+extern volatile __LATB_t __at (0xF8A) LATBbits;
 
-extern __sfr __at 0xF8B LATC;
+extern __sfr __at (0xF8B) LATC;
 typedef union {
        struct {
                unsigned LATC0          : 1;
@@ -652,9 +652,9 @@ typedef union {
                unsigned LATC7          : 1;
        };
 } __LATC_t;
-extern volatile __LATC_t __at 0xF8B LATCbits;
+extern volatile __LATC_t __at (0xF8B) LATCbits;
 
-extern __sfr __at 0xF8C LATD;
+extern __sfr __at (0xF8C) LATD;
 typedef union {
        struct {
                unsigned LATD0          : 1;
@@ -667,9 +667,9 @@ typedef union {
                unsigned LATD7          : 1;
        };
 } __LATD_t;
-extern volatile __LATD_t __at 0xF8C LATDbits;
+extern volatile __LATD_t __at (0xF8C) LATDbits;
 
-extern __sfr __at 0xF8D LATE;
+extern __sfr __at (0xF8D) LATE;
 typedef union {
        struct {
                unsigned LATE0          : 1;
@@ -682,9 +682,9 @@ typedef union {
                unsigned                : 1;
        };
 } __LATE_t;
-extern volatile __LATE_t __at 0xF8D LATEbits;
+extern volatile __LATE_t __at (0xF8D) LATEbits;
 
-extern __sfr __at 0xF92 TRISA;
+extern __sfr __at (0xF92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0         : 1;
@@ -697,9 +697,9 @@ typedef union {
                unsigned                : 1;
        };
 } __TRISA_t;
-extern volatile __TRISA_t __at 0xF92 TRISAbits;
+extern volatile __TRISA_t __at (0xF92) TRISAbits;
 
-extern __sfr __at 0xF93 TRISB;
+extern __sfr __at (0xF93) TRISB;
 typedef union {
        struct {
                unsigned TRISB0         : 1;
@@ -712,9 +712,9 @@ typedef union {
                unsigned TRISB7         : 1;
        };
 } __TRISB_t;
-extern volatile __TRISB_t __at 0xF93 TRISBbits;
+extern volatile __TRISB_t __at (0xF93) TRISBbits;
 
-extern __sfr __at 0xF94 TRISC;
+extern __sfr __at (0xF94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0         : 1;
@@ -727,9 +727,9 @@ typedef union {
                unsigned TRISC7         : 1;
        };
 } __TRISC_t;
-extern volatile __TRISC_t __at 0xF94 TRISCbits;
+extern volatile __TRISC_t __at (0xF94) TRISCbits;
 
-extern __sfr __at 0xF95 TRISD;
+extern __sfr __at (0xF95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0         : 1;
@@ -742,9 +742,9 @@ typedef union {
                unsigned TRISD7         : 1;
        };
 } __TRISD_t;
-extern volatile __TRISD_t __at 0xF95 TRISDbits;
+extern volatile __TRISD_t __at (0xF95) TRISDbits;
 
-extern __sfr __at 0xF96 TRISE;
+extern __sfr __at (0xF96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0         : 1;
@@ -757,9 +757,9 @@ typedef union {
                unsigned                : 1;
        };
 } __TRISE_t;
-extern volatile __TRISE_t __at 0xF96 TRISEbits;
+extern volatile __TRISE_t __at (0xF96) TRISEbits;
 
-extern __sfr __at 0xF9B OSCTUNE;
+extern __sfr __at (0xF9B) OSCTUNE;
 typedef union {
        struct {
                unsigned TUN            : 5;
@@ -768,9 +768,9 @@ typedef union {
                unsigned HF256DIV       : 1;
        };
 } __OSCTUNE_t;
-extern volatile __OSCTUNE_t __at 0xF9B OSCTUNEbits;
+extern volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;
 
-extern __sfr __at 0xF9D PIE1;
+extern __sfr __at (0xF9D) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE         : 1;
@@ -783,9 +783,9 @@ typedef union {
                unsigned SPPIE          : 1;
        };
 } __PIE1_t;
-extern volatile __PIE1_t __at 0xF9D PIE1bits;
+extern volatile __PIE1_t __at (0xF9D) PIE1bits;
 
-extern __sfr __at 0xF9E PIR1;
+extern __sfr __at (0xF9E) PIR1;
 typedef union {
        struct {
                unsigned TMR1IF         : 1;
@@ -798,9 +798,9 @@ typedef union {
                unsigned SPPIF          : 1;
        };
 } __PIR1_t;
-extern volatile __PIR1_t __at 0xF9E PIR1bits;
+extern volatile __PIR1_t __at (0xF9E) PIR1bits;
 
-extern __sfr __at 0xF9F IPR1;
+extern __sfr __at (0xF9F) IPR1;
 typedef union {
        struct {
                unsigned TMR1IP         : 1;
@@ -813,9 +813,9 @@ typedef union {
                unsigned SPPIP          : 1;
        };
 } __IPR1_t;
-extern volatile __IPR1_t __at 0xF9F IPR1bits;
+extern volatile __IPR1_t __at (0xF9F) IPR1bits;
 
-extern __sfr __at 0xFA0 PIE2;
+extern __sfr __at (0xFA0) PIE2;
 typedef union {
        struct {
                unsigned CCP2IE         : 1;
@@ -828,9 +828,9 @@ typedef union {
                unsigned OSCFIE         : 1;
        };
 } __PIE2_t;
-extern volatile __PIE2_t __at 0xFA0 PIE2bits;
+extern volatile __PIE2_t __at (0xFA0) PIE2bits;
 
-extern __sfr __at 0xFA1 PIR2;
+extern __sfr __at (0xFA1) PIR2;
 typedef union {
        struct {
                unsigned CCP2IF         : 1;
@@ -843,9 +843,9 @@ typedef union {
                unsigned OSCFIF         : 1;
        };
 } __PIR2_t;
-extern volatile __PIR2_t __at 0xFA1 PIR2bits;
+extern volatile __PIR2_t __at (0xFA1) PIR2bits;
 
-extern __sfr __at 0xFA2 IPR2;
+extern __sfr __at (0xFA2) IPR2;
 typedef union {
        struct {
                unsigned CCP2IP         : 1;
@@ -858,9 +858,9 @@ typedef union {
                unsigned OSCFIP         : 1;
        };
 } __IPR2_t;
-extern volatile __IPR2_t __at 0xFA2 IPR2bits;
+extern volatile __IPR2_t __at (0xFA2) IPR2bits;
 
-extern __sfr __at 0xFA6 EECON1;
+extern __sfr __at (0xFA6) EECON1;
 typedef union {
        struct {
                unsigned RD             : 1;
@@ -873,15 +873,15 @@ typedef union {
                unsigned EEPGD          : 1;
        };
 } __EECON1_t;
-extern volatile __EECON1_t __at 0xFA6 EECON1bits;
+extern volatile __EECON1_t __at (0xFA6) EECON1bits;
 
-extern __sfr __at 0xFA7 EECON2;
+extern __sfr __at (0xFA7) EECON2;
 
-extern __sfr __at 0xFA8 EEDATA;
+extern __sfr __at (0xFA8) EEDATA;
 
-extern __sfr __at 0xFA9 EEADR;
+extern __sfr __at (0xFA9) EEADR;
 
-extern __sfr __at 0xFAB RCSTA;
+extern __sfr __at (0xFAB) RCSTA;
 typedef union {
        struct {
                unsigned RX9D           : 1;
@@ -894,9 +894,9 @@ typedef union {
                unsigned SPEN           : 1;
        };
 } __RCSTA_t;
-extern volatile __RCSTA_t __at 0xFAB RCSTAbits;
+extern volatile __RCSTA_t __at (0xFAB) RCSTAbits;
 
-extern __sfr __at 0xFAC TXSTA;
+extern __sfr __at (0xFAC) TXSTA;
 typedef union {
        struct {
                unsigned TX9D           : 1;
@@ -909,17 +909,17 @@ typedef union {
                unsigned CSRC           : 1;
        };
 } __TXSTA_t;
-extern volatile __TXSTA_t __at 0xFAC TXSTAbits;
+extern volatile __TXSTA_t __at (0xFAC) TXSTAbits;
 
-extern __sfr __at 0xFAD TXREG;
+extern __sfr __at (0xFAD) TXREG;
 
-extern __sfr __at 0xFAE RCREG;
+extern __sfr __at (0xFAE) RCREG;
 
-extern __sfr __at 0xFAF SPBRG;
+extern __sfr __at (0xFAF) SPBRG;
 
-extern __sfr __at 0xFB0 SPBRGH;
+extern __sfr __at (0xFB0) SPBRGH;
 
-extern __sfr __at 0xFB1 T3CON;
+extern __sfr __at (0xFB1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON         : 1;
@@ -931,13 +931,13 @@ typedef union {
                unsigned RD16           : 1;
        };
 } __T3CON_t;
-extern volatile __T3CON_t __at 0xFB1 T3CONbits;
+extern volatile __T3CON_t __at (0xFB1) T3CONbits;
 
-extern __sfr __at 0xFB2 TMR3L;
+extern __sfr __at (0xFB2) TMR3L;
 
-extern __sfr __at 0xFB3 TMR3H;
+extern __sfr __at (0xFB3) TMR3H;
 
-extern __sfr __at 0xFB4 CMCON;
+extern __sfr __at (0xFB4) CMCON;
 typedef union {
        struct {
                unsigned CM             : 3;
@@ -948,9 +948,9 @@ typedef union {
                unsigned C2OUT          : 1;
        };
 } __CMCON_t;
-extern volatile __CMCON_t __at 0xFB4 CMCONbits;
+extern volatile __CMCON_t __at (0xFB4) CMCONbits;
 
-extern __sfr __at 0xFB5 CVRCON;
+extern __sfr __at (0xFB5) CVRCON;
 typedef union {
        struct {
                unsigned CVR            : 4;
@@ -960,9 +960,9 @@ typedef union {
                unsigned CVREN          : 1;
        };
 } __CVRCON_t;
-extern volatile __CVRCON_t __at 0xFB5 CVRCONbits;
+extern volatile __CVRCON_t __at (0xFB5) CVRCONbits;
 
-extern __sfr __at 0xFB6 ECCP1AS;
+extern __sfr __at (0xFB6) ECCP1AS;
 typedef union {
        struct {
                unsigned PSSBD          : 2;
@@ -971,18 +971,18 @@ typedef union {
                unsigned ECCPASE        : 1;
        };
 } __ECCP1AS_t;
-extern volatile __ECCP1AS_t __at 0xFB6 ECCP1ASbits;
+extern volatile __ECCP1AS_t __at (0xFB6) ECCP1ASbits;
 
-extern __sfr __at 0xFB7 ECCP1DEL;
+extern __sfr __at (0xFB7) ECCP1DEL;
 typedef union {
        struct {
                unsigned PDC            : 7;
                unsigned PRSEN          : 1;
        };
 } __ECCP1DEL_t;
-extern volatile __ECCP1DEL_t __at 0xFB7 ECCP1DELbits;
+extern volatile __ECCP1DEL_t __at (0xFB7) ECCP1DELbits;
 
-extern __sfr __at 0xFB8 BAUDCON;
+extern __sfr __at (0xFB8) BAUDCON;
 typedef union {
        struct {
                unsigned ABDEN          : 1;
@@ -995,9 +995,9 @@ typedef union {
                unsigned ABDOVF         : 1;
        };
 } __BAUDCON_t;
-extern volatile __BAUDCON_t __at 0xFB8 BAUDCONbits;
+extern volatile __BAUDCON_t __at (0xFB8) BAUDCONbits;
 
-extern __sfr __at 0xFBA CCP2CON;
+extern __sfr __at (0xFBA) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M          : 4;
@@ -1006,13 +1006,13 @@ typedef union {
                unsigned                : 1;
        };
 } __CCP2CON_t;
-extern volatile __CCP2CON_t __at 0xFBA CCP2CONbits;
+extern volatile __CCP2CON_t __at (0xFBA) CCP2CONbits;
 
-extern __sfr __at 0xFBB CCPR2L;
+extern __sfr __at (0xFBB) CCPR2L;
 
-extern __sfr __at 0xFBC CCPR2H;
+extern __sfr __at (0xFBC) CCPR2H;
 
-extern __sfr __at 0xFBD ECCP1CON;
+extern __sfr __at (0xFBD) ECCP1CON;
 typedef union {
        struct {
                unsigned CCP1M          : 4;
@@ -1020,13 +1020,13 @@ typedef union {
                unsigned P1M            : 2;
        };
 } __ECCP1CON_t;
-extern volatile __ECCP1CON_t __at 0xFBD ECCP1CONbits;
+extern volatile __ECCP1CON_t __at (0xFBD) ECCP1CONbits;
 
-extern __sfr __at 0xFBE CCPR1L;
+extern __sfr __at (0xFBE) CCPR1L;
 
-extern __sfr __at 0xFBF CCPR1H;
+extern __sfr __at (0xFBF) CCPR1H;
 
-extern __sfr __at 0xFC0 ADCON2;
+extern __sfr __at (0xFC0) ADCON2;
 typedef union {
        struct {
                unsigned ADCS           : 3;
@@ -1035,9 +1035,9 @@ typedef union {
                unsigned ADFM           : 1;
        };
 } __ADCON2_t;
-extern volatile __ADCON2_t __at 0xFC0 ADCON2bits;
+extern volatile __ADCON2_t __at (0xFC0) ADCON2bits;
 
-extern __sfr __at 0xFC1 ADCON1;
+extern __sfr __at (0xFC1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG           : 4;
@@ -1046,9 +1046,9 @@ typedef union {
                unsigned                : 1;
        };
 } __ADCON1_t;
-extern volatile __ADCON1_t __at 0xFC1 ADCON1bits;
+extern volatile __ADCON1_t __at (0xFC1) ADCON1bits;
 
-extern __sfr __at 0xFC2 ADCON0;
+extern __sfr __at (0xFC2) ADCON0;
 typedef union {
        struct {
                unsigned ADON           : 1;
@@ -1058,13 +1058,13 @@ typedef union {
                unsigned                : 1;
        };
 } __ADCON0_t;
-extern volatile __ADCON0_t __at 0xFC2 ADCON0bits;
+extern volatile __ADCON0_t __at (0xFC2) ADCON0bits;
 
-extern __sfr __at 0xFC3 ADRESL;
+extern __sfr __at (0xFC3) ADRESL;
 
-extern __sfr __at 0xFC4 ADRESH;
+extern __sfr __at (0xFC4) ADRESH;
 
-extern __sfr __at 0xFC5 SSPCON2;
+extern __sfr __at (0xFC5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN            : 1;
@@ -1077,9 +1077,9 @@ typedef union {
                unsigned GCEN           : 1;
        };
 } __SSPCON2_t;
-extern volatile __SSPCON2_t __at 0xFC5 SSPCON2bits;
+extern volatile __SSPCON2_t __at (0xFC5) SSPCON2bits;
 
-extern __sfr __at 0xFC6 SSPCON1;
+extern __sfr __at (0xFC6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM           : 4;
@@ -1089,9 +1089,9 @@ typedef union {
                unsigned WCOL           : 1;
        };
 } __SSPCON1_t;
-extern volatile __SSPCON1_t __at 0xFC6 SSPCON1bits;
+extern volatile __SSPCON1_t __at (0xFC6) SSPCON1bits;
 
-extern __sfr __at 0xFC7 SSPSTAT;
+extern __sfr __at (0xFC7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF             : 1;
@@ -1104,13 +1104,13 @@ typedef union {
                unsigned SMP            : 1;
        };
 } __SSPSTAT_t;
-extern volatile __SSPSTAT_t __at 0xFC7 SSPSTATbits;
+extern volatile __SSPSTAT_t __at (0xFC7) SSPSTATbits;
 
-extern __sfr __at 0xFC8 SSPADD;
+extern __sfr __at (0xFC8) SSPADD;
 
-extern __sfr __at 0xFC9 SSPBUF;
+extern __sfr __at (0xFC9) SSPBUF;
 
-extern __sfr __at 0xFCA T2CON;
+extern __sfr __at (0xFCA) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS         : 2;
@@ -1119,13 +1119,13 @@ typedef union {
                unsigned                : 1;
        };
 } __T2CON_t;
-extern volatile __T2CON_t __at 0xFCA T2CONbits;
+extern volatile __T2CON_t __at (0xFCA) T2CONbits;
 
-extern __sfr __at 0xFCB PR2;
+extern __sfr __at (0xFCB) PR2;
 
-extern __sfr __at 0xFCC TMR2;
+extern __sfr __at (0xFCC) TMR2;
 
-extern __sfr __at 0xFCD T1CON;
+extern __sfr __at (0xFCD) T1CON;
 typedef union {
        struct {
                unsigned TMR1ON         : 1;
@@ -1137,13 +1137,13 @@ typedef union {
                unsigned RD16           : 1;
        };
 } __T1CON_t;
-extern volatile __T1CON_t __at 0xFCD T1CONbits;
+extern volatile __T1CON_t __at (0xFCD) T1CONbits;
 
-extern __sfr __at 0xFCE TMR1L;
+extern __sfr __at (0xFCE) TMR1L;
 
-extern __sfr __at 0xFCF TMR1H;
+extern __sfr __at (0xFCF) TMR1H;
 
-extern __sfr __at 0xFD0 RCON;
+extern __sfr __at (0xFD0) RCON;
 typedef union {
        struct {
                unsigned nBOR           : 1;
@@ -1156,9 +1156,9 @@ typedef union {
                unsigned IPEN           : 1;
        };
 } __RCON_t;
-extern volatile __RCON_t __at 0xFD0 RCONbits;
+extern volatile __RCON_t __at (0xFD0) RCONbits;
 
-extern __sfr __at 0xFD1 WDTCON;
+extern __sfr __at (0xFD1) WDTCON;
 typedef union {
        struct {
                unsigned SWDTEN         : 1;
@@ -1171,9 +1171,9 @@ typedef union {
                unsigned                : 1;
        };
 } __WDTCON_t;
-extern volatile __WDTCON_t __at 0xFD1 WDTCONbits;
+extern volatile __WDTCON_t __at (0xFD1) WDTCONbits;
 
-extern __sfr __at 0xFD2 HLVDCON;
+extern __sfr __at (0xFD2) HLVDCON;
 typedef union {
        struct {
                unsigned HLVDL          : 4;
@@ -1183,9 +1183,9 @@ typedef union {
                unsigned VDIRMAG        : 1;
        };
 } __HLVDCON_t;
-extern volatile __HLVDCON_t __at 0xFD2 HLVDCONbits;
+extern volatile __HLVDCON_t __at (0xFD2) HLVDCONbits;
 
-extern __sfr __at 0xFD3 OSCCON;
+extern __sfr __at (0xFD3) OSCCON;
 typedef union {
        struct {
                unsigned SCS            : 2;
@@ -1195,9 +1195,9 @@ typedef union {
                unsigned IDLEN          : 1;
        };
 } __OSCCON_t;
-extern volatile __OSCCON_t __at 0xFD3 OSCCONbits;
+extern volatile __OSCCON_t __at (0xFD3) OSCCONbits;
 
-extern __sfr __at 0xFD5 T0CON;
+extern __sfr __at (0xFD5) T0CON;
 typedef union {
        struct {
                unsigned T0PS           : 3;
@@ -1208,13 +1208,13 @@ typedef union {
                unsigned TMR0ON         : 1;
        };
 } __T0CON_t;
-extern volatile __T0CON_t __at 0xFD5 T0CONbits;
+extern volatile __T0CON_t __at (0xFD5) T0CONbits;
 
-extern __sfr __at 0xFD6 TMR0L;
+extern __sfr __at (0xFD6) TMR0L;
 
-extern __sfr __at 0xFD7 TMR0H;
+extern __sfr __at (0xFD7) TMR0H;
 
-extern __sfr __at 0xFD8 STATUS;
+extern __sfr __at (0xFD8) STATUS;
 typedef union {
        struct {
                unsigned C              : 1;
@@ -1227,11 +1227,11 @@ typedef union {
                unsigned                : 1;
        };
 } __STATUS_t;
-extern volatile __STATUS_t __at 0xFD8 STATUSbits;
+extern volatile __STATUS_t __at (0xFD8) STATUSbits;
 
-extern __sfr __at 0xFD9 FSR2L;
+extern __sfr __at (0xFD9) FSR2L;
 
-extern __sfr __at 0xFDA FSR2H;
+extern __sfr __at (0xFDA) FSR2H;
 typedef union {
        struct {
                unsigned FSR2H          : 4;
@@ -1241,19 +1241,19 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR2H_t;
-extern volatile __FSR2H_t __at 0xFDA FSR2Hbits;
+extern volatile __FSR2H_t __at (0xFDA) FSR2Hbits;
 
-extern __sfr __at 0xFDB PLUSW2;
+extern __sfr __at (0xFDB) PLUSW2;
 
-extern __sfr __at 0xFDC PREINC2;
+extern __sfr __at (0xFDC) PREINC2;
 
-extern __sfr __at 0xFDD POSTDEC2;
+extern __sfr __at (0xFDD) POSTDEC2;
 
-extern __sfr __at 0xFDE POSTINC2;
+extern __sfr __at (0xFDE) POSTINC2;
 
-extern __sfr __at 0xFDF INDF2;
+extern __sfr __at (0xFDF) INDF2;
 
-extern __sfr __at 0xFE0 BSR;
+extern __sfr __at (0xFE0) BSR;
 typedef union {
        struct {
                unsigned BSR            : 4;
@@ -1263,11 +1263,11 @@ typedef union {
                unsigned                : 1;
        };
 } __BSR_t;
-extern volatile __BSR_t __at 0xFE0 BSRbits;
+extern volatile __BSR_t __at (0xFE0) BSRbits;
 
-extern __sfr __at 0xFE1 FSR1L;
+extern __sfr __at (0xFE1) FSR1L;
 
-extern __sfr __at 0xFE2 FSR1H;
+extern __sfr __at (0xFE2) FSR1H;
 typedef union {
        struct {
                unsigned FSR1H          : 4;
@@ -1277,23 +1277,23 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR1H_t;
-extern volatile __FSR1H_t __at 0xFE2 FSR1Hbits;
+extern volatile __FSR1H_t __at (0xFE2) FSR1Hbits;
 
-extern __sfr __at 0xFE3 PLUSW1;
+extern __sfr __at (0xFE3) PLUSW1;
 
-extern __sfr __at 0xFE4 PREINC1;
+extern __sfr __at (0xFE4) PREINC1;
 
-extern __sfr __at 0xFE5 POSTDEC1;
+extern __sfr __at (0xFE5) POSTDEC1;
 
-extern __sfr __at 0xFE6 POSTINC1;
+extern __sfr __at (0xFE6) POSTINC1;
 
-extern __sfr __at 0xFE7 INDF1;
+extern __sfr __at (0xFE7) INDF1;
 
-extern __sfr __at 0xFE8 WREG;
+extern __sfr __at (0xFE8) WREG;
 
-extern __sfr __at 0xFE9 FSR0L;
+extern __sfr __at (0xFE9) FSR0L;
 
-extern __sfr __at 0xFEA FSR0H;
+extern __sfr __at (0xFEA) FSR0H;
 typedef union {
        struct {
                unsigned FSR0H          : 4;
@@ -1303,19 +1303,19 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR0H_t;
-extern volatile __FSR0H_t __at 0xFEA FSR0Hbits;
+extern volatile __FSR0H_t __at (0xFEA) FSR0Hbits;
 
-extern __sfr __at 0xFEB PLUSW0;
+extern __sfr __at (0xFEB) PLUSW0;
 
-extern __sfr __at 0xFEC PREINC0;
+extern __sfr __at (0xFEC) PREINC0;
 
-extern __sfr __at 0xFED POSTDEC0;
+extern __sfr __at (0xFED) POSTDEC0;
 
-extern __sfr __at 0xFEE POSTINC0;
+extern __sfr __at (0xFEE) POSTINC0;
 
-extern __sfr __at 0xFEF INDF0;
+extern __sfr __at (0xFEF) INDF0;
 
-extern __sfr __at 0xFF0 INTCON3;
+extern __sfr __at (0xFF0) INTCON3;
 typedef union {
        struct {
                unsigned INT1IF         : 1;
@@ -1328,9 +1328,9 @@ typedef union {
                unsigned INT2IP         : 1;
        };
 } __INTCON3_t;
-extern volatile __INTCON3_t __at 0xFF0 INTCON3bits;
+extern volatile __INTCON3_t __at (0xFF0) INTCON3bits;
 
-extern __sfr __at 0xFF1 INTCON2;
+extern __sfr __at (0xFF1) INTCON2;
 typedef union {
        struct {
                unsigned RBIP           : 1;
@@ -1343,9 +1343,9 @@ typedef union {
                unsigned nRBPU          : 1;
        };
 } __INTCON2_t;
-extern volatile __INTCON2_t __at 0xFF1 INTCON2bits;
+extern volatile __INTCON2_t __at (0xFF1) INTCON2bits;
 
-extern __sfr __at 0xFF2 INTCON;
+extern __sfr __at (0xFF2) INTCON;
 typedef union {
        struct {
                unsigned RBIF           : 1;
@@ -1378,19 +1378,19 @@ typedef union {
                unsigned GIEH           : 1;
        };
 } __INTCON_t;
-extern volatile __INTCON_t __at 0xFF2 INTCONbits;
+extern volatile __INTCON_t __at (0xFF2) INTCONbits;
 
-extern __sfr __at 0xFF3 PRODL;
+extern __sfr __at (0xFF3) PRODL;
 
-extern __sfr __at 0xFF4 PRODH;
+extern __sfr __at (0xFF4) PRODH;
 
-extern __sfr __at 0xFF5 TABLAT;
+extern __sfr __at (0xFF5) TABLAT;
 
-extern __sfr __at 0xFF6 TBLPTRL;
+extern __sfr __at (0xFF6) TBLPTRL;
 
-extern __sfr __at 0xFF7 TBLPTRH;
+extern __sfr __at (0xFF7) TBLPTRH;
 
-extern __sfr __at 0xFF8 TBLPTRU;
+extern __sfr __at (0xFF8) TBLPTRU;
 typedef union {
        struct {
                unsigned TBLPTRU        : 5;
@@ -1399,19 +1399,19 @@ typedef union {
                unsigned                : 1;
        };
 } __TBLPTRU_t;
-extern volatile __TBLPTRU_t __at 0xFF8 TBLPTRUbits;
+extern volatile __TBLPTRU_t __at (0xFF8) TBLPTRUbits;
 
-extern __sfr __at 0xFF9 PCL;
+extern __sfr __at (0xFF9) PCL;
 
-extern __sfr __at 0xFFA PCLATH;
+extern __sfr __at (0xFFA) PCLATH;
 typedef union {
        struct {
                unsigned PCH            : 8;
        };
 } __PCLATH_t;
-extern volatile __PCLATH_t __at 0xFFA PCLATHbits;
+extern volatile __PCLATH_t __at (0xFFA) PCLATHbits;
 
-extern __sfr __at 0xFFB PCLATU;
+extern __sfr __at (0xFFB) PCLATU;
 typedef union {
        struct {
                unsigned PCU            : 5;
@@ -1420,9 +1420,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PCLATU_t;
-extern volatile __PCLATU_t __at 0xFFB PCLATUbits;
+extern volatile __PCLATU_t __at (0xFFB) PCLATUbits;
 
-extern __sfr __at 0xFFC STKPTR;
+extern __sfr __at (0xFFC) STKPTR;
 typedef union {
        struct {
                unsigned STKPTR         : 5;
@@ -1431,13 +1431,13 @@ typedef union {
                unsigned STKFUL         : 1;
        };
 } __STKPTR_t;
-extern volatile __STKPTR_t __at 0xFFC STKPTRbits;
+extern volatile __STKPTR_t __at (0xFFC) STKPTRbits;
 
-extern __sfr __at 0xFFD TOSL;
+extern __sfr __at (0xFFD) TOSL;
 
-extern __sfr __at 0xFFE TOSH;
+extern __sfr __at (0xFFE) TOSH;
 
-extern __sfr __at 0xFFF TOSU;
+extern __sfr __at (0xFFF) TOSU;
 typedef union {
        struct {
                unsigned TOSU           : 5;
@@ -1446,7 +1446,7 @@ typedef union {
                unsigned                : 1;
        };
 } __TOSU_t;
-extern volatile __TOSU_t __at 0xFFF TOSUbits;
+extern volatile __TOSU_t __at (0xFFF) TOSUbits;
 
 /* Configuration register locations */
 #define        CONFIG1L        0x300000

diff --git a/device/include/pic16/pic18f448.h b/device/include/pic16/pic18f448.h
index 18f08761831763aaa975df6184edc8ca947be9f3..50c6897c701db0707b52925c043a770988b95aa1 100644 (file)
--- a/device/include/pic16/pic18f448.h
+++ b/device/include/pic16/pic18f448.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F448_H__
 #define __PIC18F448_H__
 
-extern __sfr __at 0xf00 RXF0SIDH;
+extern __sfr __at (0xf00) RXF0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RXF0SIDHbits_t;
 
-extern volatile __RXF0SIDHbits_t __at 0xf00 RXF0SIDHbits;
+extern volatile __RXF0SIDHbits_t __at (0xf00) RXF0SIDHbits;
 
-extern __sfr __at 0xf01 RXF0SIDL;
+extern __sfr __at (0xf01) RXF0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -45,9 +45,9 @@ typedef union {
        };
 } __RXF0SIDLbits_t;
 
-extern volatile __RXF0SIDLbits_t __at 0xf01 RXF0SIDLbits;
+extern volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-extern __sfr __at 0xf02 RXF0EIDH;
+extern __sfr __at (0xf02) RXF0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -61,9 +61,9 @@ typedef union {
        };
 } __RXF0EIDHbits_t;
 
-extern volatile __RXF0EIDHbits_t __at 0xf02 RXF0EIDHbits;
+extern volatile __RXF0EIDHbits_t __at (0xf02) RXF0EIDHbits;
 
-extern __sfr __at 0xf03 RXF0EIDL;
+extern __sfr __at (0xf03) RXF0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -77,9 +77,9 @@ typedef union {
        };
 } __RXF0EIDLbits_t;
 
-extern volatile __RXF0EIDLbits_t __at 0xf03 RXF0EIDLbits;
+extern volatile __RXF0EIDLbits_t __at (0xf03) RXF0EIDLbits;
 
-extern __sfr __at 0xf04 RXF1SIDH;
+extern __sfr __at (0xf04) RXF1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -93,9 +93,9 @@ typedef union {
        };
 } __RXF1SIDHbits_t;
 
-extern volatile __RXF1SIDHbits_t __at 0xf04 RXF1SIDHbits;
+extern volatile __RXF1SIDHbits_t __at (0xf04) RXF1SIDHbits;
 
-extern __sfr __at 0xf05 RXF1SIDL;
+extern __sfr __at (0xf05) RXF1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -109,9 +109,9 @@ typedef union {
        };
 } __RXF1SIDLbits_t;
 
-extern volatile __RXF1SIDLbits_t __at 0xf05 RXF1SIDLbits;
+extern volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-extern __sfr __at 0xf06 RXF1EIDH;
+extern __sfr __at (0xf06) RXF1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -125,9 +125,9 @@ typedef union {
        };
 } __RXF1EIDHbits_t;
 
-extern volatile __RXF1EIDHbits_t __at 0xf06 RXF1EIDHbits;
+extern volatile __RXF1EIDHbits_t __at (0xf06) RXF1EIDHbits;
 
-extern __sfr __at 0xf07 RXF1EIDL;
+extern __sfr __at (0xf07) RXF1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -141,9 +141,9 @@ typedef union {
        };
 } __RXF1EIDLbits_t;
 
-extern volatile __RXF1EIDLbits_t __at 0xf07 RXF1EIDLbits;
+extern volatile __RXF1EIDLbits_t __at (0xf07) RXF1EIDLbits;
 
-extern __sfr __at 0xf08 RXF2SIDH;
+extern __sfr __at (0xf08) RXF2SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -157,9 +157,9 @@ typedef union {
        };
 } __RXF2SIDHbits_t;
 
-extern volatile __RXF2SIDHbits_t __at 0xf08 RXF2SIDHbits;
+extern volatile __RXF2SIDHbits_t __at (0xf08) RXF2SIDHbits;
 
-extern __sfr __at 0xf09 RXF2SIDL;
+extern __sfr __at (0xf09) RXF2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -173,9 +173,9 @@ typedef union {
        };
 } __RXF2SIDLbits_t;
 
-extern volatile __RXF2SIDLbits_t __at 0xf09 RXF2SIDLbits;
+extern volatile __RXF2SIDLbits_t __at (0xf09) RXF2SIDLbits;
 
-extern __sfr __at 0xf0a RXF2EIDH;
+extern __sfr __at (0xf0a) RXF2EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -189,9 +189,9 @@ typedef union {
        };
 } __RXF2EIDHbits_t;
 
-extern volatile __RXF2EIDHbits_t __at 0xf0a RXF2EIDHbits;
+extern volatile __RXF2EIDHbits_t __at (0xf0a) RXF2EIDHbits;
 
-extern __sfr __at 0xf0b RXF2EIDL;
+extern __sfr __at (0xf0b) RXF2EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -205,9 +205,9 @@ typedef union {
        };
 } __RXF2EIDLbits_t;
 
-extern volatile __RXF2EIDLbits_t __at 0xf0b RXF2EIDLbits;
+extern volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-extern __sfr __at 0xf0c RXF3SIDH;
+extern __sfr __at (0xf0c) RXF3SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -221,9 +221,9 @@ typedef union {
        };
 } __RXF3SIDHbits_t;
 
-extern volatile __RXF3SIDHbits_t __at 0xf0c RXF3SIDHbits;
+extern volatile __RXF3SIDHbits_t __at (0xf0c) RXF3SIDHbits;
 
-extern __sfr __at 0xf0d RXF3SIDL;
+extern __sfr __at (0xf0d) RXF3SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -237,9 +237,9 @@ typedef union {
        };
 } __RXF3SIDLbits_t;
 
-extern volatile __RXF3SIDLbits_t __at 0xf0d RXF3SIDLbits;
+extern volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-extern __sfr __at 0xf0e RXF3EIDH;
+extern __sfr __at (0xf0e) RXF3EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -253,9 +253,9 @@ typedef union {
        };
 } __RXF3EIDHbits_t;
 
-extern volatile __RXF3EIDHbits_t __at 0xf0e RXF3EIDHbits;
+extern volatile __RXF3EIDHbits_t __at (0xf0e) RXF3EIDHbits;
 
-extern __sfr __at 0xf0f RXF3EIDL;
+extern __sfr __at (0xf0f) RXF3EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -269,9 +269,9 @@ typedef union {
        };
 } __RXF3EIDLbits_t;
 
-extern volatile __RXF3EIDLbits_t __at 0xf0f RXF3EIDLbits;
+extern volatile __RXF3EIDLbits_t __at (0xf0f) RXF3EIDLbits;
 
-extern __sfr __at 0xf10 RXF4SIDH;
+extern __sfr __at (0xf10) RXF4SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -285,9 +285,9 @@ typedef union {
        };
 } __RXF4SIDHbits_t;
 
-extern volatile __RXF4SIDHbits_t __at 0xf10 RXF4SIDHbits;
+extern volatile __RXF4SIDHbits_t __at (0xf10) RXF4SIDHbits;
 
-extern __sfr __at 0xf11 RXF4SIDL;
+extern __sfr __at (0xf11) RXF4SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -301,9 +301,9 @@ typedef union {
        };
 } __RXF4SIDLbits_t;
 
-extern volatile __RXF4SIDLbits_t __at 0xf11 RXF4SIDLbits;
+extern volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-extern __sfr __at 0xf12 RXF4EIDH;
+extern __sfr __at (0xf12) RXF4EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -317,9 +317,9 @@ typedef union {
        };
 } __RXF4EIDHbits_t;
 
-extern volatile __RXF4EIDHbits_t __at 0xf12 RXF4EIDHbits;
+extern volatile __RXF4EIDHbits_t __at (0xf12) RXF4EIDHbits;
 
-extern __sfr __at 0xf13 RXF4EIDL;
+extern __sfr __at (0xf13) RXF4EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -333,9 +333,9 @@ typedef union {
        };
 } __RXF4EIDLbits_t;
 
-extern volatile __RXF4EIDLbits_t __at 0xf13 RXF4EIDLbits;
+extern volatile __RXF4EIDLbits_t __at (0xf13) RXF4EIDLbits;
 
-extern __sfr __at 0xf14 RXF5SIDH;
+extern __sfr __at (0xf14) RXF5SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -349,9 +349,9 @@ typedef union {
        };
 } __RXF5SIDHbits_t;
 
-extern volatile __RXF5SIDHbits_t __at 0xf14 RXF5SIDHbits;
+extern volatile __RXF5SIDHbits_t __at (0xf14) RXF5SIDHbits;
 
-extern __sfr __at 0xf15 RXF5SIDL;
+extern __sfr __at (0xf15) RXF5SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -365,9 +365,9 @@ typedef union {
        };
 } __RXF5SIDLbits_t;
 
-extern volatile __RXF5SIDLbits_t __at 0xf15 RXF5SIDLbits;
+extern volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-extern __sfr __at 0xf16 RXF5EIDH;
+extern __sfr __at (0xf16) RXF5EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -381,9 +381,9 @@ typedef union {
        };
 } __RXF5EIDHbits_t;
 
-extern volatile __RXF5EIDHbits_t __at 0xf16 RXF5EIDHbits;
+extern volatile __RXF5EIDHbits_t __at (0xf16) RXF5EIDHbits;
 
-extern __sfr __at 0xf17 RXF5EIDL;
+extern __sfr __at (0xf17) RXF5EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -397,9 +397,9 @@ typedef union {
        };
 } __RXF5EIDLbits_t;
 
-extern volatile __RXF5EIDLbits_t __at 0xf17 RXF5EIDLbits;
+extern volatile __RXF5EIDLbits_t __at (0xf17) RXF5EIDLbits;
 
-extern __sfr __at 0xf18 RXM0SIDH;
+extern __sfr __at (0xf18) RXM0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -413,9 +413,9 @@ typedef union {
        };
 } __RXM0SIDHbits_t;
 
-extern volatile __RXM0SIDHbits_t __at 0xf18 RXM0SIDHbits;
+extern volatile __RXM0SIDHbits_t __at (0xf18) RXM0SIDHbits;
 
-extern __sfr __at 0xf19 RXM0SIDL;
+extern __sfr __at (0xf19) RXM0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -429,9 +429,9 @@ typedef union {
        };
 } __RXM0SIDLbits_t;
 
-extern volatile __RXM0SIDLbits_t __at 0xf19 RXM0SIDLbits;
+extern volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-extern __sfr __at 0xf1a RXM0EIDH;
+extern __sfr __at (0xf1a) RXM0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -445,9 +445,9 @@ typedef union {
        };
 } __RXM0EIDHbits_t;
 
-extern volatile __RXM0EIDHbits_t __at 0xf1a RXM0EIDHbits;
+extern volatile __RXM0EIDHbits_t __at (0xf1a) RXM0EIDHbits;
 
-extern __sfr __at 0xf1b RXM0EIDL;
+extern __sfr __at (0xf1b) RXM0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -461,9 +461,9 @@ typedef union {
        };
 } __RXM0EIDLbits_t;
 
-extern volatile __RXM0EIDLbits_t __at 0xf1b RXM0EIDLbits;
+extern volatile __RXM0EIDLbits_t __at (0xf1b) RXM0EIDLbits;
 
-extern __sfr __at 0xf1c RXM1SIDH;
+extern __sfr __at (0xf1c) RXM1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -477,9 +477,9 @@ typedef union {
        };
 } __RXM1SIDHbits_t;
 
-extern volatile __RXM1SIDHbits_t __at 0xf1c RXM1SIDHbits;
+extern volatile __RXM1SIDHbits_t __at (0xf1c) RXM1SIDHbits;
 
-extern __sfr __at 0xf1d RXM1SIDL;
+extern __sfr __at (0xf1d) RXM1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -493,9 +493,9 @@ typedef union {
        };
 } __RXM1SIDLbits_t;
 
-extern volatile __RXM1SIDLbits_t __at 0xf1d RXM1SIDLbits;
+extern volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-extern __sfr __at 0xf1e RXM1EIDH;
+extern __sfr __at (0xf1e) RXM1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -509,9 +509,9 @@ typedef union {
        };
 } __RXM1EIDHbits_t;
 
-extern volatile __RXM1EIDHbits_t __at 0xf1e RXM1EIDHbits;
+extern volatile __RXM1EIDHbits_t __at (0xf1e) RXM1EIDHbits;
 
-extern __sfr __at 0xf1f RXM1EIDL;
+extern __sfr __at (0xf1f) RXM1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -525,9 +525,9 @@ typedef union {
        };
 } __RXM1EIDLbits_t;
 
-extern volatile __RXM1EIDLbits_t __at 0xf1f RXM1EIDLbits;
+extern volatile __RXM1EIDLbits_t __at (0xf1f) RXM1EIDLbits;
 
-extern __sfr __at 0xf20 TXB2CON;
+extern __sfr __at (0xf20) TXB2CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -541,9 +541,9 @@ typedef union {
        };
 } __TXB2CONbits_t;
 
-extern volatile __TXB2CONbits_t __at 0xf20 TXB2CONbits;
+extern volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-extern __sfr __at 0xf21 TXB2SIDH;
+extern __sfr __at (0xf21) TXB2SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -557,9 +557,9 @@ typedef union {
        };
 } __TXB2SIDHbits_t;
 
-extern volatile __TXB2SIDHbits_t __at 0xf21 TXB2SIDHbits;
+extern volatile __TXB2SIDHbits_t __at (0xf21) TXB2SIDHbits;
 
-extern __sfr __at 0xf22 TXB2SIDL;
+extern __sfr __at (0xf22) TXB2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -573,9 +573,9 @@ typedef union {
        };
 } __TXB2SIDLbits_t;
 
-extern volatile __TXB2SIDLbits_t __at 0xf22 TXB2SIDLbits;
+extern volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-extern __sfr __at 0xf23 TXB2EIDH;
+extern __sfr __at (0xf23) TXB2EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -589,9 +589,9 @@ typedef union {
        };
 } __TXB2EIDHbits_t;
 
-extern volatile __TXB2EIDHbits_t __at 0xf23 TXB2EIDHbits;
+extern volatile __TXB2EIDHbits_t __at (0xf23) TXB2EIDHbits;
 
-extern __sfr __at 0xf24 TXB2EIDL;
+extern __sfr __at (0xf24) TXB2EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -605,9 +605,9 @@ typedef union {
        };
 } __TXB2EIDLbits_t;
 
-extern volatile __TXB2EIDLbits_t __at 0xf24 TXB2EIDLbits;
+extern volatile __TXB2EIDLbits_t __at (0xf24) TXB2EIDLbits;
 
-extern __sfr __at 0xf25 TXB2DLC;
+extern __sfr __at (0xf25) TXB2DLC;
 typedef union {
        struct {
                unsigned TXB2DLC0:1;
@@ -621,9 +621,9 @@ typedef union {
        };
 } __TXB2DLCbits_t;
 
-extern volatile __TXB2DLCbits_t __at 0xf25 TXB2DLCbits;
+extern volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-extern __sfr __at 0xf26 TXB2D0;
+extern __sfr __at (0xf26) TXB2D0;
 typedef union {
        struct {
                unsigned TXB2D00:1;
@@ -637,9 +637,9 @@ typedef union {
        };
 } __TXB2D0bits_t;
 
-extern volatile __TXB2D0bits_t __at 0xf26 TXB2D0bits;
+extern volatile __TXB2D0bits_t __at (0xf26) TXB2D0bits;
 
-extern __sfr __at 0xf27 TXB2D1;
+extern __sfr __at (0xf27) TXB2D1;
 typedef union {
        struct {
                unsigned TXB2D10:1;
@@ -653,9 +653,9 @@ typedef union {
        };
 } __TXB2D1bits_t;
 
-extern volatile __TXB2D1bits_t __at 0xf27 TXB2D1bits;
+extern volatile __TXB2D1bits_t __at (0xf27) TXB2D1bits;
 
-extern __sfr __at 0xf28 TXB2D2;
+extern __sfr __at (0xf28) TXB2D2;
 typedef union {
        struct {
                unsigned TXB2D20:1;
@@ -669,9 +669,9 @@ typedef union {
        };
 } __TXB2D2bits_t;
 
-extern volatile __TXB2D2bits_t __at 0xf28 TXB2D2bits;
+extern volatile __TXB2D2bits_t __at (0xf28) TXB2D2bits;
 
-extern __sfr __at 0xf29 TXB2D3;
+extern __sfr __at (0xf29) TXB2D3;
 typedef union {
        struct {
                unsigned TXB2D30:1;
@@ -685,9 +685,9 @@ typedef union {
        };
 } __TXB2D3bits_t;
 
-extern volatile __TXB2D3bits_t __at 0xf29 TXB2D3bits;
+extern volatile __TXB2D3bits_t __at (0xf29) TXB2D3bits;
 
-extern __sfr __at 0xf2a TXB2D4;
+extern __sfr __at (0xf2a) TXB2D4;
 typedef union {
        struct {
                unsigned TXB2D40:1;
@@ -701,9 +701,9 @@ typedef union {
        };
 } __TXB2D4bits_t;
 
-extern volatile __TXB2D4bits_t __at 0xf2a TXB2D4bits;
+extern volatile __TXB2D4bits_t __at (0xf2a) TXB2D4bits;
 
-extern __sfr __at 0xf2b TXB2D5;
+extern __sfr __at (0xf2b) TXB2D5;
 typedef union {
        struct {
                unsigned TXB2D50:1;
@@ -717,9 +717,9 @@ typedef union {
        };
 } __TXB2D5bits_t;
 
-extern volatile __TXB2D5bits_t __at 0xf2b TXB2D5bits;
+extern volatile __TXB2D5bits_t __at (0xf2b) TXB2D5bits;
 
-extern __sfr __at 0xf2c TXB2D6;
+extern __sfr __at (0xf2c) TXB2D6;
 typedef union {
        struct {
                unsigned TXB2D60:1;
@@ -733,9 +733,9 @@ typedef union {
        };
 } __TXB2D6bits_t;
 
-extern volatile __TXB2D6bits_t __at 0xf2c TXB2D6bits;
+extern volatile __TXB2D6bits_t __at (0xf2c) TXB2D6bits;
 
-extern __sfr __at 0xf2d TXB2D7;
+extern __sfr __at (0xf2d) TXB2D7;
 typedef union {
        struct {
                unsigned TXB2D70:1;
@@ -749,9 +749,9 @@ typedef union {
        };
 } __TXB2D7bits_t;
 
-extern volatile __TXB2D7bits_t __at 0xf2d TXB2D7bits;
+extern volatile __TXB2D7bits_t __at (0xf2d) TXB2D7bits;
 
-extern __sfr __at 0xf2e CANSTATRO4;
+extern __sfr __at (0xf2e) CANSTATRO4;
 typedef union {
        struct {
                unsigned :1;
@@ -765,9 +765,9 @@ typedef union {
        };
 } __CANSTATRO4bits_t;
 
-extern volatile __CANSTATRO4bits_t __at 0xf2e CANSTATRO4bits;
+extern volatile __CANSTATRO4bits_t __at (0xf2e) CANSTATRO4bits;
 
-extern __sfr __at 0xf30 TXB1CON;
+extern __sfr __at (0xf30) TXB1CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -781,9 +781,9 @@ typedef union {
        };
 } __TXB1CONbits_t;
 
-extern volatile __TXB1CONbits_t __at 0xf30 TXB1CONbits;
+extern volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-extern __sfr __at 0xf31 TXB1SIDH;
+extern __sfr __at (0xf31) TXB1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -797,9 +797,9 @@ typedef union {
        };
 } __TXB1SIDHbits_t;
 
-extern volatile __TXB1SIDHbits_t __at 0xf31 TXB1SIDHbits;
+extern volatile __TXB1SIDHbits_t __at (0xf31) TXB1SIDHbits;
 
-extern __sfr __at 0xf32 TXB1SIDL;
+extern __sfr __at (0xf32) TXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -813,9 +813,9 @@ typedef union {
        };
 } __TXB1SIDLbits_t;
 
-extern volatile __TXB1SIDLbits_t __at 0xf32 TXB1SIDLbits;
+extern volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-extern __sfr __at 0xf33 TXB1EIDH;
+extern __sfr __at (0xf33) TXB1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -829,9 +829,9 @@ typedef union {
        };
 } __TXB1EIDHbits_t;
 
-extern volatile __TXB1EIDHbits_t __at 0xf33 TXB1EIDHbits;
+extern volatile __TXB1EIDHbits_t __at (0xf33) TXB1EIDHbits;
 
-extern __sfr __at 0xf34 TXB1EIDL;
+extern __sfr __at (0xf34) TXB1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -845,9 +845,9 @@ typedef union {
        };
 } __TXB1EIDLbits_t;
 
-extern volatile __TXB1EIDLbits_t __at 0xf34 TXB1EIDLbits;
+extern volatile __TXB1EIDLbits_t __at (0xf34) TXB1EIDLbits;
 
-extern __sfr __at 0xf35 TXB1DLC;
+extern __sfr __at (0xf35) TXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -861,9 +861,9 @@ typedef union {
        };
 } __TXB1DLCbits_t;
 
-extern volatile __TXB1DLCbits_t __at 0xf35 TXB1DLCbits;
+extern volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-extern __sfr __at 0xf36 TXB1D0;
+extern __sfr __at (0xf36) TXB1D0;
 typedef union {
        struct {
                unsigned TXB1D00:1;
@@ -877,9 +877,9 @@ typedef union {
        };
 } __TXB1D0bits_t;
 
-extern volatile __TXB1D0bits_t __at 0xf36 TXB1D0bits;
+extern volatile __TXB1D0bits_t __at (0xf36) TXB1D0bits;
 
-extern __sfr __at 0xf37 TXB1D1;
+extern __sfr __at (0xf37) TXB1D1;
 typedef union {
        struct {
                unsigned TXB1D10:1;
@@ -893,9 +893,9 @@ typedef union {
        };
 } __TXB1D1bits_t;
 
-extern volatile __TXB1D1bits_t __at 0xf37 TXB1D1bits;
+extern volatile __TXB1D1bits_t __at (0xf37) TXB1D1bits;
 
-extern __sfr __at 0xf38 TXB1D2;
+extern __sfr __at (0xf38) TXB1D2;
 typedef union {
        struct {
                unsigned TXB1D20:1;
@@ -909,9 +909,9 @@ typedef union {
        };
 } __TXB1D2bits_t;
 
-extern volatile __TXB1D2bits_t __at 0xf38 TXB1D2bits;
+extern volatile __TXB1D2bits_t __at (0xf38) TXB1D2bits;
 
-extern __sfr __at 0xf39 TXB1D3;
+extern __sfr __at (0xf39) TXB1D3;
 typedef union {
        struct {
                unsigned TXB1D30:1;
@@ -925,9 +925,9 @@ typedef union {
        };
 } __TXB1D3bits_t;
 
-extern volatile __TXB1D3bits_t __at 0xf39 TXB1D3bits;
+extern volatile __TXB1D3bits_t __at (0xf39) TXB1D3bits;
 
-extern __sfr __at 0xf3a TXB1D4;
+extern __sfr __at (0xf3a) TXB1D4;
 typedef union {
        struct {
                unsigned TXB1D40:1;
@@ -941,9 +941,9 @@ typedef union {
        };
 } __TXB1D4bits_t;
 
-extern volatile __TXB1D4bits_t __at 0xf3a TXB1D4bits;
+extern volatile __TXB1D4bits_t __at (0xf3a) TXB1D4bits;
 
-extern __sfr __at 0xf3b TXB1D5;
+extern __sfr __at (0xf3b) TXB1D5;
 typedef union {
        struct {
                unsigned TXB1D50:1;
@@ -957,9 +957,9 @@ typedef union {
        };
 } __TXB1D5bits_t;
 
-extern volatile __TXB1D5bits_t __at 0xf3b TXB1D5bits;
+extern volatile __TXB1D5bits_t __at (0xf3b) TXB1D5bits;
 
-extern __sfr __at 0xf3c TXB1D6;
+extern __sfr __at (0xf3c) TXB1D6;
 typedef union {
        struct {
                unsigned TXB1D60:1;
@@ -973,9 +973,9 @@ typedef union {
        };
 } __TXB1D6bits_t;
 
-extern volatile __TXB1D6bits_t __at 0xf3c TXB1D6bits;
+extern volatile __TXB1D6bits_t __at (0xf3c) TXB1D6bits;
 
-extern __sfr __at 0xf3d TXB1D7;
+extern __sfr __at (0xf3d) TXB1D7;
 typedef union {
        struct {
                unsigned TXB1D70:1;
@@ -989,9 +989,9 @@ typedef union {
        };
 } __TXB1D7bits_t;
 
-extern volatile __TXB1D7bits_t __at 0xf3d TXB1D7bits;
+extern volatile __TXB1D7bits_t __at (0xf3d) TXB1D7bits;
 
-extern __sfr __at 0xf3e CANSTATRO3;
+extern __sfr __at (0xf3e) CANSTATRO3;
 typedef union {
        struct {
                unsigned :1;
@@ -1005,9 +1005,9 @@ typedef union {
        };
 } __CANSTATRO3bits_t;
 
-extern volatile __CANSTATRO3bits_t __at 0xf3e CANSTATRO3bits;
+extern volatile __CANSTATRO3bits_t __at (0xf3e) CANSTATRO3bits;
 
-extern __sfr __at 0xf40 TXB0CON;
+extern __sfr __at (0xf40) TXB0CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -1021,9 +1021,9 @@ typedef union {
        };
 } __TXB0CONbits_t;
 
-extern volatile __TXB0CONbits_t __at 0xf40 TXB0CONbits;
+extern volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-extern __sfr __at 0xf41 TXB0SIDH;
+extern __sfr __at (0xf41) TXB0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1037,9 +1037,9 @@ typedef union {
        };
 } __TXB0SIDHbits_t;
 
-extern volatile __TXB0SIDHbits_t __at 0xf41 TXB0SIDHbits;
+extern volatile __TXB0SIDHbits_t __at (0xf41) TXB0SIDHbits;
 
-extern __sfr __at 0xf42 TXB0SIDL;
+extern __sfr __at (0xf42) TXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1053,9 +1053,9 @@ typedef union {
        };
 } __TXB0SIDLbits_t;
 
-extern volatile __TXB0SIDLbits_t __at 0xf42 TXB0SIDLbits;
+extern volatile __TXB0SIDLbits_t __at (0xf42) TXB0SIDLbits;
 
-extern __sfr __at 0xf43 TXB0EIDH;
+extern __sfr __at (0xf43) TXB0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1069,9 +1069,9 @@ typedef union {
        };
 } __TXB0EIDHbits_t;
 
-extern volatile __TXB0EIDHbits_t __at 0xf43 TXB0EIDHbits;
+extern volatile __TXB0EIDHbits_t __at (0xf43) TXB0EIDHbits;
 
-extern __sfr __at 0xf44 TXB0EIDL;
+extern __sfr __at (0xf44) TXB0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1085,9 +1085,9 @@ typedef union {
        };
 } __TXB0EIDLbits_t;
 
-extern volatile __TXB0EIDLbits_t __at 0xf44 TXB0EIDLbits;
+extern volatile __TXB0EIDLbits_t __at (0xf44) TXB0EIDLbits;
 
-extern __sfr __at 0xf45 TXB0DLC;
+extern __sfr __at (0xf45) TXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1101,9 +1101,9 @@ typedef union {
        };
 } __TXB0DLCbits_t;
 
-extern volatile __TXB0DLCbits_t __at 0xf45 TXB0DLCbits;
+extern volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-extern __sfr __at 0xf46 TXB0D0;
+extern __sfr __at (0xf46) TXB0D0;
 typedef union {
        struct {
                unsigned TXB0D00:1;
@@ -1117,9 +1117,9 @@ typedef union {
        };
 } __TXB0D0bits_t;
 
-extern volatile __TXB0D0bits_t __at 0xf46 TXB0D0bits;
+extern volatile __TXB0D0bits_t __at (0xf46) TXB0D0bits;
 
-extern __sfr __at 0xf47 TXB0D1;
+extern __sfr __at (0xf47) TXB0D1;
 typedef union {
        struct {
                unsigned TXB0D10:1;
@@ -1133,9 +1133,9 @@ typedef union {
        };
 } __TXB0D1bits_t;
 
-extern volatile __TXB0D1bits_t __at 0xf47 TXB0D1bits;
+extern volatile __TXB0D1bits_t __at (0xf47) TXB0D1bits;
 
-extern __sfr __at 0xf48 TXB0D2;
+extern __sfr __at (0xf48) TXB0D2;
 typedef union {
        struct {
                unsigned TXB0D20:1;
@@ -1149,9 +1149,9 @@ typedef union {
        };
 } __TXB0D2bits_t;
 
-extern volatile __TXB0D2bits_t __at 0xf48 TXB0D2bits;
+extern volatile __TXB0D2bits_t __at (0xf48) TXB0D2bits;
 
-extern __sfr __at 0xf49 TXB0D3;
+extern __sfr __at (0xf49) TXB0D3;
 typedef union {
        struct {
                unsigned TXB0D30:1;
@@ -1165,9 +1165,9 @@ typedef union {
        };
 } __TXB0D3bits_t;
 
-extern volatile __TXB0D3bits_t __at 0xf49 TXB0D3bits;
+extern volatile __TXB0D3bits_t __at (0xf49) TXB0D3bits;
 
-extern __sfr __at 0xf4a TXB0D4;
+extern __sfr __at (0xf4a) TXB0D4;
 typedef union {
        struct {
                unsigned TXB0D40:1;
@@ -1181,9 +1181,9 @@ typedef union {
        };
 } __TXB0D4bits_t;
 
-extern volatile __TXB0D4bits_t __at 0xf4a TXB0D4bits;
+extern volatile __TXB0D4bits_t __at (0xf4a) TXB0D4bits;
 
-extern __sfr __at 0xf4b TXB0D5;
+extern __sfr __at (0xf4b) TXB0D5;
 typedef union {
        struct {
                unsigned TXB0D50:1;
@@ -1197,9 +1197,9 @@ typedef union {
        };
 } __TXB0D5bits_t;
 
-extern volatile __TXB0D5bits_t __at 0xf4b TXB0D5bits;
+extern volatile __TXB0D5bits_t __at (0xf4b) TXB0D5bits;
 
-extern __sfr __at 0xf4c TXB0D6;
+extern __sfr __at (0xf4c) TXB0D6;
 typedef union {
        struct {
                unsigned TXB0D60:1;
@@ -1213,9 +1213,9 @@ typedef union {
        };
 } __TXB0D6bits_t;
 
-extern volatile __TXB0D6bits_t __at 0xf4c TXB0D6bits;
+extern volatile __TXB0D6bits_t __at (0xf4c) TXB0D6bits;
 
-extern __sfr __at 0xf4d TXB0D7;
+extern __sfr __at (0xf4d) TXB0D7;
 typedef union {
        struct {
                unsigned TXB0D70:1;
@@ -1229,9 +1229,9 @@ typedef union {
        };
 } __TXB0D7bits_t;
 
-extern volatile __TXB0D7bits_t __at 0xf4d TXB0D7bits;
+extern volatile __TXB0D7bits_t __at (0xf4d) TXB0D7bits;
 
-extern __sfr __at 0xf4e CANSTATRO2;
+extern __sfr __at (0xf4e) CANSTATRO2;
 typedef union {
        struct {
                unsigned :1;
@@ -1245,9 +1245,9 @@ typedef union {
        };
 } __CANSTATRO2bits_t;
 
-extern volatile __CANSTATRO2bits_t __at 0xf4e CANSTATRO2bits;
+extern volatile __CANSTATRO2bits_t __at (0xf4e) CANSTATRO2bits;
 
-extern __sfr __at 0xf50 RXB1CON;
+extern __sfr __at (0xf50) RXB1CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -1261,9 +1261,9 @@ typedef union {
        };
 } __RXB1CONbits_t;
 
-extern volatile __RXB1CONbits_t __at 0xf50 RXB1CONbits;
+extern volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-extern __sfr __at 0xf51 RXB1SIDH;
+extern __sfr __at (0xf51) RXB1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1277,9 +1277,9 @@ typedef union {
        };
 } __RXB1SIDHbits_t;
 
-extern volatile __RXB1SIDHbits_t __at 0xf51 RXB1SIDHbits;
+extern volatile __RXB1SIDHbits_t __at (0xf51) RXB1SIDHbits;
 
-extern __sfr __at 0xf52 RXB1SIDL;
+extern __sfr __at (0xf52) RXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1293,9 +1293,9 @@ typedef union {
        };
 } __RXB1SIDLbits_t;
 
-extern volatile __RXB1SIDLbits_t __at 0xf52 RXB1SIDLbits;
+extern volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-extern __sfr __at 0xf53 RXB1EIDH;
+extern __sfr __at (0xf53) RXB1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1309,9 +1309,9 @@ typedef union {
        };
 } __RXB1EIDHbits_t;
 
-extern volatile __RXB1EIDHbits_t __at 0xf53 RXB1EIDHbits;
+extern volatile __RXB1EIDHbits_t __at (0xf53) RXB1EIDHbits;
 
-extern __sfr __at 0xf54 RXB1EIDL;
+extern __sfr __at (0xf54) RXB1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1325,9 +1325,9 @@ typedef union {
        };
 } __RXB1EIDLbits_t;
 
-extern volatile __RXB1EIDLbits_t __at 0xf54 RXB1EIDLbits;
+extern volatile __RXB1EIDLbits_t __at (0xf54) RXB1EIDLbits;
 
-extern __sfr __at 0xf55 RXB1DLC;
+extern __sfr __at (0xf55) RXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1341,9 +1341,9 @@ typedef union {
        };
 } __RXB1DLCbits_t;
 
-extern volatile __RXB1DLCbits_t __at 0xf55 RXB1DLCbits;
+extern volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-extern __sfr __at 0xf56 RXB1D0;
+extern __sfr __at (0xf56) RXB1D0;
 typedef union {
        struct {
                unsigned RXB1D00:1;
@@ -1357,9 +1357,9 @@ typedef union {
        };
 } __RXB1D0bits_t;
 
-extern volatile __RXB1D0bits_t __at 0xf56 RXB1D0bits;
+extern volatile __RXB1D0bits_t __at (0xf56) RXB1D0bits;
 
-extern __sfr __at 0xf57 RXB1D1;
+extern __sfr __at (0xf57) RXB1D1;
 typedef union {
        struct {
                unsigned RXB1D10:1;
@@ -1373,9 +1373,9 @@ typedef union {
        };
 } __RXB1D1bits_t;
 
-extern volatile __RXB1D1bits_t __at 0xf57 RXB1D1bits;
+extern volatile __RXB1D1bits_t __at (0xf57) RXB1D1bits;
 
-extern __sfr __at 0xf58 RXB1D2;
+extern __sfr __at (0xf58) RXB1D2;
 typedef union {
        struct {
                unsigned RXB1D20:1;
@@ -1389,9 +1389,9 @@ typedef union {
        };
 } __RXB1D2bits_t;
 
-extern volatile __RXB1D2bits_t __at 0xf58 RXB1D2bits;
+extern volatile __RXB1D2bits_t __at (0xf58) RXB1D2bits;
 
-extern __sfr __at 0xf59 RXB1D3;
+extern __sfr __at (0xf59) RXB1D3;
 typedef union {
        struct {
                unsigned RXB1D30:1;
@@ -1405,9 +1405,9 @@ typedef union {
        };
 } __RXB1D3bits_t;
 
-extern volatile __RXB1D3bits_t __at 0xf59 RXB1D3bits;
+extern volatile __RXB1D3bits_t __at (0xf59) RXB1D3bits;
 
-extern __sfr __at 0xf5a RXB1D4;
+extern __sfr __at (0xf5a) RXB1D4;
 typedef union {
        struct {
                unsigned RXB1D40:1;
@@ -1421,9 +1421,9 @@ typedef union {
        };
 } __RXB1D4bits_t;
 
-extern volatile __RXB1D4bits_t __at 0xf5a RXB1D4bits;
+extern volatile __RXB1D4bits_t __at (0xf5a) RXB1D4bits;
 
-extern __sfr __at 0xf5b RXB1D5;
+extern __sfr __at (0xf5b) RXB1D5;
 typedef union {
        struct {
                unsigned RXB1D50:1;
@@ -1437,9 +1437,9 @@ typedef union {
        };
 } __RXB1D5bits_t;
 
-extern volatile __RXB1D5bits_t __at 0xf5b RXB1D5bits;
+extern volatile __RXB1D5bits_t __at (0xf5b) RXB1D5bits;
 
-extern __sfr __at 0xf5c RXB1D6;
+extern __sfr __at (0xf5c) RXB1D6;
 typedef union {
        struct {
                unsigned RXB1D60:1;
@@ -1453,9 +1453,9 @@ typedef union {
        };
 } __RXB1D6bits_t;
 
-extern volatile __RXB1D6bits_t __at 0xf5c RXB1D6bits;
+extern volatile __RXB1D6bits_t __at (0xf5c) RXB1D6bits;
 
-extern __sfr __at 0xf5d RXB1D7;
+extern __sfr __at (0xf5d) RXB1D7;
 typedef union {
        struct {
                unsigned RXB1D70:1;
@@ -1469,9 +1469,9 @@ typedef union {
        };
 } __RXB1D7bits_t;
 
-extern volatile __RXB1D7bits_t __at 0xf5d RXB1D7bits;
+extern volatile __RXB1D7bits_t __at (0xf5d) RXB1D7bits;
 
-extern __sfr __at 0xf5e CANSTATRO1;
+extern __sfr __at (0xf5e) CANSTATRO1;
 typedef union {
        struct {
                unsigned :1;
@@ -1485,9 +1485,9 @@ typedef union {
        };
 } __CANSTATRO1bits_t;
 
-extern volatile __CANSTATRO1bits_t __at 0xf5e CANSTATRO1bits;
+extern volatile __CANSTATRO1bits_t __at (0xf5e) CANSTATRO1bits;
 
-extern __sfr __at 0xf60 RXB0CON;
+extern __sfr __at (0xf60) RXB0CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -1501,9 +1501,9 @@ typedef union {
        };
 } __RXB0CONbits_t;
 
-extern volatile __RXB0CONbits_t __at 0xf60 RXB0CONbits;
+extern volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-extern __sfr __at 0xf61 RXB0SIDH;
+extern __sfr __at (0xf61) RXB0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1517,9 +1517,9 @@ typedef union {
        };
 } __RXB0SIDHbits_t;
 
-extern volatile __RXB0SIDHbits_t __at 0xf61 RXB0SIDHbits;
+extern volatile __RXB0SIDHbits_t __at (0xf61) RXB0SIDHbits;
 
-extern __sfr __at 0xf62 RXB0SIDL;
+extern __sfr __at (0xf62) RXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1533,9 +1533,9 @@ typedef union {
        };
 } __RXB0SIDLbits_t;
 
-extern volatile __RXB0SIDLbits_t __at 0xf62 RXB0SIDLbits;
+extern volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-extern __sfr __at 0xf63 RXB0EIDH;
+extern __sfr __at (0xf63) RXB0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1549,9 +1549,9 @@ typedef union {
        };
 } __RXB0EIDHbits_t;
 
-extern volatile __RXB0EIDHbits_t __at 0xf63 RXB0EIDHbits;
+extern volatile __RXB0EIDHbits_t __at (0xf63) RXB0EIDHbits;
 
-extern __sfr __at 0xf64 RXB0EIDL;
+extern __sfr __at (0xf64) RXB0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1565,9 +1565,9 @@ typedef union {
        };
 } __RXB0EIDLbits_t;
 
-extern volatile __RXB0EIDLbits_t __at 0xf64 RXB0EIDLbits;
+extern volatile __RXB0EIDLbits_t __at (0xf64) RXB0EIDLbits;
 
-extern __sfr __at 0xf65 RXB0DLC;
+extern __sfr __at (0xf65) RXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1581,17 +1581,17 @@ typedef union {
        };
 } __RXB0DLCbits_t;
 
-extern volatile __RXB0DLCbits_t __at 0xf65 RXB0DLCbits;
+extern volatile __RXB0DLCbits_t __at (0xf65) RXB0DLCbits;
 
-extern __sfr __at 0xf66 RXB0D0;
-extern __sfr __at 0xf67 RXB0D1;
-extern __sfr __at 0xf68 RXB0D2;
-extern __sfr __at 0xf69 RXB0D3;
-extern __sfr __at 0xf6a RXB0D4;
-extern __sfr __at 0xf6b RXB0D5;
-extern __sfr __at 0xf6c RXB0D6;
-extern __sfr __at 0xf6d RXB0D7;
-extern __sfr __at 0xf6e CANSTAT;
+extern __sfr __at (0xf66) RXB0D0;
+extern __sfr __at (0xf67) RXB0D1;
+extern __sfr __at (0xf68) RXB0D2;
+extern __sfr __at (0xf69) RXB0D3;
+extern __sfr __at (0xf6a) RXB0D4;
+extern __sfr __at (0xf6b) RXB0D5;
+extern __sfr __at (0xf6c) RXB0D6;
+extern __sfr __at (0xf6d) RXB0D7;
+extern __sfr __at (0xf6e) CANSTAT;
 typedef union {
        struct {
                unsigned :1;
@@ -1605,9 +1605,9 @@ typedef union {
        };
 } __CANSTATbits_t;
 
-extern volatile __CANSTATbits_t __at 0xf6e CANSTATbits;
+extern volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-extern __sfr __at 0xf6f CANCON;
+extern __sfr __at (0xf6f) CANCON;
 typedef union {
        struct {
                unsigned WIN0:1;
@@ -1621,9 +1621,9 @@ typedef union {
        };
 } __CANCONbits_t;
 
-extern volatile __CANCONbits_t __at 0xf6f CANCONbits;
+extern volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-extern __sfr __at 0xf70 BRGCON1;
+extern __sfr __at (0xf70) BRGCON1;
 typedef union {
        struct {
                unsigned BRP0:1;
@@ -1637,9 +1637,9 @@ typedef union {
        };
 } __BRGCON1bits_t;
 
-extern volatile __BRGCON1bits_t __at 0xf70 BRGCON1bits;
+extern volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-extern __sfr __at 0xf71 BRGCON2;
+extern __sfr __at (0xf71) BRGCON2;
 typedef union {
        struct {
                unsigned PRSEG0:1;
@@ -1653,9 +1653,9 @@ typedef union {
        };
 } __BRGCON2bits_t;
 
-extern volatile __BRGCON2bits_t __at 0xf71 BRGCON2bits;
+extern volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-extern __sfr __at 0xf72 BRGCON3;
+extern __sfr __at (0xf72) BRGCON3;
 typedef union {
        struct {
                unsigned SEG2PH0:1;
@@ -1669,9 +1669,9 @@ typedef union {
        };
 } __BRGCON3bits_t;
 
-extern volatile __BRGCON3bits_t __at 0xf72 BRGCON3bits;
+extern volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-extern __sfr __at 0xf73 CIOCON;
+extern __sfr __at (0xf73) CIOCON;
 typedef union {
        struct {
                unsigned :1;
@@ -1685,9 +1685,9 @@ typedef union {
        };
 } __CIOCONbits_t;
 
-extern volatile __CIOCONbits_t __at 0xf73 CIOCONbits;
+extern volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-extern __sfr __at 0xf74 COMSTAT;
+extern __sfr __at (0xf74) COMSTAT;
 typedef union {
        struct {
                unsigned EWARN:1;
@@ -1701,9 +1701,9 @@ typedef union {
        };
 } __COMSTATbits_t;
 
-extern volatile __COMSTATbits_t __at 0xf74 COMSTATbits;
+extern volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-extern __sfr __at 0xf75 RXERRCNT;
+extern __sfr __at (0xf75) RXERRCNT;
 typedef union {
        struct {
                unsigned REC0:1;
@@ -1717,9 +1717,9 @@ typedef union {
        };
 } __RXERRCNTbits_t;
 
-extern volatile __RXERRCNTbits_t __at 0xf75 RXERRCNTbits;
+extern volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-extern __sfr __at 0xf76 TXERRCNT;
+extern __sfr __at (0xf76) TXERRCNT;
 typedef union {
        struct {
                unsigned TEC0:1;
@@ -1733,9 +1733,9 @@ typedef union {
        };
 } __TXERRCNTbits_t;
 
-extern volatile __TXERRCNTbits_t __at 0xf76 TXERRCNTbits;
+extern volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -1782,9 +1782,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;
@@ -1809,9 +1809,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -1847,9 +1847,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -1874,9 +1874,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -1912,9 +1912,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -1928,9 +1928,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;
@@ -1944,9 +1944,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -1960,9 +1960,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -1976,9 +1976,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -1992,9 +1992,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -2008,9 +2008,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;
@@ -2024,9 +2024,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -2040,9 +2040,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -2056,9 +2056,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned :1;
@@ -2072,9 +2072,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -2088,9 +2088,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;
@@ -2104,9 +2104,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;
@@ -2120,9 +2120,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 CCP2IE:1;
@@ -2136,9 +2136,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 CCP2IF:1;
@@ -2152,9 +2152,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 CCP2IP:1;
@@ -2168,9 +2168,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned RX0IE:1;
@@ -2184,9 +2184,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned RX0IF:1;
@@ -2200,9 +2200,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned RX0IP:1;
@@ -2216,9 +2216,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -2232,12 +2232,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -2251,9 +2251,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;
@@ -2267,12 +2267,12 @@ 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 PSPCON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -2286,9 +2286,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -2302,11 +2302,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -2320,9 +2320,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -2336,9 +2336,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb6 ECCPAS;
+extern __sfr __at (0xfb6) ECCPAS;
 typedef union {
        struct {
                unsigned PSSBD0:1;
@@ -2352,9 +2352,9 @@ typedef union {
        };
 } __ECCPASbits_t;
 
-extern volatile __ECCPASbits_t __at 0xfb6 ECCPASbits;
+extern volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
 
-extern __sfr __at 0xfb7 ECCP1DEL;
+extern __sfr __at (0xfb7) ECCP1DEL;
 typedef union {
        struct {
                unsigned EPDC0:1;
@@ -2368,9 +2368,9 @@ typedef union {
        };
 } __ECCP1DELbits_t;
 
-extern volatile __ECCP1DELbits_t __at 0xfb7 ECCP1DELbits;
+extern volatile __ECCP1DELbits_t __at (0xfb7) ECCP1DELbits;
 
-extern __sfr __at 0xfba ECCP1CON;
+extern __sfr __at (0xfba) ECCP1CON;
 typedef union {
        struct {
                unsigned ECCP1M0:1;
@@ -2384,11 +2384,11 @@ typedef union {
        };
 } __ECCP1CONbits_t;
 
-extern volatile __ECCP1CONbits_t __at 0xfba ECCP1CONbits;
+extern volatile __ECCP1CONbits_t __at (0xfba) ECCP1CONbits;
 
-extern __sfr __at 0xfbb ECCPR1L;
-extern __sfr __at 0xfbc ECCPR1H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) ECCPR1L;
+extern __sfr __at (0xfbc) ECCPR1H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -2402,11 +2402,11 @@ typedef union {
        };
 } __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 0xfc1 ADCON1;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -2420,9 +2420,9 @@ typedef union {
        };
 } __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;
@@ -2436,11 +2436,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -2454,9 +2454,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -2470,9 +2470,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -2486,11 +2486,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -2504,11 +2504,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;
@@ -2522,11 +2522,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;
@@ -2540,9 +2540,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;
@@ -2567,9 +2567,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;
@@ -2594,9 +2594,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;
@@ -2610,12 +2610,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -2629,32 +2629,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;
@@ -2679,9 +2679,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;
@@ -2695,9 +2695,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;
@@ -2711,18 +2711,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -2736,11 +2736,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 */

diff --git a/device/include/pic16/pic18f452.h b/device/include/pic16/pic18f452.h
index 6d0329aaf08dd474baba8e01fb12de2525e78416..5c8452946f3ba1cd6a987d8bd9bc2b661b032bc8 100644 (file)
--- a/device/include/pic16/pic18f452.h
+++ b/device/include/pic16/pic18f452.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F452_H__
 #define __PIC18F452_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 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -127,9 +127,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -154,9 +154,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -192,9 +192,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -208,9 +208,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;
@@ -224,9 +224,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -240,9 +240,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -256,9 +256,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -272,9 +272,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -288,9 +288,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;
@@ -304,9 +304,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -320,9 +320,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -336,9 +336,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned :1;
@@ -352,9 +352,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -368,9 +368,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;
@@ -384,9 +384,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;
@@ -400,9 +400,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 CCP2IE:1;
@@ -416,9 +416,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 CCP2IF:1;
@@ -432,9 +432,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 CCP2IP:1;
@@ -448,9 +448,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;
@@ -464,12 +464,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -483,9 +483,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;
@@ -499,12 +499,12 @@ 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 0xfb1 T3CON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -518,11 +518,11 @@ 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 0xfba CCP2CON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -536,11 +536,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -554,11 +554,11 @@ typedef union {
        };
 } __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 0xfc1 ADCON1;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -572,9 +572,9 @@ typedef union {
        };
 } __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;
@@ -588,11 +588,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -606,9 +606,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -622,9 +622,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -638,11 +638,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -656,11 +656,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;
@@ -674,11 +674,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;
@@ -692,9 +692,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;
@@ -719,9 +719,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;
@@ -746,9 +746,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;
@@ -762,9 +762,9 @@ 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 (0xfd5) T0CON;
 typedef union {
        struct {
                unsigned T0PS0:1;
@@ -778,11 +778,11 @@ typedef union {
        };
 } __T0CONbits_t;
 
-extern volatile __T0CONbits_t __at 0xfd5 T0CONbits;
+extern volatile __T0CONbits_t __at (0xfd5) T0CONbits;
 
-extern __sfr __at 0xfd6 TMR0L;
-extern __sfr __at 0xfd7 TMR0H;
-extern __sfr __at 0xfd8 STATUS;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -796,32 +796,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;
@@ -846,9 +846,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;
@@ -862,9 +862,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;
@@ -878,18 +878,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;
@@ -903,11 +903,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 */

diff --git a/device/include/pic16/pic18f4520.h b/device/include/pic16/pic18f4520.h
index ce55e3b41f4728f0ac8f3dfac26696154b54e2ad..1400956dd83790074eba5e81127a3bb5e3b0c3a3 100644 (file)
--- a/device/include/pic16/pic18f4520.h
+++ b/device/include/pic16/pic18f4520.h
@@ -17,7 +17,7 @@
 #ifndef __PIC18F4520_H__
 #define __PIC18F4520_H__ 1
 
-extern __sfr __at 0xF80 PORTA;
+extern __sfr __at (0xF80) PORTA;
 typedef union {
        struct {
                unsigned RA0            : 1;
@@ -54,9 +54,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTA_t;
-extern volatile __PORTA_t __at 0xF80 PORTAbits;
+extern volatile __PORTA_t __at (0xF80) PORTAbits;
 
-extern __sfr __at 0xF81 PORTB;
+extern __sfr __at (0xF81) PORTB;
 typedef union {
        struct {
                unsigned RB0            : 1;
@@ -83,9 +83,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTB_t;
-extern volatile __PORTB_t __at 0xF81 PORTBbits;
+extern volatile __PORTB_t __at (0xF81) PORTBbits;
 
-extern __sfr __at 0xF82 PORTC;
+extern __sfr __at (0xF82) PORTC;
 typedef union {
        struct {
                unsigned RC0            : 1;
@@ -132,9 +132,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTC_t;
-extern volatile __PORTC_t __at 0xF82 PORTCbits;
+extern volatile __PORTC_t __at (0xF82) PORTCbits;
 
-extern __sfr __at 0xF83 PORTD;
+extern __sfr __at (0xF83) PORTD;
 typedef union {
        struct {
                unsigned RD0            : 1;
@@ -161,9 +161,9 @@ typedef union {
                unsigned ECCPD          :1;
        };
 } __PORTD_t;
-extern volatile __PORTD_t __at 0xF83 PORTDbits;
+extern volatile __PORTD_t __at (0xF83) PORTDbits;
 
-extern __sfr __at 0xF84 PORTE;
+extern __sfr __at (0xF84) PORTE;
 typedef union {
        struct {
                unsigned RE0            : 1;
@@ -190,9 +190,9 @@ typedef union {
                unsigned                :1;
        };
 } __PORTE_t;
-extern volatile __PORTE_t __at 0xF84 PORTEbits;
+extern volatile __PORTE_t __at (0xF84) PORTEbits;
 
-extern __sfr __at 0xF89 LATA;
+extern __sfr __at (0xF89) LATA;
 typedef union {
        struct {
                unsigned LATA0          : 1;
@@ -205,9 +205,9 @@ typedef union {
                unsigned LATA7          : 1;
        };
 } __LATA_t;
-extern volatile __LATA_t __at 0xF89 LATAbits;
+extern volatile __LATA_t __at (0xF89) LATAbits;
 
-extern __sfr __at 0xF8A LATB;
+extern __sfr __at (0xF8A) LATB;
 typedef union {
        struct {
                unsigned LATB0          : 1;
@@ -220,9 +220,9 @@ typedef union {
                unsigned LATB7          : 1;
        };
 } __LATB_t;
-extern volatile __LATB_t __at 0xF8A LATBbits;
+extern volatile __LATB_t __at (0xF8A) LATBbits;
 
-extern __sfr __at 0xF8B LATC;
+extern __sfr __at (0xF8B) LATC;
 typedef union {
        struct {
                unsigned LATC0          : 1;
@@ -235,9 +235,9 @@ typedef union {
                unsigned LATC7          : 1;
        };
 } __LATC_t;
-extern volatile __LATC_t __at 0xF8B LATCbits;
+extern volatile __LATC_t __at (0xF8B) LATCbits;
 
-extern __sfr __at 0xF8C LATD;
+extern __sfr __at (0xF8C) LATD;
 typedef union {
        struct {
                unsigned LATD0          : 1;
@@ -250,9 +250,9 @@ typedef union {
                unsigned LATD7          : 1;
        };
 } __LATD_t;
-extern volatile __LATD_t __at 0xF8C LATDbits;
+extern volatile __LATD_t __at (0xF8C) LATDbits;
 
-extern __sfr __at 0xF8D LATE;
+extern __sfr __at (0xF8D) LATE;
 typedef union {
        struct {
                unsigned LATE0          : 1;
@@ -265,9 +265,9 @@ typedef union {
                unsigned                : 1;
        };
 } __LATE_t;
-extern volatile __LATE_t __at 0xF8D LATEbits;
+extern volatile __LATE_t __at (0xF8D) LATEbits;
 
-extern __sfr __at 0xF92 TRISA;
+extern __sfr __at (0xF92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0         : 1;
@@ -280,9 +280,9 @@ typedef union {
                unsigned TRISA7         : 1;
        };
 } __TRISA_t;
-extern volatile __TRISA_t __at 0xF92 TRISAbits;
+extern volatile __TRISA_t __at (0xF92) TRISAbits;
 
-extern __sfr __at 0xF93 TRISB;
+extern __sfr __at (0xF93) TRISB;
 typedef union {
        struct {
                unsigned TRISB0         : 1;
@@ -295,9 +295,9 @@ typedef union {
                unsigned TRISB7         : 1;
        };
 } __TRISB_t;
-extern volatile __TRISB_t __at 0xF93 TRISBbits;
+extern volatile __TRISB_t __at (0xF93) TRISBbits;
 
-extern __sfr __at 0xF94 TRISC;
+extern __sfr __at (0xF94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0         : 1;
@@ -310,9 +310,9 @@ typedef union {
                unsigned TRISC7         : 1;
        };
 } __TRISC_t;
-extern volatile __TRISC_t __at 0xF94 TRISCbits;
+extern volatile __TRISC_t __at (0xF94) TRISCbits;
 
-extern __sfr __at 0xF95 TRISD;
+extern __sfr __at (0xF95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0         : 1;
@@ -325,9 +325,9 @@ typedef union {
                unsigned TRISD7         : 1;
        };
 } __TRISD_t;
-extern volatile __TRISD_t __at 0xF95 TRISDbits;
+extern volatile __TRISD_t __at (0xF95) TRISDbits;
 
-extern __sfr __at 0xF96 TRISE;
+extern __sfr __at (0xF96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0         : 1;
@@ -340,9 +340,9 @@ typedef union {
                unsigned IBF            : 1;
        };
 } __TRISE_t;
-extern volatile __TRISE_t __at 0xF96 TRISEbits;
+extern volatile __TRISE_t __at (0xF96) TRISEbits;
 
-extern __sfr __at 0xF9B OSCTUNE;
+extern __sfr __at (0xF9B) OSCTUNE;
 typedef union {
        struct {
                unsigned TUN            : 5;
@@ -351,9 +351,9 @@ typedef union {
                unsigned HF256DIV       : 1;
        };
 } __OSCTUNE_t;
-extern volatile __OSCTUNE_t __at 0xF9B OSCTUNEbits;
+extern volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;
 
-extern __sfr __at 0xF9D PIE1;
+extern __sfr __at (0xF9D) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE         : 1;
@@ -366,9 +366,9 @@ typedef union {
                unsigned PSPIE          : 1;
        };
 } __PIE1_t;
-extern volatile __PIE1_t __at 0xF9D PIE1bits;
+extern volatile __PIE1_t __at (0xF9D) PIE1bits;
 
-extern __sfr __at 0xF9E PIR1;
+extern __sfr __at (0xF9E) PIR1;
 typedef union {
        struct {
                unsigned TMR1IF         : 1;
@@ -381,9 +381,9 @@ typedef union {
                unsigned PSPIF          : 1;
        };
 } __PIR1_t;
-extern volatile __PIR1_t __at 0xF9E PIR1bits;
+extern volatile __PIR1_t __at (0xF9E) PIR1bits;
 
-extern __sfr __at 0xF9F IPR1;
+extern __sfr __at (0xF9F) IPR1;
 typedef union {
        struct {
                unsigned TMR1IP         : 1;
@@ -396,9 +396,9 @@ typedef union {
                unsigned PSPIP          : 1;
        };
 } __IPR1_t;
-extern volatile __IPR1_t __at 0xF9F IPR1bits;
+extern volatile __IPR1_t __at (0xF9F) IPR1bits;
 
-extern __sfr __at 0xFA0 PIE2;
+extern __sfr __at (0xFA0) PIE2;
 typedef union {
        struct {
                unsigned CCP2IE         : 1;
@@ -411,9 +411,9 @@ typedef union {
                unsigned OSCFIE         : 1;
        };
 } __PIE2_t;
-extern volatile __PIE2_t __at 0xFA0 PIE2bits;
+extern volatile __PIE2_t __at (0xFA0) PIE2bits;
 
-extern __sfr __at 0xFA1 PIR2;
+extern __sfr __at (0xFA1) PIR2;
 typedef union {
        struct {
                unsigned CCP2IF         : 1;
@@ -426,9 +426,9 @@ typedef union {
                unsigned OSCFIF         : 1;
        };
 } __PIR2_t;
-extern volatile __PIR2_t __at 0xFA1 PIR2bits;
+extern volatile __PIR2_t __at (0xFA1) PIR2bits;
 
-extern __sfr __at 0xFA2 IPR2;
+extern __sfr __at (0xFA2) IPR2;
 typedef union {
        struct {
                unsigned CCP2IP         : 1;
@@ -441,9 +441,9 @@ typedef union {
                unsigned OSCFIP         : 1;
        };
 } __IPR2_t;
-extern volatile __IPR2_t __at 0xFA2 IPR2bits;
+extern volatile __IPR2_t __at (0xFA2) IPR2bits;
 
-extern __sfr __at 0xFA6 EECON1;
+extern __sfr __at (0xFA6) EECON1;
 typedef union {
        struct {
                unsigned RD             : 1;
@@ -456,15 +456,15 @@ typedef union {
                unsigned EEPGD          : 1;
        };
 } __EECON1_t;
-extern volatile __EECON1_t __at 0xFA6 EECON1bits;
+extern volatile __EECON1_t __at (0xFA6) EECON1bits;
 
-extern __sfr __at 0xFA7 EECON2;
+extern __sfr __at (0xFA7) EECON2;
 
-extern __sfr __at 0xFA8 EEDATA;
+extern __sfr __at (0xFA8) EEDATA;
 
-extern __sfr __at 0xFA9 EEADR;
+extern __sfr __at (0xFA9) EEADR;
 
-extern __sfr __at 0xFAB RCSTA;
+extern __sfr __at (0xFAB) RCSTA;
 typedef union {
        struct {
                unsigned RX9D           : 1;
@@ -477,9 +477,9 @@ typedef union {
                unsigned SPEN           : 1;
        };
 } __RCSTA_t;
-extern volatile __RCSTA_t __at 0xFAB RCSTAbits;
+extern volatile __RCSTA_t __at (0xFAB) RCSTAbits;
 
-extern __sfr __at 0xFAC TXSTA;
+extern __sfr __at (0xFAC) TXSTA;
 typedef union {
        struct {
                unsigned TX9D           : 1;
@@ -492,17 +492,17 @@ typedef union {
                unsigned CSRC           : 1;
        };
 } __TXSTA_t;
-extern volatile __TXSTA_t __at 0xFAC TXSTAbits;
+extern volatile __TXSTA_t __at (0xFAC) TXSTAbits;
 
-extern __sfr __at 0xFAD TXREG;
+extern __sfr __at (0xFAD) TXREG;
 
-extern __sfr __at 0xFAE RCREG;
+extern __sfr __at (0xFAE) RCREG;
 
-extern __sfr __at 0xFAF SPBRG;
+extern __sfr __at (0xFAF) SPBRG;
 
-extern __sfr __at 0xFB0 SPBRGH;
+extern __sfr __at (0xFB0) SPBRGH;
 
-extern __sfr __at 0xFB1 T3CON;
+extern __sfr __at (0xFB1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON         : 1;
@@ -514,13 +514,13 @@ typedef union {
                unsigned RD16           : 1;
        };
 } __T3CON_t;
-extern volatile __T3CON_t __at 0xFB1 T3CONbits;
+extern volatile __T3CON_t __at (0xFB1) T3CONbits;
 
-extern __sfr __at 0xFB2 TMR3L;
+extern __sfr __at (0xFB2) TMR3L;
 
-extern __sfr __at 0xFB3 TMR3H;
+extern __sfr __at (0xFB3) TMR3H;
 
-extern __sfr __at 0xFB4 CMCON;
+extern __sfr __at (0xFB4) CMCON;
 typedef union {
        struct {
                unsigned CM             : 3;
@@ -531,9 +531,9 @@ typedef union {
                unsigned C2OUT          : 1;
        };
 } __CMCON_t;
-extern volatile __CMCON_t __at 0xFB4 CMCONbits;
+extern volatile __CMCON_t __at (0xFB4) CMCONbits;
 
-extern __sfr __at 0xFB5 CVRCON;
+extern __sfr __at (0xFB5) CVRCON;
 typedef union {
        struct {
                unsigned CVR            : 4;
@@ -543,9 +543,9 @@ typedef union {
                unsigned CVREN          : 1;
        };
 } __CVRCON_t;
-extern volatile __CVRCON_t __at 0xFB5 CVRCONbits;
+extern volatile __CVRCON_t __at (0xFB5) CVRCONbits;
 
-extern __sfr __at 0xFB6 ECCPAS1;
+extern __sfr __at (0xFB6) ECCPAS1;
 typedef union {
        struct {
                unsigned PSSBD          : 2;
@@ -554,18 +554,18 @@ typedef union {
                unsigned ECCPASE        : 1;
        };
 } __ECCPAS1_t;
-extern volatile __ECCPAS1_t __at 0xFB6 ECCPAS1bits;
+extern volatile __ECCPAS1_t __at (0xFB6) ECCPAS1bits;
 
-extern __sfr __at 0xFB7 PWM1CON;
+extern __sfr __at (0xFB7) PWM1CON;
 typedef union {
        struct {
                unsigned PDC            : 7;
                unsigned PRSEN          : 1;
        };
 } __PWM1CON_t;
-extern volatile __PWM1CON_t __at 0xFB7 PWM1CONbits;
+extern volatile __PWM1CON_t __at (0xFB7) PWM1CONbits;
 
-extern __sfr __at 0xFB8 BAUDCON;
+extern __sfr __at (0xFB8) BAUDCON;
 typedef union {
        struct {
                unsigned ABDEN          : 1;
@@ -578,9 +578,9 @@ typedef union {
                unsigned ABDOVF         : 1;
        };
 } __BAUDCON_t;
-extern volatile __BAUDCON_t __at 0xFB8 BAUDCONbits;
+extern volatile __BAUDCON_t __at (0xFB8) BAUDCONbits;
 
-extern __sfr __at 0xFBA CCP2CON;
+extern __sfr __at (0xFBA) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M          : 4;
@@ -589,13 +589,13 @@ typedef union {
                unsigned                : 1;
        };
 } __CCP2CON_t;
-extern volatile __CCP2CON_t __at 0xFBA CCP2CONbits;
+extern volatile __CCP2CON_t __at (0xFBA) CCP2CONbits;
 
-extern __sfr __at 0xFBB CCPR2L;
+extern __sfr __at (0xFBB) CCPR2L;
 
-extern __sfr __at 0xFBC CCPR2H;
+extern __sfr __at (0xFBC) CCPR2H;
 
-extern __sfr __at 0xFBD ECCP1CON;
+extern __sfr __at (0xFBD) ECCP1CON;
 typedef union {
        struct {
                unsigned CCP1M          : 4;
@@ -603,13 +603,13 @@ typedef union {
                unsigned P1M            : 2;
        };
 } __ECCP1CON_t;
-extern volatile __ECCP1CON_t __at 0xFBD ECCP1CONbits;
+extern volatile __ECCP1CON_t __at (0xFBD) ECCP1CONbits;
 
-extern __sfr __at 0xFBE CCPR1L;
+extern __sfr __at (0xFBE) CCPR1L;
 
-extern __sfr __at 0xFBF CCPR1H;
+extern __sfr __at (0xFBF) CCPR1H;
 
-extern __sfr __at 0xFC0 ADCON2;
+extern __sfr __at (0xFC0) ADCON2;
 typedef union {
        struct {
                unsigned ADCS           : 3;
@@ -618,9 +618,9 @@ typedef union {
                unsigned ADFM           : 1;
        };
 } __ADCON2_t;
-extern volatile __ADCON2_t __at 0xFC0 ADCON2bits;
+extern volatile __ADCON2_t __at (0xFC0) ADCON2bits;
 
-extern __sfr __at 0xFC1 ADCON1;
+extern __sfr __at (0xFC1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG           : 4;
@@ -629,9 +629,9 @@ typedef union {
                unsigned                : 1;
        };
 } __ADCON1_t;
-extern volatile __ADCON1_t __at 0xFC1 ADCON1bits;
+extern volatile __ADCON1_t __at (0xFC1) ADCON1bits;
 
-extern __sfr __at 0xFC2 ADCON0;
+extern __sfr __at (0xFC2) ADCON0;
 typedef union {
        struct {
                unsigned ADON           : 1;
@@ -641,13 +641,13 @@ typedef union {
                unsigned                : 1;
        };
 } __ADCON0_t;
-extern volatile __ADCON0_t __at 0xFC2 ADCON0bits;
+extern volatile __ADCON0_t __at (0xFC2) ADCON0bits;
 
-extern __sfr __at 0xFC3 ADRESL;
+extern __sfr __at (0xFC3) ADRESL;
 
-extern __sfr __at 0xFC4 ADRESH;
+extern __sfr __at (0xFC4) ADRESH;
 
-extern __sfr __at 0xFC5 SSPCON2;
+extern __sfr __at (0xFC5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN            : 1;
@@ -660,9 +660,9 @@ typedef union {
                unsigned GCEN           : 1;
        };
 } __SSPCON2_t;
-extern volatile __SSPCON2_t __at 0xFC5 SSPCON2bits;
+extern volatile __SSPCON2_t __at (0xFC5) SSPCON2bits;
 
-extern __sfr __at 0xFC6 SSPCON1;
+extern __sfr __at (0xFC6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM           : 4;
@@ -672,9 +672,9 @@ typedef union {
                unsigned WCOL           : 1;
        };
 } __SSPCON1_t;
-extern volatile __SSPCON1_t __at 0xFC6 SSPCON1bits;
+extern volatile __SSPCON1_t __at (0xFC6) SSPCON1bits;
 
-extern __sfr __at 0xFC7 SSPSTAT;
+extern __sfr __at (0xFC7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF             : 1;
@@ -687,13 +687,13 @@ typedef union {
                unsigned SMP            : 1;
        };
 } __SSPSTAT_t;
-extern volatile __SSPSTAT_t __at 0xFC7 SSPSTATbits;
+extern volatile __SSPSTAT_t __at (0xFC7) SSPSTATbits;
 
-extern __sfr __at 0xFC8 SSPADD;
+extern __sfr __at (0xFC8) SSPADD;
 
-extern __sfr __at 0xFC9 SSPBUF;
+extern __sfr __at (0xFC9) SSPBUF;
 
-extern __sfr __at 0xFCA T2CON;
+extern __sfr __at (0xFCA) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS         : 2;
@@ -702,13 +702,13 @@ typedef union {
                unsigned                : 1;
        };
 } __T2CON_t;
-extern volatile __T2CON_t __at 0xFCA T2CONbits;
+extern volatile __T2CON_t __at (0xFCA) T2CONbits;
 
-extern __sfr __at 0xFCB PR2;
+extern __sfr __at (0xFCB) PR2;
 
-extern __sfr __at 0xFCC TMR2;
+extern __sfr __at (0xFCC) TMR2;
 
-extern __sfr __at 0xFCD T1CON;
+extern __sfr __at (0xFCD) T1CON;
 typedef union {
        struct {
                unsigned TMR1ON         : 1;
@@ -720,13 +720,13 @@ typedef union {
                unsigned RD16           : 1;
        };
 } __T1CON_t;
-extern volatile __T1CON_t __at 0xFCD T1CONbits;
+extern volatile __T1CON_t __at (0xFCD) T1CONbits;
 
-extern __sfr __at 0xFCE TMR1L;
+extern __sfr __at (0xFCE) TMR1L;
 
-extern __sfr __at 0xFCF TMR1H;
+extern __sfr __at (0xFCF) TMR1H;
 
-extern __sfr __at 0xFD0 RCON;
+extern __sfr __at (0xFD0) RCON;
 typedef union {
        struct {
                unsigned nBOR           : 1;
@@ -739,9 +739,9 @@ typedef union {
                unsigned IPEN           : 1;
        };
 } __RCON_t;
-extern volatile __RCON_t __at 0xFD0 RCONbits;
+extern volatile __RCON_t __at (0xFD0) RCONbits;
 
-extern __sfr __at 0xFD1 WDTCON;
+extern __sfr __at (0xFD1) WDTCON;
 typedef union {
        struct {
                unsigned SWDTEN         : 1;
@@ -754,9 +754,9 @@ typedef union {
                unsigned                : 1;
        };
 } __WDTCON_t;
-extern volatile __WDTCON_t __at 0xFD1 WDTCONbits;
+extern volatile __WDTCON_t __at (0xFD1) WDTCONbits;
 
-extern __sfr __at 0xFD2 LVDCON;
+extern __sfr __at (0xFD2) LVDCON;
 typedef union {
        struct {
                unsigned LVDL           : 4;
@@ -766,9 +766,9 @@ typedef union {
                unsigned                : 1;
        };
 } __LVDCON_t;
-extern volatile __LVDCON_t __at 0xFD2 LVDCONbits;
+extern volatile __LVDCON_t __at (0xFD2) LVDCONbits;
 
-extern __sfr __at 0xFD3 OSCCON;
+extern __sfr __at (0xFD3) OSCCON;
 typedef union {
        struct {
                unsigned SCS            : 2;
@@ -778,9 +778,9 @@ typedef union {
                unsigned IDLEN          : 1;
        };
 } __OSCCON_t;
-extern volatile __OSCCON_t __at 0xFD3 OSCCONbits;
+extern volatile __OSCCON_t __at (0xFD3) OSCCONbits;
 
-extern __sfr __at 0xFD5 T0CON;
+extern __sfr __at (0xFD5) T0CON;
 typedef union {
        struct {
                unsigned T0PS           : 3;
@@ -791,13 +791,13 @@ typedef union {
                unsigned TMR0ON         : 1;
        };
 } __T0CON_t;
-extern volatile __T0CON_t __at 0xFD5 T0CONbits;
+extern volatile __T0CON_t __at (0xFD5) T0CONbits;
 
-extern __sfr __at 0xFD6 TMR0L;
+extern __sfr __at (0xFD6) TMR0L;
 
-extern __sfr __at 0xFD7 TMR0H;
+extern __sfr __at (0xFD7) TMR0H;
 
-extern __sfr __at 0xFD8 STATUS;
+extern __sfr __at (0xFD8) STATUS;
 typedef union {
        struct {
                unsigned C              : 1;
@@ -810,11 +810,11 @@ typedef union {
                unsigned                : 1;
        };
 } __STATUS_t;
-extern volatile __STATUS_t __at 0xFD8 STATUSbits;
+extern volatile __STATUS_t __at (0xFD8) STATUSbits;
 
-extern __sfr __at 0xFD9 FSR2L;
+extern __sfr __at (0xFD9) FSR2L;
 
-extern __sfr __at 0xFDA FSR2H;
+extern __sfr __at (0xFDA) FSR2H;
 typedef union {
        struct {
                unsigned FSR2H          : 4;
@@ -824,19 +824,19 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR2H_t;
-extern volatile __FSR2H_t __at 0xFDA FSR2Hbits;
+extern volatile __FSR2H_t __at (0xFDA) FSR2Hbits;
 
-extern __sfr __at 0xFDB PLUSW2;
+extern __sfr __at (0xFDB) PLUSW2;
 
-extern __sfr __at 0xFDC PREINC2;
+extern __sfr __at (0xFDC) PREINC2;
 
-extern __sfr __at 0xFDD POSTDEC2;
+extern __sfr __at (0xFDD) POSTDEC2;
 
-extern __sfr __at 0xFDE POSTINC2;
+extern __sfr __at (0xFDE) POSTINC2;
 
-extern __sfr __at 0xFDF INDF2;
+extern __sfr __at (0xFDF) INDF2;
 
-extern __sfr __at 0xFE0 BSR;
+extern __sfr __at (0xFE0) BSR;
 typedef union {
        struct {
                unsigned BSR            : 4;
@@ -846,11 +846,11 @@ typedef union {
                unsigned                : 1;
        };
 } __BSR_t;
-extern volatile __BSR_t __at 0xFE0 BSRbits;
+extern volatile __BSR_t __at (0xFE0) BSRbits;
 
-extern __sfr __at 0xFE1 FSR1L;
+extern __sfr __at (0xFE1) FSR1L;
 
-extern __sfr __at 0xFE2 FSR1H;
+extern __sfr __at (0xFE2) FSR1H;
 typedef union {
        struct {
                unsigned FSR1H          : 4;
@@ -860,23 +860,23 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR1H_t;
-extern volatile __FSR1H_t __at 0xFE2 FSR1Hbits;
+extern volatile __FSR1H_t __at (0xFE2) FSR1Hbits;
 
-extern __sfr __at 0xFE3 PLUSW1;
+extern __sfr __at (0xFE3) PLUSW1;
 
-extern __sfr __at 0xFE4 PREINC1;
+extern __sfr __at (0xFE4) PREINC1;
 
-extern __sfr __at 0xFE5 POSTDEC1;
+extern __sfr __at (0xFE5) POSTDEC1;
 
-extern __sfr __at 0xFE6 POSTINC1;
+extern __sfr __at (0xFE6) POSTINC1;
 
-extern __sfr __at 0xFE7 INDF1;
+extern __sfr __at (0xFE7) INDF1;
 
-extern __sfr __at 0xFE8 WREG;
+extern __sfr __at (0xFE8) WREG;
 
-extern __sfr __at 0xFE9 FSR0L;
+extern __sfr __at (0xFE9) FSR0L;
 
-extern __sfr __at 0xFEA FSR0H;
+extern __sfr __at (0xFEA) FSR0H;
 typedef union {
        struct {
                unsigned FSR0H          : 4;
@@ -886,19 +886,19 @@ typedef union {
                unsigned                : 1;
        };
 } __FSR0H_t;
-extern volatile __FSR0H_t __at 0xFEA FSR0Hbits;
+extern volatile __FSR0H_t __at (0xFEA) FSR0Hbits;
 
-extern __sfr __at 0xFEB PLUSW0;
+extern __sfr __at (0xFEB) PLUSW0;
 
-extern __sfr __at 0xFEC PREINC0;
+extern __sfr __at (0xFEC) PREINC0;
 
-extern __sfr __at 0xFED POSTDEC0;
+extern __sfr __at (0xFED) POSTDEC0;
 
-extern __sfr __at 0xFEE POSTINC0;
+extern __sfr __at (0xFEE) POSTINC0;
 
-extern __sfr __at 0xFEF INDF0;
+extern __sfr __at (0xFEF) INDF0;
 
-extern __sfr __at 0xFF0 INTCON3;
+extern __sfr __at (0xFF0) INTCON3;
 typedef union {
        struct {
                unsigned INT1IF         : 1;
@@ -911,9 +911,9 @@ typedef union {
                unsigned INT2IP         : 1;
        };
 } __INTCON3_t;
-extern volatile __INTCON3_t __at 0xFF0 INTCON3bits;
+extern volatile __INTCON3_t __at (0xFF0) INTCON3bits;
 
-extern __sfr __at 0xFF1 INTCON2;
+extern __sfr __at (0xFF1) INTCON2;
 typedef union {
        struct {
                unsigned RBIP           : 1;
@@ -926,9 +926,9 @@ typedef union {
                unsigned                : 1;
        };
 } __INTCON2_t;
-extern volatile __INTCON2_t __at 0xFF1 INTCON2bits;
+extern volatile __INTCON2_t __at (0xFF1) INTCON2bits;
 
-extern __sfr __at 0xFF2 INTCON;
+extern __sfr __at (0xFF2) INTCON;
 typedef union {
        struct {
                unsigned RBIF           : 1;
@@ -961,19 +961,19 @@ typedef union {
                unsigned GIEH           : 1;
        };
 } __INTCON_t;
-extern volatile __INTCON_t __at 0xFF2 INTCONbits;
+extern volatile __INTCON_t __at (0xFF2) INTCONbits;
 
-extern __sfr __at 0xFF3 PRODL;
+extern __sfr __at (0xFF3) PRODL;
 
-extern __sfr __at 0xFF4 PRODH;
+extern __sfr __at (0xFF4) PRODH;
 
-extern __sfr __at 0xFF5 TABLAT;
+extern __sfr __at (0xFF5) TABLAT;
 
-extern __sfr __at 0xFF6 TBLPTRL;
+extern __sfr __at (0xFF6) TBLPTRL;
 
-extern __sfr __at 0xFF7 TBLPTRH;
+extern __sfr __at (0xFF7) TBLPTRH;
 
-extern __sfr __at 0xFF8 TBLPTRU;
+extern __sfr __at (0xFF8) TBLPTRU;
 typedef union {
        struct {
                unsigned TBLPTRU        : 5;
@@ -982,19 +982,19 @@ typedef union {
                unsigned                : 1;
        };
 } __TBLPTRU_t;
-extern volatile __TBLPTRU_t __at 0xFF8 TBLPTRUbits;
+extern volatile __TBLPTRU_t __at (0xFF8) TBLPTRUbits;
 
-extern __sfr __at 0xFF9 PCL;
+extern __sfr __at (0xFF9) PCL;
 
-extern __sfr __at 0xFFA PCLATH;
+extern __sfr __at (0xFFA) PCLATH;
 typedef union {
        struct {
                unsigned PCH            : 8;
        };
 } __PCLATH_t;
-extern volatile __PCLATH_t __at 0xFFA PCLATHbits;
+extern volatile __PCLATH_t __at (0xFFA) PCLATHbits;
 
-extern __sfr __at 0xFFB PCLATU;
+extern __sfr __at (0xFFB) PCLATU;
 typedef union {
        struct {
                unsigned PCU            : 5;
@@ -1003,9 +1003,9 @@ typedef union {
                unsigned                : 1;
        };
 } __PCLATU_t;
-extern volatile __PCLATU_t __at 0xFFB PCLATUbits;
+extern volatile __PCLATU_t __at (0xFFB) PCLATUbits;
 
-extern __sfr __at 0xFFC STKPTR;
+extern __sfr __at (0xFFC) STKPTR;
 typedef union {
        struct {
                unsigned STKPTR         : 5;
@@ -1014,13 +1014,13 @@ typedef union {
                unsigned STKFUL         : 1;
        };
 } __STKPTR_t;
-extern volatile __STKPTR_t __at 0xFFC STKPTRbits;
+extern volatile __STKPTR_t __at (0xFFC) STKPTRbits;
 
-extern __sfr __at 0xFFD TOSL;
+extern __sfr __at (0xFFD) TOSL;
 
-extern __sfr __at 0xFFE TOSH;
+extern __sfr __at (0xFFE) TOSH;
 
-extern __sfr __at 0xFFF TOSU;
+extern __sfr __at (0xFFF) TOSU;
 typedef union {
        struct {
                unsigned TOSU           : 5;
@@ -1029,7 +1029,7 @@ typedef union {
                unsigned                : 1;
        };
 } __TOSU_t;
-extern volatile __TOSU_t __at 0xFFF TOSUbits;
+extern volatile __TOSU_t __at (0xFFF) TOSUbits;
 
 /* Configuration register locations */
 #define        CONFIG1H        0x300001

diff --git a/device/include/pic16/pic18f458.h b/device/include/pic16/pic18f458.h
index 307f3d1264cd0d3f106f976c5abeb0b1e1ed4e41..744a6fdcc374dd1d01dc4ab2b3cff80b1528a53a 100644 (file)
--- a/device/include/pic16/pic18f458.h
+++ b/device/include/pic16/pic18f458.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F458_H__
 #define __PIC18F458_H__
 
-extern __sfr __at 0xf00 RXF0SIDH;
+extern __sfr __at (0xf00) RXF0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RXF0SIDHbits_t;
 
-extern volatile __RXF0SIDHbits_t __at 0xf00 RXF0SIDHbits;
+extern volatile __RXF0SIDHbits_t __at (0xf00) RXF0SIDHbits;
 
-extern __sfr __at 0xf01 RXF0SIDL;
+extern __sfr __at (0xf01) RXF0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -45,9 +45,9 @@ typedef union {
        };
 } __RXF0SIDLbits_t;
 
-extern volatile __RXF0SIDLbits_t __at 0xf01 RXF0SIDLbits;
+extern volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-extern __sfr __at 0xf02 RXF0EIDH;
+extern __sfr __at (0xf02) RXF0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -61,9 +61,9 @@ typedef union {
        };
 } __RXF0EIDHbits_t;
 
-extern volatile __RXF0EIDHbits_t __at 0xf02 RXF0EIDHbits;
+extern volatile __RXF0EIDHbits_t __at (0xf02) RXF0EIDHbits;
 
-extern __sfr __at 0xf03 RXF0EIDL;
+extern __sfr __at (0xf03) RXF0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -77,9 +77,9 @@ typedef union {
        };
 } __RXF0EIDLbits_t;
 
-extern volatile __RXF0EIDLbits_t __at 0xf03 RXF0EIDLbits;
+extern volatile __RXF0EIDLbits_t __at (0xf03) RXF0EIDLbits;
 
-extern __sfr __at 0xf04 RXF1SIDH;
+extern __sfr __at (0xf04) RXF1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -93,9 +93,9 @@ typedef union {
        };
 } __RXF1SIDHbits_t;
 
-extern volatile __RXF1SIDHbits_t __at 0xf04 RXF1SIDHbits;
+extern volatile __RXF1SIDHbits_t __at (0xf04) RXF1SIDHbits;
 
-extern __sfr __at 0xf05 RXF1SIDL;
+extern __sfr __at (0xf05) RXF1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -109,9 +109,9 @@ typedef union {
        };
 } __RXF1SIDLbits_t;
 
-extern volatile __RXF1SIDLbits_t __at 0xf05 RXF1SIDLbits;
+extern volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-extern __sfr __at 0xf06 RXF1EIDH;
+extern __sfr __at (0xf06) RXF1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -125,9 +125,9 @@ typedef union {
        };
 } __RXF1EIDHbits_t;
 
-extern volatile __RXF1EIDHbits_t __at 0xf06 RXF1EIDHbits;
+extern volatile __RXF1EIDHbits_t __at (0xf06) RXF1EIDHbits;
 
-extern __sfr __at 0xf07 RXF1EIDL;
+extern __sfr __at (0xf07) RXF1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -141,9 +141,9 @@ typedef union {
        };
 } __RXF1EIDLbits_t;
 
-extern volatile __RXF1EIDLbits_t __at 0xf07 RXF1EIDLbits;
+extern volatile __RXF1EIDLbits_t __at (0xf07) RXF1EIDLbits;
 
-extern __sfr __at 0xf08 RXF2SIDH;
+extern __sfr __at (0xf08) RXF2SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -157,9 +157,9 @@ typedef union {
        };
 } __RXF2SIDHbits_t;
 
-extern volatile __RXF2SIDHbits_t __at 0xf08 RXF2SIDHbits;
+extern volatile __RXF2SIDHbits_t __at (0xf08) RXF2SIDHbits;
 
-extern __sfr __at 0xf09 RXF2SIDL;
+extern __sfr __at (0xf09) RXF2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -173,9 +173,9 @@ typedef union {
        };
 } __RXF2SIDLbits_t;
 
-extern volatile __RXF2SIDLbits_t __at 0xf09 RXF2SIDLbits;
+extern volatile __RXF2SIDLbits_t __at (0xf09) RXF2SIDLbits;
 
-extern __sfr __at 0xf0a RXF2EIDH;
+extern __sfr __at (0xf0a) RXF2EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -189,9 +189,9 @@ typedef union {
        };
 } __RXF2EIDHbits_t;
 
-extern volatile __RXF2EIDHbits_t __at 0xf0a RXF2EIDHbits;
+extern volatile __RXF2EIDHbits_t __at (0xf0a) RXF2EIDHbits;
 
-extern __sfr __at 0xf0b RXF2EIDL;
+extern __sfr __at (0xf0b) RXF2EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -205,9 +205,9 @@ typedef union {
        };
 } __RXF2EIDLbits_t;
 
-extern volatile __RXF2EIDLbits_t __at 0xf0b RXF2EIDLbits;
+extern volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-extern __sfr __at 0xf0c RXF3SIDH;
+extern __sfr __at (0xf0c) RXF3SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -221,9 +221,9 @@ typedef union {
        };
 } __RXF3SIDHbits_t;
 
-extern volatile __RXF3SIDHbits_t __at 0xf0c RXF3SIDHbits;
+extern volatile __RXF3SIDHbits_t __at (0xf0c) RXF3SIDHbits;
 
-extern __sfr __at 0xf0d RXF3SIDL;
+extern __sfr __at (0xf0d) RXF3SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -237,9 +237,9 @@ typedef union {
        };
 } __RXF3SIDLbits_t;
 
-extern volatile __RXF3SIDLbits_t __at 0xf0d RXF3SIDLbits;
+extern volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-extern __sfr __at 0xf0e RXF3EIDH;
+extern __sfr __at (0xf0e) RXF3EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -253,9 +253,9 @@ typedef union {
        };
 } __RXF3EIDHbits_t;
 
-extern volatile __RXF3EIDHbits_t __at 0xf0e RXF3EIDHbits;
+extern volatile __RXF3EIDHbits_t __at (0xf0e) RXF3EIDHbits;
 
-extern __sfr __at 0xf0f RXF3EIDL;
+extern __sfr __at (0xf0f) RXF3EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -269,9 +269,9 @@ typedef union {
        };
 } __RXF3EIDLbits_t;
 
-extern volatile __RXF3EIDLbits_t __at 0xf0f RXF3EIDLbits;
+extern volatile __RXF3EIDLbits_t __at (0xf0f) RXF3EIDLbits;
 
-extern __sfr __at 0xf10 RXF4SIDH;
+extern __sfr __at (0xf10) RXF4SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -285,9 +285,9 @@ typedef union {
        };
 } __RXF4SIDHbits_t;
 
-extern volatile __RXF4SIDHbits_t __at 0xf10 RXF4SIDHbits;
+extern volatile __RXF4SIDHbits_t __at (0xf10) RXF4SIDHbits;
 
-extern __sfr __at 0xf11 RXF4SIDL;
+extern __sfr __at (0xf11) RXF4SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -301,9 +301,9 @@ typedef union {
        };
 } __RXF4SIDLbits_t;
 
-extern volatile __RXF4SIDLbits_t __at 0xf11 RXF4SIDLbits;
+extern volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-extern __sfr __at 0xf12 RXF4EIDH;
+extern __sfr __at (0xf12) RXF4EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -317,9 +317,9 @@ typedef union {
        };
 } __RXF4EIDHbits_t;
 
-extern volatile __RXF4EIDHbits_t __at 0xf12 RXF4EIDHbits;
+extern volatile __RXF4EIDHbits_t __at (0xf12) RXF4EIDHbits;
 
-extern __sfr __at 0xf13 RXF4EIDL;
+extern __sfr __at (0xf13) RXF4EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -333,9 +333,9 @@ typedef union {
        };
 } __RXF4EIDLbits_t;
 
-extern volatile __RXF4EIDLbits_t __at 0xf13 RXF4EIDLbits;
+extern volatile __RXF4EIDLbits_t __at (0xf13) RXF4EIDLbits;
 
-extern __sfr __at 0xf14 RXF5SIDH;
+extern __sfr __at (0xf14) RXF5SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -349,9 +349,9 @@ typedef union {
        };
 } __RXF5SIDHbits_t;
 
-extern volatile __RXF5SIDHbits_t __at 0xf14 RXF5SIDHbits;
+extern volatile __RXF5SIDHbits_t __at (0xf14) RXF5SIDHbits;
 
-extern __sfr __at 0xf15 RXF5SIDL;
+extern __sfr __at (0xf15) RXF5SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -365,9 +365,9 @@ typedef union {
        };
 } __RXF5SIDLbits_t;
 
-extern volatile __RXF5SIDLbits_t __at 0xf15 RXF5SIDLbits;
+extern volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-extern __sfr __at 0xf16 RXF5EIDH;
+extern __sfr __at (0xf16) RXF5EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -381,9 +381,9 @@ typedef union {
        };
 } __RXF5EIDHbits_t;
 
-extern volatile __RXF5EIDHbits_t __at 0xf16 RXF5EIDHbits;
+extern volatile __RXF5EIDHbits_t __at (0xf16) RXF5EIDHbits;
 
-extern __sfr __at 0xf17 RXF5EIDL;
+extern __sfr __at (0xf17) RXF5EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -397,9 +397,9 @@ typedef union {
        };
 } __RXF5EIDLbits_t;
 
-extern volatile __RXF5EIDLbits_t __at 0xf17 RXF5EIDLbits;
+extern volatile __RXF5EIDLbits_t __at (0xf17) RXF5EIDLbits;
 
-extern __sfr __at 0xf18 RXM0SIDH;
+extern __sfr __at (0xf18) RXM0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -413,9 +413,9 @@ typedef union {
        };
 } __RXM0SIDHbits_t;
 
-extern volatile __RXM0SIDHbits_t __at 0xf18 RXM0SIDHbits;
+extern volatile __RXM0SIDHbits_t __at (0xf18) RXM0SIDHbits;
 
-extern __sfr __at 0xf19 RXM0SIDL;
+extern __sfr __at (0xf19) RXM0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -429,9 +429,9 @@ typedef union {
        };
 } __RXM0SIDLbits_t;
 
-extern volatile __RXM0SIDLbits_t __at 0xf19 RXM0SIDLbits;
+extern volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-extern __sfr __at 0xf1a RXM0EIDH;
+extern __sfr __at (0xf1a) RXM0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -445,9 +445,9 @@ typedef union {
        };
 } __RXM0EIDHbits_t;
 
-extern volatile __RXM0EIDHbits_t __at 0xf1a RXM0EIDHbits;
+extern volatile __RXM0EIDHbits_t __at (0xf1a) RXM0EIDHbits;
 
-extern __sfr __at 0xf1b RXM0EIDL;
+extern __sfr __at (0xf1b) RXM0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -461,9 +461,9 @@ typedef union {
        };
 } __RXM0EIDLbits_t;
 
-extern volatile __RXM0EIDLbits_t __at 0xf1b RXM0EIDLbits;
+extern volatile __RXM0EIDLbits_t __at (0xf1b) RXM0EIDLbits;
 
-extern __sfr __at 0xf1c RXM1SIDH;
+extern __sfr __at (0xf1c) RXM1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -477,9 +477,9 @@ typedef union {
        };
 } __RXM1SIDHbits_t;
 
-extern volatile __RXM1SIDHbits_t __at 0xf1c RXM1SIDHbits;
+extern volatile __RXM1SIDHbits_t __at (0xf1c) RXM1SIDHbits;
 
-extern __sfr __at 0xf1d RXM1SIDL;
+extern __sfr __at (0xf1d) RXM1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -493,9 +493,9 @@ typedef union {
        };
 } __RXM1SIDLbits_t;
 
-extern volatile __RXM1SIDLbits_t __at 0xf1d RXM1SIDLbits;
+extern volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-extern __sfr __at 0xf1e RXM1EIDH;
+extern __sfr __at (0xf1e) RXM1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -509,9 +509,9 @@ typedef union {
        };
 } __RXM1EIDHbits_t;
 
-extern volatile __RXM1EIDHbits_t __at 0xf1e RXM1EIDHbits;
+extern volatile __RXM1EIDHbits_t __at (0xf1e) RXM1EIDHbits;
 
-extern __sfr __at 0xf1f RXM1EIDL;
+extern __sfr __at (0xf1f) RXM1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -525,9 +525,9 @@ typedef union {
        };
 } __RXM1EIDLbits_t;
 
-extern volatile __RXM1EIDLbits_t __at 0xf1f RXM1EIDLbits;
+extern volatile __RXM1EIDLbits_t __at (0xf1f) RXM1EIDLbits;
 
-extern __sfr __at 0xf20 TXB2CON;
+extern __sfr __at (0xf20) TXB2CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -541,9 +541,9 @@ typedef union {
        };
 } __TXB2CONbits_t;
 
-extern volatile __TXB2CONbits_t __at 0xf20 TXB2CONbits;
+extern volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-extern __sfr __at 0xf21 TXB2SIDH;
+extern __sfr __at (0xf21) TXB2SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -557,9 +557,9 @@ typedef union {
        };
 } __TXB2SIDHbits_t;
 
-extern volatile __TXB2SIDHbits_t __at 0xf21 TXB2SIDHbits;
+extern volatile __TXB2SIDHbits_t __at (0xf21) TXB2SIDHbits;
 
-extern __sfr __at 0xf22 TXB2SIDL;
+extern __sfr __at (0xf22) TXB2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -573,9 +573,9 @@ typedef union {
        };
 } __TXB2SIDLbits_t;
 
-extern volatile __TXB2SIDLbits_t __at 0xf22 TXB2SIDLbits;
+extern volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-extern __sfr __at 0xf23 TXB2EIDH;
+extern __sfr __at (0xf23) TXB2EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -589,9 +589,9 @@ typedef union {
        };
 } __TXB2EIDHbits_t;
 
-extern volatile __TXB2EIDHbits_t __at 0xf23 TXB2EIDHbits;
+extern volatile __TXB2EIDHbits_t __at (0xf23) TXB2EIDHbits;
 
-extern __sfr __at 0xf24 TXB2EIDL;
+extern __sfr __at (0xf24) TXB2EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -605,9 +605,9 @@ typedef union {
        };
 } __TXB2EIDLbits_t;
 
-extern volatile __TXB2EIDLbits_t __at 0xf24 TXB2EIDLbits;
+extern volatile __TXB2EIDLbits_t __at (0xf24) TXB2EIDLbits;
 
-extern __sfr __at 0xf25 TXB2DLC;
+extern __sfr __at (0xf25) TXB2DLC;
 typedef union {
        struct {
                unsigned TXB2DLC0:1;
@@ -621,9 +621,9 @@ typedef union {
        };
 } __TXB2DLCbits_t;
 
-extern volatile __TXB2DLCbits_t __at 0xf25 TXB2DLCbits;
+extern volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-extern __sfr __at 0xf26 TXB2D0;
+extern __sfr __at (0xf26) TXB2D0;
 typedef union {
        struct {
                unsigned TXB2D00:1;
@@ -637,9 +637,9 @@ typedef union {
        };
 } __TXB2D0bits_t;
 
-extern volatile __TXB2D0bits_t __at 0xf26 TXB2D0bits;
+extern volatile __TXB2D0bits_t __at (0xf26) TXB2D0bits;
 
-extern __sfr __at 0xf27 TXB2D1;
+extern __sfr __at (0xf27) TXB2D1;
 typedef union {
        struct {
                unsigned TXB2D10:1;
@@ -653,9 +653,9 @@ typedef union {
        };
 } __TXB2D1bits_t;
 
-extern volatile __TXB2D1bits_t __at 0xf27 TXB2D1bits;
+extern volatile __TXB2D1bits_t __at (0xf27) TXB2D1bits;
 
-extern __sfr __at 0xf28 TXB2D2;
+extern __sfr __at (0xf28) TXB2D2;
 typedef union {
        struct {
                unsigned TXB2D20:1;
@@ -669,9 +669,9 @@ typedef union {
        };
 } __TXB2D2bits_t;
 
-extern volatile __TXB2D2bits_t __at 0xf28 TXB2D2bits;
+extern volatile __TXB2D2bits_t __at (0xf28) TXB2D2bits;
 
-extern __sfr __at 0xf29 TXB2D3;
+extern __sfr __at (0xf29) TXB2D3;
 typedef union {
        struct {
                unsigned TXB2D30:1;
@@ -685,9 +685,9 @@ typedef union {
        };
 } __TXB2D3bits_t;
 
-extern volatile __TXB2D3bits_t __at 0xf29 TXB2D3bits;
+extern volatile __TXB2D3bits_t __at (0xf29) TXB2D3bits;
 
-extern __sfr __at 0xf2a TXB2D4;
+extern __sfr __at (0xf2a) TXB2D4;
 typedef union {
        struct {
                unsigned TXB2D40:1;
@@ -701,9 +701,9 @@ typedef union {
        };
 } __TXB2D4bits_t;
 
-extern volatile __TXB2D4bits_t __at 0xf2a TXB2D4bits;
+extern volatile __TXB2D4bits_t __at (0xf2a) TXB2D4bits;
 
-extern __sfr __at 0xf2b TXB2D5;
+extern __sfr __at (0xf2b) TXB2D5;
 typedef union {
        struct {
                unsigned TXB2D50:1;
@@ -717,9 +717,9 @@ typedef union {
        };
 } __TXB2D5bits_t;
 
-extern volatile __TXB2D5bits_t __at 0xf2b TXB2D5bits;
+extern volatile __TXB2D5bits_t __at (0xf2b) TXB2D5bits;
 
-extern __sfr __at 0xf2c TXB2D6;
+extern __sfr __at (0xf2c) TXB2D6;
 typedef union {
        struct {
                unsigned TXB2D60:1;
@@ -733,9 +733,9 @@ typedef union {
        };
 } __TXB2D6bits_t;
 
-extern volatile __TXB2D6bits_t __at 0xf2c TXB2D6bits;
+extern volatile __TXB2D6bits_t __at (0xf2c) TXB2D6bits;
 
-extern __sfr __at 0xf2d TXB2D7;
+extern __sfr __at (0xf2d) TXB2D7;
 typedef union {
        struct {
                unsigned TXB2D70:1;
@@ -749,9 +749,9 @@ typedef union {
        };
 } __TXB2D7bits_t;
 
-extern volatile __TXB2D7bits_t __at 0xf2d TXB2D7bits;
+extern volatile __TXB2D7bits_t __at (0xf2d) TXB2D7bits;
 
-extern __sfr __at 0xf2e CANSTATRO4;
+extern __sfr __at (0xf2e) CANSTATRO4;
 typedef union {
        struct {
                unsigned :1;
@@ -765,9 +765,9 @@ typedef union {
        };
 } __CANSTATRO4bits_t;
 
-extern volatile __CANSTATRO4bits_t __at 0xf2e CANSTATRO4bits;
+extern volatile __CANSTATRO4bits_t __at (0xf2e) CANSTATRO4bits;
 
-extern __sfr __at 0xf30 TXB1CON;
+extern __sfr __at (0xf30) TXB1CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -781,9 +781,9 @@ typedef union {
        };
 } __TXB1CONbits_t;
 
-extern volatile __TXB1CONbits_t __at 0xf30 TXB1CONbits;
+extern volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-extern __sfr __at 0xf31 TXB1SIDH;
+extern __sfr __at (0xf31) TXB1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -797,9 +797,9 @@ typedef union {
        };
 } __TXB1SIDHbits_t;
 
-extern volatile __TXB1SIDHbits_t __at 0xf31 TXB1SIDHbits;
+extern volatile __TXB1SIDHbits_t __at (0xf31) TXB1SIDHbits;
 
-extern __sfr __at 0xf32 TXB1SIDL;
+extern __sfr __at (0xf32) TXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -813,9 +813,9 @@ typedef union {
        };
 } __TXB1SIDLbits_t;
 
-extern volatile __TXB1SIDLbits_t __at 0xf32 TXB1SIDLbits;
+extern volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-extern __sfr __at 0xf33 TXB1EIDH;
+extern __sfr __at (0xf33) TXB1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -829,9 +829,9 @@ typedef union {
        };
 } __TXB1EIDHbits_t;
 
-extern volatile __TXB1EIDHbits_t __at 0xf33 TXB1EIDHbits;
+extern volatile __TXB1EIDHbits_t __at (0xf33) TXB1EIDHbits;
 
-extern __sfr __at 0xf34 TXB1EIDL;
+extern __sfr __at (0xf34) TXB1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -845,9 +845,9 @@ typedef union {
        };
 } __TXB1EIDLbits_t;
 
-extern volatile __TXB1EIDLbits_t __at 0xf34 TXB1EIDLbits;
+extern volatile __TXB1EIDLbits_t __at (0xf34) TXB1EIDLbits;
 
-extern __sfr __at 0xf35 TXB1DLC;
+extern __sfr __at (0xf35) TXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -861,9 +861,9 @@ typedef union {
        };
 } __TXB1DLCbits_t;
 
-extern volatile __TXB1DLCbits_t __at 0xf35 TXB1DLCbits;
+extern volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-extern __sfr __at 0xf36 TXB1D0;
+extern __sfr __at (0xf36) TXB1D0;
 typedef union {
        struct {
                unsigned TXB1D00:1;
@@ -877,9 +877,9 @@ typedef union {
        };
 } __TXB1D0bits_t;
 
-extern volatile __TXB1D0bits_t __at 0xf36 TXB1D0bits;
+extern volatile __TXB1D0bits_t __at (0xf36) TXB1D0bits;
 
-extern __sfr __at 0xf37 TXB1D1;
+extern __sfr __at (0xf37) TXB1D1;
 typedef union {
        struct {
                unsigned TXB1D10:1;
@@ -893,9 +893,9 @@ typedef union {
        };
 } __TXB1D1bits_t;
 
-extern volatile __TXB1D1bits_t __at 0xf37 TXB1D1bits;
+extern volatile __TXB1D1bits_t __at (0xf37) TXB1D1bits;
 
-extern __sfr __at 0xf38 TXB1D2;
+extern __sfr __at (0xf38) TXB1D2;
 typedef union {
        struct {
                unsigned TXB1D20:1;
@@ -909,9 +909,9 @@ typedef union {
        };
 } __TXB1D2bits_t;
 
-extern volatile __TXB1D2bits_t __at 0xf38 TXB1D2bits;
+extern volatile __TXB1D2bits_t __at (0xf38) TXB1D2bits;
 
-extern __sfr __at 0xf39 TXB1D3;
+extern __sfr __at (0xf39) TXB1D3;
 typedef union {
        struct {
                unsigned TXB1D30:1;
@@ -925,9 +925,9 @@ typedef union {
        };
 } __TXB1D3bits_t;
 
-extern volatile __TXB1D3bits_t __at 0xf39 TXB1D3bits;
+extern volatile __TXB1D3bits_t __at (0xf39) TXB1D3bits;
 
-extern __sfr __at 0xf3a TXB1D4;
+extern __sfr __at (0xf3a) TXB1D4;
 typedef union {
        struct {
                unsigned TXB1D40:1;
@@ -941,9 +941,9 @@ typedef union {
        };
 } __TXB1D4bits_t;
 
-extern volatile __TXB1D4bits_t __at 0xf3a TXB1D4bits;
+extern volatile __TXB1D4bits_t __at (0xf3a) TXB1D4bits;
 
-extern __sfr __at 0xf3b TXB1D5;
+extern __sfr __at (0xf3b) TXB1D5;
 typedef union {
        struct {
                unsigned TXB1D50:1;
@@ -957,9 +957,9 @@ typedef union {
        };
 } __TXB1D5bits_t;
 
-extern volatile __TXB1D5bits_t __at 0xf3b TXB1D5bits;
+extern volatile __TXB1D5bits_t __at (0xf3b) TXB1D5bits;
 
-extern __sfr __at 0xf3c TXB1D6;
+extern __sfr __at (0xf3c) TXB1D6;
 typedef union {
        struct {
                unsigned TXB1D60:1;
@@ -973,9 +973,9 @@ typedef union {
        };
 } __TXB1D6bits_t;
 
-extern volatile __TXB1D6bits_t __at 0xf3c TXB1D6bits;
+extern volatile __TXB1D6bits_t __at (0xf3c) TXB1D6bits;
 
-extern __sfr __at 0xf3d TXB1D7;
+extern __sfr __at (0xf3d) TXB1D7;
 typedef union {
        struct {
                unsigned TXB1D70:1;
@@ -989,9 +989,9 @@ typedef union {
        };
 } __TXB1D7bits_t;
 
-extern volatile __TXB1D7bits_t __at 0xf3d TXB1D7bits;
+extern volatile __TXB1D7bits_t __at (0xf3d) TXB1D7bits;
 
-extern __sfr __at 0xf3e CANSTATRO3;
+extern __sfr __at (0xf3e) CANSTATRO3;
 typedef union {
        struct {
                unsigned :1;
@@ -1005,9 +1005,9 @@ typedef union {
        };
 } __CANSTATRO3bits_t;
 
-extern volatile __CANSTATRO3bits_t __at 0xf3e CANSTATRO3bits;
+extern volatile __CANSTATRO3bits_t __at (0xf3e) CANSTATRO3bits;
 
-extern __sfr __at 0xf40 TXB0CON;
+extern __sfr __at (0xf40) TXB0CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -1021,9 +1021,9 @@ typedef union {
        };
 } __TXB0CONbits_t;
 
-extern volatile __TXB0CONbits_t __at 0xf40 TXB0CONbits;
+extern volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-extern __sfr __at 0xf41 TXB0SIDH;
+extern __sfr __at (0xf41) TXB0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1037,9 +1037,9 @@ typedef union {
        };
 } __TXB0SIDHbits_t;
 
-extern volatile __TXB0SIDHbits_t __at 0xf41 TXB0SIDHbits;
+extern volatile __TXB0SIDHbits_t __at (0xf41) TXB0SIDHbits;
 
-extern __sfr __at 0xf42 TXB0SIDL;
+extern __sfr __at (0xf42) TXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1053,9 +1053,9 @@ typedef union {
        };
 } __TXB0SIDLbits_t;
 
-extern volatile __TXB0SIDLbits_t __at 0xf42 TXB0SIDLbits;
+extern volatile __TXB0SIDLbits_t __at (0xf42) TXB0SIDLbits;
 
-extern __sfr __at 0xf43 TXB0EIDH;
+extern __sfr __at (0xf43) TXB0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1069,9 +1069,9 @@ typedef union {
        };
 } __TXB0EIDHbits_t;
 
-extern volatile __TXB0EIDHbits_t __at 0xf43 TXB0EIDHbits;
+extern volatile __TXB0EIDHbits_t __at (0xf43) TXB0EIDHbits;
 
-extern __sfr __at 0xf44 TXB0EIDL;
+extern __sfr __at (0xf44) TXB0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1085,9 +1085,9 @@ typedef union {
        };
 } __TXB0EIDLbits_t;
 
-extern volatile __TXB0EIDLbits_t __at 0xf44 TXB0EIDLbits;
+extern volatile __TXB0EIDLbits_t __at (0xf44) TXB0EIDLbits;
 
-extern __sfr __at 0xf45 TXB0DLC;
+extern __sfr __at (0xf45) TXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1101,9 +1101,9 @@ typedef union {
        };
 } __TXB0DLCbits_t;
 
-extern volatile __TXB0DLCbits_t __at 0xf45 TXB0DLCbits;
+extern volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-extern __sfr __at 0xf46 TXB0D0;
+extern __sfr __at (0xf46) TXB0D0;
 typedef union {
        struct {
                unsigned TXB0D00:1;
@@ -1117,9 +1117,9 @@ typedef union {
        };
 } __TXB0D0bits_t;
 
-extern volatile __TXB0D0bits_t __at 0xf46 TXB0D0bits;
+extern volatile __TXB0D0bits_t __at (0xf46) TXB0D0bits;
 
-extern __sfr __at 0xf47 TXB0D1;
+extern __sfr __at (0xf47) TXB0D1;
 typedef union {
        struct {
                unsigned TXB0D10:1;
@@ -1133,9 +1133,9 @@ typedef union {
        };
 } __TXB0D1bits_t;
 
-extern volatile __TXB0D1bits_t __at 0xf47 TXB0D1bits;
+extern volatile __TXB0D1bits_t __at (0xf47) TXB0D1bits;
 
-extern __sfr __at 0xf48 TXB0D2;
+extern __sfr __at (0xf48) TXB0D2;
 typedef union {
        struct {
                unsigned TXB0D20:1;
@@ -1149,9 +1149,9 @@ typedef union {
        };
 } __TXB0D2bits_t;
 
-extern volatile __TXB0D2bits_t __at 0xf48 TXB0D2bits;
+extern volatile __TXB0D2bits_t __at (0xf48) TXB0D2bits;
 
-extern __sfr __at 0xf49 TXB0D3;
+extern __sfr __at (0xf49) TXB0D3;
 typedef union {
        struct {
                unsigned TXB0D30:1;
@@ -1165,9 +1165,9 @@ typedef union {
        };
 } __TXB0D3bits_t;
 
-extern volatile __TXB0D3bits_t __at 0xf49 TXB0D3bits;
+extern volatile __TXB0D3bits_t __at (0xf49) TXB0D3bits;
 
-extern __sfr __at 0xf4a TXB0D4;
+extern __sfr __at (0xf4a) TXB0D4;
 typedef union {
        struct {
                unsigned TXB0D40:1;
@@ -1181,9 +1181,9 @@ typedef union {
        };
 } __TXB0D4bits_t;
 
-extern volatile __TXB0D4bits_t __at 0xf4a TXB0D4bits;
+extern volatile __TXB0D4bits_t __at (0xf4a) TXB0D4bits;
 
-extern __sfr __at 0xf4b TXB0D5;
+extern __sfr __at (0xf4b) TXB0D5;
 typedef union {
        struct {
                unsigned TXB0D50:1;
@@ -1197,9 +1197,9 @@ typedef union {
        };
 } __TXB0D5bits_t;
 
-extern volatile __TXB0D5bits_t __at 0xf4b TXB0D5bits;
+extern volatile __TXB0D5bits_t __at (0xf4b) TXB0D5bits;
 
-extern __sfr __at 0xf4c TXB0D6;
+extern __sfr __at (0xf4c) TXB0D6;
 typedef union {
        struct {
                unsigned TXB0D60:1;
@@ -1213,9 +1213,9 @@ typedef union {
        };
 } __TXB0D6bits_t;
 
-extern volatile __TXB0D6bits_t __at 0xf4c TXB0D6bits;
+extern volatile __TXB0D6bits_t __at (0xf4c) TXB0D6bits;
 
-extern __sfr __at 0xf4d TXB0D7;
+extern __sfr __at (0xf4d) TXB0D7;
 typedef union {
        struct {
                unsigned TXB0D70:1;
@@ -1229,9 +1229,9 @@ typedef union {
        };
 } __TXB0D7bits_t;
 
-extern volatile __TXB0D7bits_t __at 0xf4d TXB0D7bits;
+extern volatile __TXB0D7bits_t __at (0xf4d) TXB0D7bits;
 
-extern __sfr __at 0xf4e CANSTATRO2;
+extern __sfr __at (0xf4e) CANSTATRO2;
 typedef union {
        struct {
                unsigned :1;
@@ -1245,9 +1245,9 @@ typedef union {
        };
 } __CANSTATRO2bits_t;
 
-extern volatile __CANSTATRO2bits_t __at 0xf4e CANSTATRO2bits;
+extern volatile __CANSTATRO2bits_t __at (0xf4e) CANSTATRO2bits;
 
-extern __sfr __at 0xf50 RXB1CON;
+extern __sfr __at (0xf50) RXB1CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -1261,9 +1261,9 @@ typedef union {
        };
 } __RXB1CONbits_t;
 
-extern volatile __RXB1CONbits_t __at 0xf50 RXB1CONbits;
+extern volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-extern __sfr __at 0xf51 RXB1SIDH;
+extern __sfr __at (0xf51) RXB1SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1277,9 +1277,9 @@ typedef union {
        };
 } __RXB1SIDHbits_t;
 
-extern volatile __RXB1SIDHbits_t __at 0xf51 RXB1SIDHbits;
+extern volatile __RXB1SIDHbits_t __at (0xf51) RXB1SIDHbits;
 
-extern __sfr __at 0xf52 RXB1SIDL;
+extern __sfr __at (0xf52) RXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1293,9 +1293,9 @@ typedef union {
        };
 } __RXB1SIDLbits_t;
 
-extern volatile __RXB1SIDLbits_t __at 0xf52 RXB1SIDLbits;
+extern volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-extern __sfr __at 0xf53 RXB1EIDH;
+extern __sfr __at (0xf53) RXB1EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1309,9 +1309,9 @@ typedef union {
        };
 } __RXB1EIDHbits_t;
 
-extern volatile __RXB1EIDHbits_t __at 0xf53 RXB1EIDHbits;
+extern volatile __RXB1EIDHbits_t __at (0xf53) RXB1EIDHbits;
 
-extern __sfr __at 0xf54 RXB1EIDL;
+extern __sfr __at (0xf54) RXB1EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1325,9 +1325,9 @@ typedef union {
        };
 } __RXB1EIDLbits_t;
 
-extern volatile __RXB1EIDLbits_t __at 0xf54 RXB1EIDLbits;
+extern volatile __RXB1EIDLbits_t __at (0xf54) RXB1EIDLbits;
 
-extern __sfr __at 0xf55 RXB1DLC;
+extern __sfr __at (0xf55) RXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1341,9 +1341,9 @@ typedef union {
        };
 } __RXB1DLCbits_t;
 
-extern volatile __RXB1DLCbits_t __at 0xf55 RXB1DLCbits;
+extern volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-extern __sfr __at 0xf56 RXB1D0;
+extern __sfr __at (0xf56) RXB1D0;
 typedef union {
        struct {
                unsigned RXB1D00:1;
@@ -1357,9 +1357,9 @@ typedef union {
        };
 } __RXB1D0bits_t;
 
-extern volatile __RXB1D0bits_t __at 0xf56 RXB1D0bits;
+extern volatile __RXB1D0bits_t __at (0xf56) RXB1D0bits;
 
-extern __sfr __at 0xf57 RXB1D1;
+extern __sfr __at (0xf57) RXB1D1;
 typedef union {
        struct {
                unsigned RXB1D10:1;
@@ -1373,9 +1373,9 @@ typedef union {
        };
 } __RXB1D1bits_t;
 
-extern volatile __RXB1D1bits_t __at 0xf57 RXB1D1bits;
+extern volatile __RXB1D1bits_t __at (0xf57) RXB1D1bits;
 
-extern __sfr __at 0xf58 RXB1D2;
+extern __sfr __at (0xf58) RXB1D2;
 typedef union {
        struct {
                unsigned RXB1D20:1;
@@ -1389,9 +1389,9 @@ typedef union {
        };
 } __RXB1D2bits_t;
 
-extern volatile __RXB1D2bits_t __at 0xf58 RXB1D2bits;
+extern volatile __RXB1D2bits_t __at (0xf58) RXB1D2bits;
 
-extern __sfr __at 0xf59 RXB1D3;
+extern __sfr __at (0xf59) RXB1D3;
 typedef union {
        struct {
                unsigned RXB1D30:1;
@@ -1405,9 +1405,9 @@ typedef union {
        };
 } __RXB1D3bits_t;
 
-extern volatile __RXB1D3bits_t __at 0xf59 RXB1D3bits;
+extern volatile __RXB1D3bits_t __at (0xf59) RXB1D3bits;
 
-extern __sfr __at 0xf5a RXB1D4;
+extern __sfr __at (0xf5a) RXB1D4;
 typedef union {
        struct {
                unsigned RXB1D40:1;
@@ -1421,9 +1421,9 @@ typedef union {
        };
 } __RXB1D4bits_t;
 
-extern volatile __RXB1D4bits_t __at 0xf5a RXB1D4bits;
+extern volatile __RXB1D4bits_t __at (0xf5a) RXB1D4bits;
 
-extern __sfr __at 0xf5b RXB1D5;
+extern __sfr __at (0xf5b) RXB1D5;
 typedef union {
        struct {
                unsigned RXB1D50:1;
@@ -1437,9 +1437,9 @@ typedef union {
        };
 } __RXB1D5bits_t;
 
-extern volatile __RXB1D5bits_t __at 0xf5b RXB1D5bits;
+extern volatile __RXB1D5bits_t __at (0xf5b) RXB1D5bits;
 
-extern __sfr __at 0xf5c RXB1D6;
+extern __sfr __at (0xf5c) RXB1D6;
 typedef union {
        struct {
                unsigned RXB1D60:1;
@@ -1453,9 +1453,9 @@ typedef union {
        };
 } __RXB1D6bits_t;
 
-extern volatile __RXB1D6bits_t __at 0xf5c RXB1D6bits;
+extern volatile __RXB1D6bits_t __at (0xf5c) RXB1D6bits;
 
-extern __sfr __at 0xf5d RXB1D7;
+extern __sfr __at (0xf5d) RXB1D7;
 typedef union {
        struct {
                unsigned RXB1D70:1;
@@ -1469,9 +1469,9 @@ typedef union {
        };
 } __RXB1D7bits_t;
 
-extern volatile __RXB1D7bits_t __at 0xf5d RXB1D7bits;
+extern volatile __RXB1D7bits_t __at (0xf5d) RXB1D7bits;
 
-extern __sfr __at 0xf5e CANSTATRO1;
+extern __sfr __at (0xf5e) CANSTATRO1;
 typedef union {
        struct {
                unsigned :1;
@@ -1485,9 +1485,9 @@ typedef union {
        };
 } __CANSTATRO1bits_t;
 
-extern volatile __CANSTATRO1bits_t __at 0xf5e CANSTATRO1bits;
+extern volatile __CANSTATRO1bits_t __at (0xf5e) CANSTATRO1bits;
 
-extern __sfr __at 0xf60 RXB0CON;
+extern __sfr __at (0xf60) RXB0CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -1501,9 +1501,9 @@ typedef union {
        };
 } __RXB0CONbits_t;
 
-extern volatile __RXB0CONbits_t __at 0xf60 RXB0CONbits;
+extern volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-extern __sfr __at 0xf61 RXB0SIDH;
+extern __sfr __at (0xf61) RXB0SIDH;
 typedef union {
        struct {
                unsigned SID3:1;
@@ -1517,9 +1517,9 @@ typedef union {
        };
 } __RXB0SIDHbits_t;
 
-extern volatile __RXB0SIDHbits_t __at 0xf61 RXB0SIDHbits;
+extern volatile __RXB0SIDHbits_t __at (0xf61) RXB0SIDHbits;
 
-extern __sfr __at 0xf62 RXB0SIDL;
+extern __sfr __at (0xf62) RXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -1533,9 +1533,9 @@ typedef union {
        };
 } __RXB0SIDLbits_t;
 
-extern volatile __RXB0SIDLbits_t __at 0xf62 RXB0SIDLbits;
+extern volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-extern __sfr __at 0xf63 RXB0EIDH;
+extern __sfr __at (0xf63) RXB0EIDH;
 typedef union {
        struct {
                unsigned EID8:1;
@@ -1549,9 +1549,9 @@ typedef union {
        };
 } __RXB0EIDHbits_t;
 
-extern volatile __RXB0EIDHbits_t __at 0xf63 RXB0EIDHbits;
+extern volatile __RXB0EIDHbits_t __at (0xf63) RXB0EIDHbits;
 
-extern __sfr __at 0xf64 RXB0EIDL;
+extern __sfr __at (0xf64) RXB0EIDL;
 typedef union {
        struct {
                unsigned EID0:1;
@@ -1565,9 +1565,9 @@ typedef union {
        };
 } __RXB0EIDLbits_t;
 
-extern volatile __RXB0EIDLbits_t __at 0xf64 RXB0EIDLbits;
+extern volatile __RXB0EIDLbits_t __at (0xf64) RXB0EIDLbits;
 
-extern __sfr __at 0xf65 RXB0DLC;
+extern __sfr __at (0xf65) RXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -1581,17 +1581,17 @@ typedef union {
        };
 } __RXB0DLCbits_t;
 
-extern volatile __RXB0DLCbits_t __at 0xf65 RXB0DLCbits;
+extern volatile __RXB0DLCbits_t __at (0xf65) RXB0DLCbits;
 
-extern __sfr __at 0xf66 RXB0D0;
-extern __sfr __at 0xf67 RXB0D1;
-extern __sfr __at 0xf68 RXB0D2;
-extern __sfr __at 0xf69 RXB0D3;
-extern __sfr __at 0xf6a RXB0D4;
-extern __sfr __at 0xf6b RXB0D5;
-extern __sfr __at 0xf6c RXB0D6;
-extern __sfr __at 0xf6d RXB0D7;
-extern __sfr __at 0xf6e CANSTAT;
+extern __sfr __at (0xf66) RXB0D0;
+extern __sfr __at (0xf67) RXB0D1;
+extern __sfr __at (0xf68) RXB0D2;
+extern __sfr __at (0xf69) RXB0D3;
+extern __sfr __at (0xf6a) RXB0D4;
+extern __sfr __at (0xf6b) RXB0D5;
+extern __sfr __at (0xf6c) RXB0D6;
+extern __sfr __at (0xf6d) RXB0D7;
+extern __sfr __at (0xf6e) CANSTAT;
 typedef union {
        struct {
                unsigned :1;
@@ -1605,9 +1605,9 @@ typedef union {
        };
 } __CANSTATbits_t;
 
-extern volatile __CANSTATbits_t __at 0xf6e CANSTATbits;
+extern volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-extern __sfr __at 0xf6f CANCON;
+extern __sfr __at (0xf6f) CANCON;
 typedef union {
        struct {
                unsigned WIN0:1;
@@ -1621,9 +1621,9 @@ typedef union {
        };
 } __CANCONbits_t;
 
-extern volatile __CANCONbits_t __at 0xf6f CANCONbits;
+extern volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-extern __sfr __at 0xf70 BRGCON1;
+extern __sfr __at (0xf70) BRGCON1;
 typedef union {
        struct {
                unsigned BRP0:1;
@@ -1637,9 +1637,9 @@ typedef union {
        };
 } __BRGCON1bits_t;
 
-extern volatile __BRGCON1bits_t __at 0xf70 BRGCON1bits;
+extern volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-extern __sfr __at 0xf71 BRGCON2;
+extern __sfr __at (0xf71) BRGCON2;
 typedef union {
        struct {
                unsigned PRSEG0:1;
@@ -1653,9 +1653,9 @@ typedef union {
        };
 } __BRGCON2bits_t;
 
-extern volatile __BRGCON2bits_t __at 0xf71 BRGCON2bits;
+extern volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-extern __sfr __at 0xf72 BRGCON3;
+extern __sfr __at (0xf72) BRGCON3;
 typedef union {
        struct {
                unsigned SEG2PH0:1;
@@ -1669,9 +1669,9 @@ typedef union {
        };
 } __BRGCON3bits_t;
 
-extern volatile __BRGCON3bits_t __at 0xf72 BRGCON3bits;
+extern volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-extern __sfr __at 0xf73 CIOCON;
+extern __sfr __at (0xf73) CIOCON;
 typedef union {
        struct {
                unsigned :1;
@@ -1685,9 +1685,9 @@ typedef union {
        };
 } __CIOCONbits_t;
 
-extern volatile __CIOCONbits_t __at 0xf73 CIOCONbits;
+extern volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-extern __sfr __at 0xf74 COMSTAT;
+extern __sfr __at (0xf74) COMSTAT;
 typedef union {
        struct {
                unsigned EWARN:1;
@@ -1701,9 +1701,9 @@ typedef union {
        };
 } __COMSTATbits_t;
 
-extern volatile __COMSTATbits_t __at 0xf74 COMSTATbits;
+extern volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-extern __sfr __at 0xf75 RXERRCNT;
+extern __sfr __at (0xf75) RXERRCNT;
 typedef union {
        struct {
                unsigned REC0:1;
@@ -1717,9 +1717,9 @@ typedef union {
        };
 } __RXERRCNTbits_t;
 
-extern volatile __RXERRCNTbits_t __at 0xf75 RXERRCNTbits;
+extern volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-extern __sfr __at 0xf76 TXERRCNT;
+extern __sfr __at (0xf76) TXERRCNT;
 typedef union {
        struct {
                unsigned TEC0:1;
@@ -1733,9 +1733,9 @@ typedef union {
        };
 } __TXERRCNTbits_t;
 
-extern volatile __TXERRCNTbits_t __at 0xf76 TXERRCNTbits;
+extern volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -1782,9 +1782,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;
@@ -1809,9 +1809,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -1847,9 +1847,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -1874,9 +1874,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -1912,9 +1912,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -1928,9 +1928,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;
@@ -1944,9 +1944,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -1960,9 +1960,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -1976,9 +1976,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -1992,9 +1992,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -2008,9 +2008,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;
@@ -2024,9 +2024,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -2040,9 +2040,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -2056,9 +2056,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned :1;
@@ -2072,9 +2072,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -2088,9 +2088,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;
@@ -2104,9 +2104,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;
@@ -2120,9 +2120,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 CCP2IE:1;
@@ -2136,9 +2136,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 CCP2IF:1;
@@ -2152,9 +2152,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 CCP2IP:1;
@@ -2168,9 +2168,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned RX0IE:1;
@@ -2184,9 +2184,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned RX0IF:1;
@@ -2200,9 +2200,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned RX0IP:1;
@@ -2216,9 +2216,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -2232,12 +2232,12 @@ 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 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -2251,9 +2251,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;
@@ -2267,12 +2267,12 @@ 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 PSPCON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -2286,9 +2286,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -2302,11 +2302,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -2320,9 +2320,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -2336,9 +2336,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb6 ECCPAS;
+extern __sfr __at (0xfb6) ECCPAS;
 typedef union {
        struct {
                unsigned PSSBD0:1;
@@ -2352,9 +2352,9 @@ typedef union {
        };
 } __ECCPASbits_t;
 
-extern volatile __ECCPASbits_t __at 0xfb6 ECCPASbits;
+extern volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
 
-extern __sfr __at 0xfb7 ECCP1DEL;
+extern __sfr __at (0xfb7) ECCP1DEL;
 typedef union {
        struct {
                unsigned EPDC0:1;
@@ -2368,9 +2368,9 @@ typedef union {
        };
 } __ECCP1DELbits_t;
 
-extern volatile __ECCP1DELbits_t __at 0xfb7 ECCP1DELbits;
+extern volatile __ECCP1DELbits_t __at (0xfb7) ECCP1DELbits;
 
-extern __sfr __at 0xfba ECCP1CON;
+extern __sfr __at (0xfba) ECCP1CON;
 typedef union {
        struct {
                unsigned ECCP1M0:1;
@@ -2384,11 +2384,11 @@ typedef union {
        };
 } __ECCP1CONbits_t;
 
-extern volatile __ECCP1CONbits_t __at 0xfba ECCP1CONbits;
+extern volatile __ECCP1CONbits_t __at (0xfba) ECCP1CONbits;
 
-extern __sfr __at 0xfbb ECCPR1L;
-extern __sfr __at 0xfbc ECCPR1H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) ECCPR1L;
+extern __sfr __at (0xfbc) ECCPR1H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -2402,11 +2402,11 @@ typedef union {
        };
 } __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 0xfc1 ADCON1;
+extern __sfr __at (0xfbe) CCPR1L;
+extern __sfr __at (0xfbf) CCPR1H;
+extern __sfr __at (0xfc1) ADCON1;
 typedef union {
        struct {
                unsigned PCFG0:1;
@@ -2420,9 +2420,9 @@ typedef union {
        };
 } __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;
@@ -2436,11 +2436,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -2454,9 +2454,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -2470,9 +2470,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -2486,11 +2486,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -2504,11 +2504,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;
@@ -2522,11 +2522,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;
@@ -2540,9 +2540,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;
@@ -2567,9 +2567,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;
@@ -2594,9 +2594,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;
@@ -2610,12 +2610,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -2629,32 +2629,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;
@@ -2679,9 +2679,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;
@@ -2695,9 +2695,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;
@@ -2711,18 +2711,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -2736,11 +2736,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 */

diff --git a/device/include/pic16/pic18f6520.h b/device/include/pic16/pic18f6520.h
index 2d87a28859c1b5e959d69ded6000656fc791c823..34661e0765de92b1faffaa3bc5c86b7f4845dd76 100644 (file)
--- a/device/include/pic16/pic18f6520.h
+++ b/device/include/pic16/pic18f6520.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F6520_H__
 #define __PIC18F6520_H__
 
-extern __sfr __at 0xf6b RCSTA2;
+extern __sfr __at (0xf6b) RCSTA2;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RCSTA2bits_t;
 
-extern volatile __RCSTA2bits_t __at 0xf6b RCSTA2bits;
+extern volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-extern __sfr __at 0xf6c TXSTA2;
+extern __sfr __at (0xf6c) TXSTA2;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -45,12 +45,12 @@ typedef union {
        };
 } __TXSTA2bits_t;
 
-extern volatile __TXSTA2bits_t __at 0xf6c TXSTA2bits;
+extern volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-extern __sfr __at 0xf6d TXREG2;
-extern __sfr __at 0xf6e RCREG2;
-extern __sfr __at 0xf6f SPBRG2;
-extern __sfr __at 0xf70 CCP5CON;
+extern __sfr __at (0xf6d) TXREG2;
+extern __sfr __at (0xf6e) RCREG2;
+extern __sfr __at (0xf6f) SPBRG2;
+extern __sfr __at (0xf70) CCP5CON;
 typedef union {
        struct {
                unsigned CCP5M0:1;
@@ -64,11 +64,11 @@ typedef union {
        };
 } __CCP5CONbits_t;
 
-extern volatile __CCP5CONbits_t __at 0xf70 CCP5CONbits;
+extern volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-extern __sfr __at 0xf71 CCPR5L;
-extern __sfr __at 0xf72 CCPR5H;
-extern __sfr __at 0xf73 CCP4CON;
+extern __sfr __at (0xf71) CCPR5L;
+extern __sfr __at (0xf72) CCPR5H;
+extern __sfr __at (0xf73) CCP4CON;
 typedef union {
        struct {
                unsigned CCP4M0:1;
@@ -82,11 +82,11 @@ typedef union {
        };
 } __CCP4CONbits_t;
 
-extern volatile __CCP4CONbits_t __at 0xf73 CCP4CONbits;
+extern volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-extern __sfr __at 0xf74 CCPR4L;
-extern __sfr __at 0xf75 CCPR4H;
-extern __sfr __at 0xf76 T4CON;
+extern __sfr __at (0xf74) CCPR4L;
+extern __sfr __at (0xf75) CCPR4H;
+extern __sfr __at (0xf76) T4CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -100,11 +100,11 @@ typedef union {
        };
 } __T4CONbits_t;
 
-extern volatile __T4CONbits_t __at 0xf76 T4CONbits;
+extern volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-extern __sfr __at 0xf77 PR4;
-extern __sfr __at 0xf78 TMR4;
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf77) PR4;
+extern __sfr __at (0xf78) TMR4;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -151,9 +151,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;
@@ -178,9 +178,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -216,9 +216,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -243,9 +243,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -281,9 +281,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf85 PORTF;
+extern __sfr __at (0xf85) PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -297,9 +297,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-extern __sfr __at 0xf86 PORTG;
+extern __sfr __at (0xf86) PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -313,9 +313,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -329,9 +329,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;
@@ -345,9 +345,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -361,9 +361,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -377,9 +377,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -393,9 +393,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf8e LATF;
+extern __sfr __at (0xf8e) LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -409,9 +409,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t __at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-extern __sfr __at 0xf8f LATG;
+extern __sfr __at (0xf8f) LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -425,9 +425,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t __at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -441,9 +441,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;
@@ -457,9 +457,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -473,9 +473,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -489,9 +489,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -505,9 +505,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf97 TRISF;
+extern __sfr __at (0xf97) TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -521,9 +521,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-extern __sfr __at 0xf98 TRISG;
+extern __sfr __at (0xf98) TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -537,9 +537,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-extern __sfr __at 0xf9c MEMCON;
+extern __sfr __at (0xf9c) MEMCON;
 typedef union {
        struct {
                unsigned WM0:1;
@@ -553,9 +553,9 @@ typedef union {
        };
 } __MEMCONbits_t;
 
-extern volatile __MEMCONbits_t __at 0xf9c MEMCONbits;
+extern volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -569,9 +569,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;
@@ -585,9 +585,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;
@@ -601,9 +601,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 CCP2IE:1;
@@ -617,9 +617,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 CCP2IF:1;
@@ -633,9 +633,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 CCP2IP:1;
@@ -649,9 +649,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned CCP3IE:1;
@@ -665,9 +665,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned CCP3IF:1;
@@ -681,9 +681,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned CCP3IP:1;
@@ -697,9 +697,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -713,13 +713,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 EEADRH;
-extern __sfr __at 0xfab RCSTA1;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) EEADRH;
+extern __sfr __at (0xfab) RCSTA1;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -733,9 +733,9 @@ typedef union {
        };
 } __RCSTA1bits_t;
 
-extern volatile __RCSTA1bits_t __at 0xfab RCSTA1bits;
+extern volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-extern __sfr __at 0xfac TXSTA1;
+extern __sfr __at (0xfac) TXSTA1;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -749,12 +749,12 @@ typedef union {
        };
 } __TXSTA1bits_t;
 
-extern volatile __TXSTA1bits_t __at 0xfac TXSTA1bits;
+extern volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-extern __sfr __at 0xfad TXREG1;
-extern __sfr __at 0xfae RCREG1;
-extern __sfr __at 0xfaf SPBRG1;
-extern __sfr __at 0xfb0 PSPCON;
+extern __sfr __at (0xfad) TXREG1;
+extern __sfr __at (0xfae) RCREG1;
+extern __sfr __at (0xfaf) SPBRG1;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -768,9 +768,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -784,11 +784,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -802,9 +802,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -818,9 +818,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb7 CCP3CON;
+extern __sfr __at (0xfb7) CCP3CON;
 typedef union {
        struct {
                unsigned CCP3M0:1;
@@ -834,11 +834,11 @@ typedef union {
        };
 } __CCP3CONbits_t;
 
-extern volatile __CCP3CONbits_t __at 0xfb7 CCP3CONbits;
+extern volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
 
-extern __sfr __at 0xfb8 CCPR3L;
-extern __sfr __at 0xfb9 CCPR3H;
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfb8) CCPR3L;
+extern __sfr __at (0xfb9) CCPR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -852,11 +852,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -870,11 +870,11 @@ typedef union {
        };
 } __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;
@@ -888,9 +888,9 @@ typedef union {
        };
 } __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;
@@ -904,9 +904,9 @@ typedef union {
        };
 } __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;
@@ -920,11 +920,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -938,9 +938,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -954,9 +954,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -970,11 +970,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -988,11 +988,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;
@@ -1006,11 +1006,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;
@@ -1024,9 +1024,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;
@@ -1051,9 +1051,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;
@@ -1078,9 +1078,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;
@@ -1094,12 +1094,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1113,32 +1113,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;
@@ -1163,9 +1163,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;
@@ -1179,9 +1179,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;
@@ -1195,18 +1195,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;
@@ -1220,11 +1220,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 */

diff --git a/device/include/pic16/pic18f6620.h b/device/include/pic16/pic18f6620.h
index 8747f30fc323697bb2ce33be9b1fc325bc6161fd..10c4c771dff2480e49b285f7ccba65ceda56a984 100644 (file)
--- a/device/include/pic16/pic18f6620.h
+++ b/device/include/pic16/pic18f6620.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F6620_H__
 #define __PIC18F6620_H__
 
-extern __sfr __at 0xf6b RCSTA2;
+extern __sfr __at (0xf6b) RCSTA2;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RCSTA2bits_t;
 
-extern volatile __RCSTA2bits_t __at 0xf6b RCSTA2bits;
+extern volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-extern __sfr __at 0xf6c TXSTA2;
+extern __sfr __at (0xf6c) TXSTA2;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -45,12 +45,12 @@ typedef union {
        };
 } __TXSTA2bits_t;
 
-extern volatile __TXSTA2bits_t __at 0xf6c TXSTA2bits;
+extern volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-extern __sfr __at 0xf6d TXREG2;
-extern __sfr __at 0xf6e RCREG2;
-extern __sfr __at 0xf6f SPBRG2;
-extern __sfr __at 0xf70 CCP5CON;
+extern __sfr __at (0xf6d) TXREG2;
+extern __sfr __at (0xf6e) RCREG2;
+extern __sfr __at (0xf6f) SPBRG2;
+extern __sfr __at (0xf70) CCP5CON;
 typedef union {
        struct {
                unsigned CCP5M0:1;
@@ -64,11 +64,11 @@ typedef union {
        };
 } __CCP5CONbits_t;
 
-extern volatile __CCP5CONbits_t __at 0xf70 CCP5CONbits;
+extern volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-extern __sfr __at 0xf71 CCPR5L;
-extern __sfr __at 0xf72 CCPR5H;
-extern __sfr __at 0xf73 CCP4CON;
+extern __sfr __at (0xf71) CCPR5L;
+extern __sfr __at (0xf72) CCPR5H;
+extern __sfr __at (0xf73) CCP4CON;
 typedef union {
        struct {
                unsigned CCP4M0:1;
@@ -82,11 +82,11 @@ typedef union {
        };
 } __CCP4CONbits_t;
 
-extern volatile __CCP4CONbits_t __at 0xf73 CCP4CONbits;
+extern volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-extern __sfr __at 0xf74 CCPR4L;
-extern __sfr __at 0xf75 CCPR4H;
-extern __sfr __at 0xf76 T4CON;
+extern __sfr __at (0xf74) CCPR4L;
+extern __sfr __at (0xf75) CCPR4H;
+extern __sfr __at (0xf76) T4CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -100,11 +100,11 @@ typedef union {
        };
 } __T4CONbits_t;
 
-extern volatile __T4CONbits_t __at 0xf76 T4CONbits;
+extern volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-extern __sfr __at 0xf77 PR4;
-extern __sfr __at 0xf78 TMR4;
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf77) PR4;
+extern __sfr __at (0xf78) TMR4;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -151,9 +151,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;
@@ -178,9 +178,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -216,9 +216,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -243,9 +243,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -281,9 +281,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf85 PORTF;
+extern __sfr __at (0xf85) PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -297,9 +297,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-extern __sfr __at 0xf86 PORTG;
+extern __sfr __at (0xf86) PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -313,9 +313,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -329,9 +329,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;
@@ -345,9 +345,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -361,9 +361,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -377,9 +377,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -393,9 +393,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf8e LATF;
+extern __sfr __at (0xf8e) LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -409,9 +409,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t __at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-extern __sfr __at 0xf8f LATG;
+extern __sfr __at (0xf8f) LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -425,9 +425,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t __at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -441,9 +441,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;
@@ -457,9 +457,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -473,9 +473,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -489,9 +489,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -505,9 +505,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf97 TRISF;
+extern __sfr __at (0xf97) TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -521,9 +521,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-extern __sfr __at 0xf98 TRISG;
+extern __sfr __at (0xf98) TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -537,9 +537,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -553,9 +553,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;
@@ -569,9 +569,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;
@@ -585,9 +585,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 CCP2IE:1;
@@ -601,9 +601,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 CCP2IF:1;
@@ -617,9 +617,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 CCP2IP:1;
@@ -633,9 +633,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned CCP3IE:1;
@@ -649,9 +649,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned CCP3IF:1;
@@ -665,9 +665,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned CCP3IP:1;
@@ -681,9 +681,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -697,13 +697,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 EEADRH;
-extern __sfr __at 0xfab RCSTA1;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) EEADRH;
+extern __sfr __at (0xfab) RCSTA1;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -717,9 +717,9 @@ typedef union {
        };
 } __RCSTA1bits_t;
 
-extern volatile __RCSTA1bits_t __at 0xfab RCSTA1bits;
+extern volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-extern __sfr __at 0xfac TXSTA1;
+extern __sfr __at (0xfac) TXSTA1;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -733,12 +733,12 @@ typedef union {
        };
 } __TXSTA1bits_t;
 
-extern volatile __TXSTA1bits_t __at 0xfac TXSTA1bits;
+extern volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-extern __sfr __at 0xfad TXREG1;
-extern __sfr __at 0xfae RCREG1;
-extern __sfr __at 0xfaf SPBRG1;
-extern __sfr __at 0xfb0 PSPCON;
+extern __sfr __at (0xfad) TXREG1;
+extern __sfr __at (0xfae) RCREG1;
+extern __sfr __at (0xfaf) SPBRG1;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -752,9 +752,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -768,11 +768,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -786,9 +786,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -802,9 +802,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb7 CCP3CON;
+extern __sfr __at (0xfb7) CCP3CON;
 typedef union {
        struct {
                unsigned CCP3M0:1;
@@ -818,11 +818,11 @@ typedef union {
        };
 } __CCP3CONbits_t;
 
-extern volatile __CCP3CONbits_t __at 0xfb7 CCP3CONbits;
+extern volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
 
-extern __sfr __at 0xfb8 CCPR3L;
-extern __sfr __at 0xfb9 CCPR3H;
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfb8) CCPR3L;
+extern __sfr __at (0xfb9) CCPR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -836,11 +836,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -854,11 +854,11 @@ typedef union {
        };
 } __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;
@@ -872,9 +872,9 @@ typedef union {
        };
 } __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;
@@ -888,9 +888,9 @@ typedef union {
        };
 } __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;
@@ -904,11 +904,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -922,9 +922,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -938,9 +938,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -954,11 +954,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -972,11 +972,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;
@@ -990,11 +990,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;
@@ -1008,9 +1008,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;
@@ -1035,9 +1035,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;
@@ -1062,9 +1062,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;
@@ -1078,12 +1078,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1097,32 +1097,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;
@@ -1147,9 +1147,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;
@@ -1163,9 +1163,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;
@@ -1179,18 +1179,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;
@@ -1204,11 +1204,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 */

diff --git a/device/include/pic16/pic18f6680.h b/device/include/pic16/pic18f6680.h
index c28873dc05aafe53bbae8adedacfc424d5e99c98..9a0ada614c6b349a35a5920e7ffae5daeca291f3 100644 (file)
--- a/device/include/pic16/pic18f6680.h
+++ b/device/include/pic16/pic18f6680.h
@@ -15,8 +15,8 @@
 #ifndef __PIC18F6680_H__
 #define __PIC18F6680_H__
 
-extern __sfr __at 0xf00 RXF0SIDH;
-extern __sfr __at 0xf01 RXF0SIDL;
+extern __sfr __at (0xf00) RXF0SIDH;
+extern __sfr __at (0xf01) RXF0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -30,12 +30,12 @@ typedef union {
        };
 } __RXF0SIDLbits_t;
 
-extern volatile __RXF0SIDLbits_t __at 0xf01 RXF0SIDLbits;
+extern volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-extern __sfr __at 0xf02 RXF0EIDH;
-extern __sfr __at 0xf03 RXF0EIDL;
-extern __sfr __at 0xf04 RXF1SIDH;
-extern __sfr __at 0xf05 RXF1SIDL;
+extern __sfr __at (0xf02) RXF0EIDH;
+extern __sfr __at (0xf03) RXF0EIDL;
+extern __sfr __at (0xf04) RXF1SIDH;
+extern __sfr __at (0xf05) RXF1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -49,14 +49,14 @@ typedef union {
        };
 } __RXF1SIDLbits_t;
 
-extern volatile __RXF1SIDLbits_t __at 0xf05 RXF1SIDLbits;
+extern volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-extern __sfr __at 0xf06 RXF1EIDH;
-extern __sfr __at 0xf07 RXF1EIDL;
-extern __sfr __at 0xf08 RXF2SIDH;
-extern __sfr __at 0xf09 RXF2SIDL;
-extern __sfr __at 0xf0a RXF2EIDH;
-extern __sfr __at 0xf0b RXF2EIDL;
+extern __sfr __at (0xf06) RXF1EIDH;
+extern __sfr __at (0xf07) RXF1EIDL;
+extern __sfr __at (0xf08) RXF2SIDH;
+extern __sfr __at (0xf09) RXF2SIDL;
+extern __sfr __at (0xf0a) RXF2EIDH;
+extern __sfr __at (0xf0b) RXF2EIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -70,10 +70,10 @@ typedef union {
        };
 } __RXF2EIDLbits_t;
 
-extern volatile __RXF2EIDLbits_t __at 0xf0b RXF2EIDLbits;
+extern volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-extern __sfr __at 0xf0c RXF3SIDH;
-extern __sfr __at 0xf0d RXF3SIDL;
+extern __sfr __at (0xf0c) RXF3SIDH;
+extern __sfr __at (0xf0d) RXF3SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -87,12 +87,12 @@ typedef union {
        };
 } __RXF3SIDLbits_t;
 
-extern volatile __RXF3SIDLbits_t __at 0xf0d RXF3SIDLbits;
+extern volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-extern __sfr __at 0xf0e RXF3EIDH;
-extern __sfr __at 0xf0f RXF3EIDL;
-extern __sfr __at 0xf10 RXF4SIDH;
-extern __sfr __at 0xf11 RXF4SIDL;
+extern __sfr __at (0xf0e) RXF3EIDH;
+extern __sfr __at (0xf0f) RXF3EIDL;
+extern __sfr __at (0xf10) RXF4SIDH;
+extern __sfr __at (0xf11) RXF4SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -106,12 +106,12 @@ typedef union {
        };
 } __RXF4SIDLbits_t;
 
-extern volatile __RXF4SIDLbits_t __at 0xf11 RXF4SIDLbits;
+extern volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-extern __sfr __at 0xf12 RXF4EIDH;
-extern __sfr __at 0xf13 RXF4EIDL;
-extern __sfr __at 0xf14 RXF5SIDH;
-extern __sfr __at 0xf15 RXF5SIDL;
+extern __sfr __at (0xf12) RXF4EIDH;
+extern __sfr __at (0xf13) RXF4EIDL;
+extern __sfr __at (0xf14) RXF5SIDH;
+extern __sfr __at (0xf15) RXF5SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -125,12 +125,12 @@ typedef union {
        };
 } __RXF5SIDLbits_t;
 
-extern volatile __RXF5SIDLbits_t __at 0xf15 RXF5SIDLbits;
+extern volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-extern __sfr __at 0xf16 RXF5EIDH;
-extern __sfr __at 0xf17 RXF5EIDL;
-extern __sfr __at 0xf18 RXM0SIDH;
-extern __sfr __at 0xf19 RXM0SIDL;
+extern __sfr __at (0xf16) RXF5EIDH;
+extern __sfr __at (0xf17) RXF5EIDL;
+extern __sfr __at (0xf18) RXM0SIDH;
+extern __sfr __at (0xf19) RXM0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -144,12 +144,12 @@ typedef union {
        };
 } __RXM0SIDLbits_t;
 
-extern volatile __RXM0SIDLbits_t __at 0xf19 RXM0SIDLbits;
+extern volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-extern __sfr __at 0xf1a RXM0EIDH;
-extern __sfr __at 0xf1b RXM0EIDL;
-extern __sfr __at 0xf1c RXM1SIDH;
-extern __sfr __at 0xf1d RXM1SIDL;
+extern __sfr __at (0xf1a) RXM0EIDH;
+extern __sfr __at (0xf1b) RXM0EIDL;
+extern __sfr __at (0xf1c) RXM1SIDH;
+extern __sfr __at (0xf1d) RXM1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -163,11 +163,11 @@ typedef union {
        };
 } __RXM1SIDLbits_t;
 
-extern volatile __RXM1SIDLbits_t __at 0xf1d RXM1SIDLbits;
+extern volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-extern __sfr __at 0xf1e RXM1EIDH;
-extern __sfr __at 0xf1f RXM1EIDL;
-extern __sfr __at 0xf20 TXB2CON;
+extern __sfr __at (0xf1e) RXM1EIDH;
+extern __sfr __at (0xf1f) RXM1EIDL;
+extern __sfr __at (0xf20) TXB2CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -181,10 +181,10 @@ typedef union {
        };
 } __TXB2CONbits_t;
 
-extern volatile __TXB2CONbits_t __at 0xf20 TXB2CONbits;
+extern volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-extern __sfr __at 0xf21 TXB2SIDH;
-extern __sfr __at 0xf22 TXB2SIDL;
+extern __sfr __at (0xf21) TXB2SIDH;
+extern __sfr __at (0xf22) TXB2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -198,11 +198,11 @@ typedef union {
        };
 } __TXB2SIDLbits_t;
 
-extern volatile __TXB2SIDLbits_t __at 0xf22 TXB2SIDLbits;
+extern volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-extern __sfr __at 0xf23 TXB2EIDH;
-extern __sfr __at 0xf24 TXB2EIDL;
-extern __sfr __at 0xf25 TXB2DLC;
+extern __sfr __at (0xf23) TXB2EIDH;
+extern __sfr __at (0xf24) TXB2EIDL;
+extern __sfr __at (0xf25) TXB2DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -216,18 +216,18 @@ typedef union {
        };
 } __TXB2DLCbits_t;
 
-extern volatile __TXB2DLCbits_t __at 0xf25 TXB2DLCbits;
+extern volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-extern __sfr __at 0xf26 TXB2D0;
-extern __sfr __at 0xf27 TXB2D1;
-extern __sfr __at 0xf28 TXB2D2;
-extern __sfr __at 0xf29 TXB2D3;
-extern __sfr __at 0xf2a TXB2D4;
-extern __sfr __at 0xf2b TXB2D5;
-extern __sfr __at 0xf2c TXB2D6;
-extern __sfr __at 0xf2d TXB2D7;
-extern __sfr __at 0xf2e CANSTATRO3;
-extern __sfr __at 0xf30 TXB1CON;
+extern __sfr __at (0xf26) TXB2D0;
+extern __sfr __at (0xf27) TXB2D1;
+extern __sfr __at (0xf28) TXB2D2;
+extern __sfr __at (0xf29) TXB2D3;
+extern __sfr __at (0xf2a) TXB2D4;
+extern __sfr __at (0xf2b) TXB2D5;
+extern __sfr __at (0xf2c) TXB2D6;
+extern __sfr __at (0xf2d) TXB2D7;
+extern __sfr __at (0xf2e) CANSTATRO3;
+extern __sfr __at (0xf30) TXB1CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -241,10 +241,10 @@ typedef union {
        };
 } __TXB1CONbits_t;
 
-extern volatile __TXB1CONbits_t __at 0xf30 TXB1CONbits;
+extern volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-extern __sfr __at 0xf31 TXB1SIDH;
-extern __sfr __at 0xf32 TXB1SIDL;
+extern __sfr __at (0xf31) TXB1SIDH;
+extern __sfr __at (0xf32) TXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -258,11 +258,11 @@ typedef union {
        };
 } __TXB1SIDLbits_t;
 
-extern volatile __TXB1SIDLbits_t __at 0xf32 TXB1SIDLbits;
+extern volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-extern __sfr __at 0xf33 TXB1EIDH;
-extern __sfr __at 0xf34 TXB1EIDL;
-extern __sfr __at 0xf35 TXB1DLC;
+extern __sfr __at (0xf33) TXB1EIDH;
+extern __sfr __at (0xf34) TXB1EIDL;
+extern __sfr __at (0xf35) TXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -276,18 +276,18 @@ typedef union {
        };
 } __TXB1DLCbits_t;
 
-extern volatile __TXB1DLCbits_t __at 0xf35 TXB1DLCbits;
+extern volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-extern __sfr __at 0xf36 TXB1D0;
-extern __sfr __at 0xf37 TXB1D1;
-extern __sfr __at 0xf38 TXB1D2;
-extern __sfr __at 0xf39 TXB1D3;
-extern __sfr __at 0xf3a TXB1D4;
-extern __sfr __at 0xf3b TXB1D5;
-extern __sfr __at 0xf3c TXB1D6;
-extern __sfr __at 0xf3d TXB1D7;
-extern __sfr __at 0xf3e CANSTATRO2;
-extern __sfr __at 0xf40 TXB0CON;
+extern __sfr __at (0xf36) TXB1D0;
+extern __sfr __at (0xf37) TXB1D1;
+extern __sfr __at (0xf38) TXB1D2;
+extern __sfr __at (0xf39) TXB1D3;
+extern __sfr __at (0xf3a) TXB1D4;
+extern __sfr __at (0xf3b) TXB1D5;
+extern __sfr __at (0xf3c) TXB1D6;
+extern __sfr __at (0xf3d) TXB1D7;
+extern __sfr __at (0xf3e) CANSTATRO2;
+extern __sfr __at (0xf40) TXB0CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -301,13 +301,13 @@ typedef union {
        };
 } __TXB0CONbits_t;
 
-extern volatile __TXB0CONbits_t __at 0xf40 TXB0CONbits;
+extern volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-extern __sfr __at 0xf41 TXB0SIDH;
-extern __sfr __at 0xf42 TXB0SIDL;
-extern __sfr __at 0xf43 TXB0EIDH;
-extern __sfr __at 0xf44 TXB0EIDL;
-extern __sfr __at 0xf45 TXB0DLC;
+extern __sfr __at (0xf41) TXB0SIDH;
+extern __sfr __at (0xf42) TXB0SIDL;
+extern __sfr __at (0xf43) TXB0EIDH;
+extern __sfr __at (0xf44) TXB0EIDL;
+extern __sfr __at (0xf45) TXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -321,18 +321,18 @@ typedef union {
        };
 } __TXB0DLCbits_t;
 
-extern volatile __TXB0DLCbits_t __at 0xf45 TXB0DLCbits;
+extern volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-extern __sfr __at 0xf46 TXB0D0;
-extern __sfr __at 0xf47 TXB0D1;
-extern __sfr __at 0xf48 TXB0D2;
-extern __sfr __at 0xf49 TXB0D3;
-extern __sfr __at 0xf4a TXB0D4;
-extern __sfr __at 0xf4b TXB0D5;
-extern __sfr __at 0xf4c TXB0D6;
-extern __sfr __at 0xf4d TXB0D7;
-extern __sfr __at 0xf4e CANSTATRO1;
-extern __sfr __at 0xf50 RXB1CON;
+extern __sfr __at (0xf46) TXB0D0;
+extern __sfr __at (0xf47) TXB0D1;
+extern __sfr __at (0xf48) TXB0D2;
+extern __sfr __at (0xf49) TXB0D3;
+extern __sfr __at (0xf4a) TXB0D4;
+extern __sfr __at (0xf4b) TXB0D5;
+extern __sfr __at (0xf4c) TXB0D6;
+extern __sfr __at (0xf4d) TXB0D7;
+extern __sfr __at (0xf4e) CANSTATRO1;
+extern __sfr __at (0xf50) RXB1CON;
 typedef union {
        struct {
                unsigned :1;
@@ -346,10 +346,10 @@ typedef union {
        };
 } __RXB1CONbits_t;
 
-extern volatile __RXB1CONbits_t __at 0xf50 RXB1CONbits;
+extern volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-extern __sfr __at 0xf51 RXB1SIDH;
-extern __sfr __at 0xf52 RXB1SIDL;
+extern __sfr __at (0xf51) RXB1SIDH;
+extern __sfr __at (0xf52) RXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -363,11 +363,11 @@ typedef union {
        };
 } __RXB1SIDLbits_t;
 
-extern volatile __RXB1SIDLbits_t __at 0xf52 RXB1SIDLbits;
+extern volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-extern __sfr __at 0xf53 RXB1EIDH;
-extern __sfr __at 0xf54 RXB1EIDL;
-extern __sfr __at 0xf55 RXB1DLC;
+extern __sfr __at (0xf53) RXB1EIDH;
+extern __sfr __at (0xf54) RXB1EIDL;
+extern __sfr __at (0xf55) RXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -381,18 +381,18 @@ typedef union {
        };
 } __RXB1DLCbits_t;
 
-extern volatile __RXB1DLCbits_t __at 0xf55 RXB1DLCbits;
+extern volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-extern __sfr __at 0xf56 RXB1D0;
-extern __sfr __at 0xf57 RXB1D1;
-extern __sfr __at 0xf58 RXB1D2;
-extern __sfr __at 0xf59 RXB1D3;
-extern __sfr __at 0xf5a RXB1D4;
-extern __sfr __at 0xf5b RXB1D5;
-extern __sfr __at 0xf5c RXB1D6;
-extern __sfr __at 0xf5d RXB1D7;
-extern __sfr __at 0xf5e CANSTATRO0;
-extern __sfr __at 0xf60 RXB0CON;
+extern __sfr __at (0xf56) RXB1D0;
+extern __sfr __at (0xf57) RXB1D1;
+extern __sfr __at (0xf58) RXB1D2;
+extern __sfr __at (0xf59) RXB1D3;
+extern __sfr __at (0xf5a) RXB1D4;
+extern __sfr __at (0xf5b) RXB1D5;
+extern __sfr __at (0xf5c) RXB1D6;
+extern __sfr __at (0xf5d) RXB1D7;
+extern __sfr __at (0xf5e) CANSTATRO0;
+extern __sfr __at (0xf60) RXB0CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -406,10 +406,10 @@ typedef union {
        };
 } __RXB0CONbits_t;
 
-extern volatile __RXB0CONbits_t __at 0xf60 RXB0CONbits;
+extern volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-extern __sfr __at 0xf61 RXB0SIDH;
-extern __sfr __at 0xf62 RXB0SIDL;
+extern __sfr __at (0xf61) RXB0SIDH;
+extern __sfr __at (0xf62) RXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -423,20 +423,20 @@ typedef union {
        };
 } __RXB0SIDLbits_t;
 
-extern volatile __RXB0SIDLbits_t __at 0xf62 RXB0SIDLbits;
+extern volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-extern __sfr __at 0xf63 RXB0EIDH;
-extern __sfr __at 0xf64 RXB0EIDL;
-extern __sfr __at 0xf65 RXB0DLC;
-extern __sfr __at 0xf66 RXB0D0;
-extern __sfr __at 0xf67 RXB0D1;
-extern __sfr __at 0xf68 RXB0D2;
-extern __sfr __at 0xf69 RXB0D3;
-extern __sfr __at 0xf6a RXB0D4;
-extern __sfr __at 0xf6b RXB0D5;
-extern __sfr __at 0xf6c RXB0D6;
-extern __sfr __at 0xf6d RXB0D7;
-extern __sfr __at 0xf6e CANSTAT;
+extern __sfr __at (0xf63) RXB0EIDH;
+extern __sfr __at (0xf64) RXB0EIDL;
+extern __sfr __at (0xf65) RXB0DLC;
+extern __sfr __at (0xf66) RXB0D0;
+extern __sfr __at (0xf67) RXB0D1;
+extern __sfr __at (0xf68) RXB0D2;
+extern __sfr __at (0xf69) RXB0D3;
+extern __sfr __at (0xf6a) RXB0D4;
+extern __sfr __at (0xf6b) RXB0D5;
+extern __sfr __at (0xf6c) RXB0D6;
+extern __sfr __at (0xf6d) RXB0D7;
+extern __sfr __at (0xf6e) CANSTAT;
 typedef union {
        struct {
                unsigned :1;
@@ -450,9 +450,9 @@ typedef union {
        };
 } __CANSTATbits_t;
 
-extern volatile __CANSTATbits_t __at 0xf6e CANSTATbits;
+extern volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-extern __sfr __at 0xf6f CANCON;
+extern __sfr __at (0xf6f) CANCON;
 typedef union {
        struct {
                unsigned :1;
@@ -466,9 +466,9 @@ typedef union {
        };
 } __CANCONbits_t;
 
-extern volatile __CANCONbits_t __at 0xf6f CANCONbits;
+extern volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-extern __sfr __at 0xf70 BRGCON1;
+extern __sfr __at (0xf70) BRGCON1;
 typedef union {
        struct {
                unsigned BRP0:1;
@@ -482,9 +482,9 @@ typedef union {
        };
 } __BRGCON1bits_t;
 
-extern volatile __BRGCON1bits_t __at 0xf70 BRGCON1bits;
+extern volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-extern __sfr __at 0xf71 BRGCON2;
+extern __sfr __at (0xf71) BRGCON2;
 typedef union {
        struct {
                unsigned PRSEG0:1;
@@ -498,9 +498,9 @@ typedef union {
        };
 } __BRGCON2bits_t;
 
-extern volatile __BRGCON2bits_t __at 0xf71 BRGCON2bits;
+extern volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-extern __sfr __at 0xf72 BRGCON3;
+extern __sfr __at (0xf72) BRGCON3;
 typedef union {
        struct {
                unsigned SEG2PH0:1;
@@ -514,9 +514,9 @@ typedef union {
        };
 } __BRGCON3bits_t;
 
-extern volatile __BRGCON3bits_t __at 0xf72 BRGCON3bits;
+extern volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-extern __sfr __at 0xf73 CIOCON;
+extern __sfr __at (0xf73) CIOCON;
 typedef union {
        struct {
                unsigned :1;
@@ -530,9 +530,9 @@ typedef union {
        };
 } __CIOCONbits_t;
 
-extern volatile __CIOCONbits_t __at 0xf73 CIOCONbits;
+extern volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-extern __sfr __at 0xf74 COMSTAT;
+extern __sfr __at (0xf74) COMSTAT;
 typedef union {
        struct {
                unsigned EWARN:1;
@@ -546,9 +546,9 @@ typedef union {
        };
 } __COMSTATbits_t;
 
-extern volatile __COMSTATbits_t __at 0xf74 COMSTATbits;
+extern volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-extern __sfr __at 0xf75 RXERRCNT;
+extern __sfr __at (0xf75) RXERRCNT;
 typedef union {
        struct {
                unsigned REC0:1;
@@ -562,9 +562,9 @@ typedef union {
        };
 } __RXERRCNTbits_t;
 
-extern volatile __RXERRCNTbits_t __at 0xf75 RXERRCNTbits;
+extern volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-extern __sfr __at 0xf76 TXERRCNT;
+extern __sfr __at (0xf76) TXERRCNT;
 typedef union {
        struct {
                unsigned TEC0:1;
@@ -578,9 +578,9 @@ typedef union {
        };
 } __TXERRCNTbits_t;
 
-extern volatile __TXERRCNTbits_t __at 0xf76 TXERRCNTbits;
+extern volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -627,9 +627,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;
@@ -654,9 +654,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -692,9 +692,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -719,9 +719,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -757,9 +757,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf85 PORTF;
+extern __sfr __at (0xf85) PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -773,9 +773,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-extern __sfr __at 0xf86 PORTG;
+extern __sfr __at (0xf86) PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -789,9 +789,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -805,9 +805,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;
@@ -821,9 +821,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -837,9 +837,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -853,9 +853,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -869,9 +869,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf8e LATF;
+extern __sfr __at (0xf8e) LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -885,9 +885,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t __at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-extern __sfr __at 0xf8f LATG;
+extern __sfr __at (0xf8f) LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -901,9 +901,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t __at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -917,9 +917,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;
@@ -933,9 +933,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -949,9 +949,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -965,9 +965,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -981,9 +981,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf97 TRISF;
+extern __sfr __at (0xf97) TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -997,9 +997,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-extern __sfr __at 0xf98 TRISG;
+extern __sfr __at (0xf98) TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -1013,9 +1013,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -1029,9 +1029,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;
@@ -1045,9 +1045,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;
@@ -1061,9 +1061,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 CCP2IE:1;
@@ -1077,9 +1077,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 CCP2IF:1;
@@ -1093,9 +1093,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 CCP2IP:1;
@@ -1109,9 +1109,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned RX0IE:1;
@@ -1125,9 +1125,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned RX0IF:1;
@@ -1141,9 +1141,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned RX0IP:1;
@@ -1157,9 +1157,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -1173,13 +1173,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 EEADRH;
-extern __sfr __at 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) EEADRH;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -1193,9 +1193,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;
@@ -1209,12 +1209,12 @@ 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 PSPCON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -1228,9 +1228,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -1244,11 +1244,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -1262,9 +1262,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -1278,9 +1278,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb6 ECCPAS;
+extern __sfr __at (0xfb6) ECCPAS;
 typedef union {
        struct {
                unsigned PSSBD0:1;
@@ -1294,9 +1294,9 @@ typedef union {
        };
 } __ECCPASbits_t;
 
-extern volatile __ECCPASbits_t __at 0xfb6 ECCPASbits;
+extern volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
 
-extern __sfr __at 0xfb7 ECCP1DEL;
+extern __sfr __at (0xfb7) ECCP1DEL;
 typedef union {
        struct {
                unsigned EPDC0:1;
@@ -1310,9 +1310,9 @@ typedef union {
        };
 } __ECCP1DELbits_t;
 
-extern volatile __ECCP1DELbits_t __at 0xfb7 ECCP1DELbits;
+extern volatile __ECCP1DELbits_t __at (0xfb7) ECCP1DELbits;
 
-extern __sfr __at 0xfba ECCP1CON;
+extern __sfr __at (0xfba) ECCP1CON;
 typedef union {
        struct {
                unsigned ECCP1M0:1;
@@ -1326,9 +1326,9 @@ typedef union {
        };
 } __ECCP1CONbits_t;
 
-extern volatile __ECCP1CONbits_t __at 0xfba ECCP1CONbits;
+extern volatile __ECCP1CONbits_t __at (0xfba) ECCP1CONbits;
 
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -1342,13 +1342,13 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb ECCPR1L;
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc ECCPR1H;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfc0 ADCON2;
+extern __sfr __at (0xfbb) ECCPR1L;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) ECCPR1H;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfc0) ADCON2;
 typedef union {
        struct {
                unsigned ADCS0:1;
@@ -1362,9 +1362,9 @@ typedef union {
        };
 } __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;
@@ -1378,9 +1378,9 @@ typedef union {
        };
 } __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;
@@ -1394,11 +1394,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -1412,9 +1412,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -1428,9 +1428,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -1444,11 +1444,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -1462,11 +1462,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;
@@ -1480,11 +1480,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;
@@ -1498,9 +1498,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;
@@ -1525,9 +1525,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;
@@ -1552,9 +1552,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;
@@ -1568,12 +1568,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1587,32 +1587,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;
@@ -1637,9 +1637,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;
@@ -1653,9 +1653,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;
@@ -1669,18 +1669,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -1694,11 +1694,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 */

diff --git a/device/include/pic16/pic18f6720.h b/device/include/pic16/pic18f6720.h
index d8f24d61733589cc82d142aded7585191fd186c5..4ac9e635d22e413e5820429763043cad3aa53a86 100644 (file)
--- a/device/include/pic16/pic18f6720.h
+++ b/device/include/pic16/pic18f6720.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F6720_H__
 #define __PIC18F6720_H__
 
-extern __sfr __at 0xf6b RCSTA2;
+extern __sfr __at (0xf6b) RCSTA2;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RCSTA2bits_t;
 
-extern volatile __RCSTA2bits_t __at 0xf6b RCSTA2bits;
+extern volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-extern __sfr __at 0xf6c TXSTA2;
+extern __sfr __at (0xf6c) TXSTA2;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -45,12 +45,12 @@ typedef union {
        };
 } __TXSTA2bits_t;
 
-extern volatile __TXSTA2bits_t __at 0xf6c TXSTA2bits;
+extern volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-extern __sfr __at 0xf6d TXREG2;
-extern __sfr __at 0xf6e RCREG2;
-extern __sfr __at 0xf6f SPBRG2;
-extern __sfr __at 0xf70 CCP5CON;
+extern __sfr __at (0xf6d) TXREG2;
+extern __sfr __at (0xf6e) RCREG2;
+extern __sfr __at (0xf6f) SPBRG2;
+extern __sfr __at (0xf70) CCP5CON;
 typedef union {
        struct {
                unsigned CCP5M0:1;
@@ -64,11 +64,11 @@ typedef union {
        };
 } __CCP5CONbits_t;
 
-extern volatile __CCP5CONbits_t __at 0xf70 CCP5CONbits;
+extern volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-extern __sfr __at 0xf71 CCPR5L;
-extern __sfr __at 0xf72 CCPR5H;
-extern __sfr __at 0xf73 CCP4CON;
+extern __sfr __at (0xf71) CCPR5L;
+extern __sfr __at (0xf72) CCPR5H;
+extern __sfr __at (0xf73) CCP4CON;
 typedef union {
        struct {
                unsigned CCP4M0:1;
@@ -82,11 +82,11 @@ typedef union {
        };
 } __CCP4CONbits_t;
 
-extern volatile __CCP4CONbits_t __at 0xf73 CCP4CONbits;
+extern volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-extern __sfr __at 0xf74 CCPR4L;
-extern __sfr __at 0xf75 CCPR4H;
-extern __sfr __at 0xf76 T4CON;
+extern __sfr __at (0xf74) CCPR4L;
+extern __sfr __at (0xf75) CCPR4H;
+extern __sfr __at (0xf76) T4CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -100,11 +100,11 @@ typedef union {
        };
 } __T4CONbits_t;
 
-extern volatile __T4CONbits_t __at 0xf76 T4CONbits;
+extern volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-extern __sfr __at 0xf77 PR4;
-extern __sfr __at 0xf78 TMR4;
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf77) PR4;
+extern __sfr __at (0xf78) TMR4;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -151,9 +151,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;
@@ -178,9 +178,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -216,9 +216,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -243,9 +243,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -281,9 +281,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf85 PORTF;
+extern __sfr __at (0xf85) PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -297,9 +297,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-extern __sfr __at 0xf86 PORTG;
+extern __sfr __at (0xf86) PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -313,9 +313,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -329,9 +329,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;
@@ -345,9 +345,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -361,9 +361,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -377,9 +377,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -393,9 +393,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf8e LATF;
+extern __sfr __at (0xf8e) LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -409,9 +409,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t __at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-extern __sfr __at 0xf8f LATG;
+extern __sfr __at (0xf8f) LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -425,9 +425,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t __at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -441,9 +441,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;
@@ -457,9 +457,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -473,9 +473,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -489,9 +489,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -505,9 +505,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf97 TRISF;
+extern __sfr __at (0xf97) TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -521,9 +521,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-extern __sfr __at 0xf98 TRISG;
+extern __sfr __at (0xf98) TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -537,9 +537,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -553,9 +553,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;
@@ -569,9 +569,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;
@@ -585,9 +585,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 CCP2IE:1;
@@ -601,9 +601,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 CCP2IF:1;
@@ -617,9 +617,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 CCP2IP:1;
@@ -633,9 +633,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned CCP3IE:1;
@@ -649,9 +649,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned CCP3IF:1;
@@ -665,9 +665,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned CCP3IP:1;
@@ -681,9 +681,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -697,13 +697,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 EEADRH;
-extern __sfr __at 0xfab RCSTA1;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) EEADRH;
+extern __sfr __at (0xfab) RCSTA1;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -717,9 +717,9 @@ typedef union {
        };
 } __RCSTA1bits_t;
 
-extern volatile __RCSTA1bits_t __at 0xfab RCSTA1bits;
+extern volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-extern __sfr __at 0xfac TXSTA1;
+extern __sfr __at (0xfac) TXSTA1;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -733,12 +733,12 @@ typedef union {
        };
 } __TXSTA1bits_t;
 
-extern volatile __TXSTA1bits_t __at 0xfac TXSTA1bits;
+extern volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-extern __sfr __at 0xfad TXREG1;
-extern __sfr __at 0xfae RCREG1;
-extern __sfr __at 0xfaf SPBRG1;
-extern __sfr __at 0xfb0 PSPCON;
+extern __sfr __at (0xfad) TXREG1;
+extern __sfr __at (0xfae) RCREG1;
+extern __sfr __at (0xfaf) SPBRG1;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -752,9 +752,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -768,11 +768,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -786,9 +786,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -802,9 +802,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb7 CCP3CON;
+extern __sfr __at (0xfb7) CCP3CON;
 typedef union {
        struct {
                unsigned CCP3M0:1;
@@ -818,11 +818,11 @@ typedef union {
        };
 } __CCP3CONbits_t;
 
-extern volatile __CCP3CONbits_t __at 0xfb7 CCP3CONbits;
+extern volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
 
-extern __sfr __at 0xfb8 CCPR3L;
-extern __sfr __at 0xfb9 CCPR3H;
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfb8) CCPR3L;
+extern __sfr __at (0xfb9) CCPR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -836,11 +836,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -854,11 +854,11 @@ typedef union {
        };
 } __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;
@@ -872,9 +872,9 @@ typedef union {
        };
 } __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;
@@ -888,9 +888,9 @@ typedef union {
        };
 } __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;
@@ -904,11 +904,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -922,9 +922,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -938,9 +938,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -954,11 +954,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -972,11 +972,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;
@@ -990,11 +990,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;
@@ -1008,9 +1008,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;
@@ -1035,9 +1035,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;
@@ -1062,9 +1062,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;
@@ -1078,12 +1078,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1097,32 +1097,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;
@@ -1147,9 +1147,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;
@@ -1163,9 +1163,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;
@@ -1179,18 +1179,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;
@@ -1204,11 +1204,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 */

diff --git a/device/include/pic16/pic18f8520.h b/device/include/pic16/pic18f8520.h
index f1f02273c5532bee6ace47ea38de429f6f36709a..bef093785572593678245427403d06b4cf42eb64 100644 (file)
--- a/device/include/pic16/pic18f8520.h
+++ b/device/include/pic16/pic18f8520.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F8520_H__
 #define __PIC18F8520_H__
 
-extern __sfr __at 0xf6b RCSTA2;
+extern __sfr __at (0xf6b) RCSTA2;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RCSTA2bits_t;
 
-extern volatile __RCSTA2bits_t __at 0xf6b RCSTA2bits;
+extern volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-extern __sfr __at 0xf6c TXSTA2;
+extern __sfr __at (0xf6c) TXSTA2;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -45,12 +45,12 @@ typedef union {
        };
 } __TXSTA2bits_t;
 
-extern volatile __TXSTA2bits_t __at 0xf6c TXSTA2bits;
+extern volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-extern __sfr __at 0xf6d TXREG2;
-extern __sfr __at 0xf6e RCREG2;
-extern __sfr __at 0xf6f SPBRG2;
-extern __sfr __at 0xf70 CCP5CON;
+extern __sfr __at (0xf6d) TXREG2;
+extern __sfr __at (0xf6e) RCREG2;
+extern __sfr __at (0xf6f) SPBRG2;
+extern __sfr __at (0xf70) CCP5CON;
 typedef union {
        struct {
                unsigned CCP5M0:1;
@@ -64,11 +64,11 @@ typedef union {
        };
 } __CCP5CONbits_t;
 
-extern volatile __CCP5CONbits_t __at 0xf70 CCP5CONbits;
+extern volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-extern __sfr __at 0xf71 CCPR5L;
-extern __sfr __at 0xf72 CCPR5H;
-extern __sfr __at 0xf73 CCP4CON;
+extern __sfr __at (0xf71) CCPR5L;
+extern __sfr __at (0xf72) CCPR5H;
+extern __sfr __at (0xf73) CCP4CON;
 typedef union {
        struct {
                unsigned CCP4M0:1;
@@ -82,11 +82,11 @@ typedef union {
        };
 } __CCP4CONbits_t;
 
-extern volatile __CCP4CONbits_t __at 0xf73 CCP4CONbits;
+extern volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-extern __sfr __at 0xf74 CCPR4L;
-extern __sfr __at 0xf75 CCPR4H;
-extern __sfr __at 0xf76 T4CON;
+extern __sfr __at (0xf74) CCPR4L;
+extern __sfr __at (0xf75) CCPR4H;
+extern __sfr __at (0xf76) T4CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -100,11 +100,11 @@ typedef union {
        };
 } __T4CONbits_t;
 
-extern volatile __T4CONbits_t __at 0xf76 T4CONbits;
+extern volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-extern __sfr __at 0xf77 PR4;
-extern __sfr __at 0xf78 TMR4;
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf77) PR4;
+extern __sfr __at (0xf78) TMR4;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -151,9 +151,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;
@@ -178,9 +178,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -216,9 +216,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -243,9 +243,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -281,9 +281,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf85 PORTF;
+extern __sfr __at (0xf85) PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -297,9 +297,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-extern __sfr __at 0xf86 PORTG;
+extern __sfr __at (0xf86) PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -313,9 +313,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-extern __sfr __at 0xf87 PORTH;
+extern __sfr __at (0xf87) PORTH;
 typedef union {
        struct {
                unsigned RH0:1;
@@ -329,9 +329,9 @@ typedef union {
        };
 } __PORTHbits_t;
 
-extern volatile __PORTHbits_t __at 0xf87 PORTHbits;
+extern volatile __PORTHbits_t __at (0xf87) PORTHbits;
 
-extern __sfr __at 0xf88 PORTJ;
+extern __sfr __at (0xf88) PORTJ;
 typedef union {
        struct {
                unsigned RJ0:1;
@@ -345,9 +345,9 @@ typedef union {
        };
 } __PORTJbits_t;
 
-extern volatile __PORTJbits_t __at 0xf88 PORTJbits;
+extern volatile __PORTJbits_t __at (0xf88) PORTJbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -361,9 +361,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;
@@ -377,9 +377,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -393,9 +393,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -409,9 +409,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -425,9 +425,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf8e LATF;
+extern __sfr __at (0xf8e) LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -441,9 +441,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t __at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-extern __sfr __at 0xf8f LATG;
+extern __sfr __at (0xf8f) LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -457,9 +457,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t __at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-extern __sfr __at 0xf90 LATH;
+extern __sfr __at (0xf90) LATH;
 typedef union {
        struct {
                unsigned LATH0:1;
@@ -473,9 +473,9 @@ typedef union {
        };
 } __LATHbits_t;
 
-extern volatile __LATHbits_t __at 0xf90 LATHbits;
+extern volatile __LATHbits_t __at (0xf90) LATHbits;
 
-extern __sfr __at 0xf91 LATJ;
+extern __sfr __at (0xf91) LATJ;
 typedef union {
        struct {
                unsigned LATJ0:1;
@@ -489,9 +489,9 @@ typedef union {
        };
 } __LATJbits_t;
 
-extern volatile __LATJbits_t __at 0xf91 LATJbits;
+extern volatile __LATJbits_t __at (0xf91) LATJbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -505,9 +505,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;
@@ -521,9 +521,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -537,9 +537,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -553,9 +553,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -569,9 +569,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf97 TRISF;
+extern __sfr __at (0xf97) TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -585,9 +585,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-extern __sfr __at 0xf98 TRISG;
+extern __sfr __at (0xf98) TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -601,9 +601,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-extern __sfr __at 0xf99 TRISH;
+extern __sfr __at (0xf99) TRISH;
 typedef union {
        struct {
                unsigned TRISH0:1;
@@ -617,9 +617,9 @@ typedef union {
        };
 } __TRISHbits_t;
 
-extern volatile __TRISHbits_t __at 0xf99 TRISHbits;
+extern volatile __TRISHbits_t __at (0xf99) TRISHbits;
 
-extern __sfr __at 0xf9a TRISJ;
+extern __sfr __at (0xf9a) TRISJ;
 typedef union {
        struct {
                unsigned TRISJ0:1;
@@ -633,9 +633,9 @@ typedef union {
        };
 } __TRISJbits_t;
 
-extern volatile __TRISJbits_t __at 0xf9a TRISJbits;
+extern volatile __TRISJbits_t __at (0xf9a) TRISJbits;
 
-extern __sfr __at 0xf9c MEMCON;
+extern __sfr __at (0xf9c) MEMCON;
 typedef union {
        struct {
                unsigned WM0:1;
@@ -649,9 +649,9 @@ typedef union {
        };
 } __MEMCONbits_t;
 
-extern volatile __MEMCONbits_t __at 0xf9c MEMCONbits;
+extern volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -665,9 +665,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;
@@ -681,9 +681,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;
@@ -697,9 +697,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 CCP2IE:1;
@@ -713,9 +713,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 CCP2IF:1;
@@ -729,9 +729,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 CCP2IP:1;
@@ -745,9 +745,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned CCP3IE:1;
@@ -761,9 +761,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned CCP3IF:1;
@@ -777,9 +777,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned CCP3IP:1;
@@ -793,9 +793,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -809,13 +809,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 EEADRH;
-extern __sfr __at 0xfab RCSTA1;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) EEADRH;
+extern __sfr __at (0xfab) RCSTA1;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -829,9 +829,9 @@ typedef union {
        };
 } __RCSTA1bits_t;
 
-extern volatile __RCSTA1bits_t __at 0xfab RCSTA1bits;
+extern volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-extern __sfr __at 0xfac TXSTA1;
+extern __sfr __at (0xfac) TXSTA1;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -845,12 +845,12 @@ typedef union {
        };
 } __TXSTA1bits_t;
 
-extern volatile __TXSTA1bits_t __at 0xfac TXSTA1bits;
+extern volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-extern __sfr __at 0xfad TXREG1;
-extern __sfr __at 0xfae RCREG1;
-extern __sfr __at 0xfaf SPBRG1;
-extern __sfr __at 0xfb0 PSPCON;
+extern __sfr __at (0xfad) TXREG1;
+extern __sfr __at (0xfae) RCREG1;
+extern __sfr __at (0xfaf) SPBRG1;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -864,9 +864,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -880,11 +880,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -898,9 +898,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -914,9 +914,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb7 CCP3CON;
+extern __sfr __at (0xfb7) CCP3CON;
 typedef union {
        struct {
                unsigned CCP3M0:1;
@@ -930,11 +930,11 @@ typedef union {
        };
 } __CCP3CONbits_t;
 
-extern volatile __CCP3CONbits_t __at 0xfb7 CCP3CONbits;
+extern volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
 
-extern __sfr __at 0xfb8 CCPR3L;
-extern __sfr __at 0xfb9 CCPR3H;
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfb8) CCPR3L;
+extern __sfr __at (0xfb9) CCPR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -948,11 +948,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -966,11 +966,11 @@ typedef union {
        };
 } __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;
@@ -984,9 +984,9 @@ typedef union {
        };
 } __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;
@@ -1000,9 +1000,9 @@ typedef union {
        };
 } __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;
@@ -1016,11 +1016,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -1034,9 +1034,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -1050,9 +1050,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -1066,11 +1066,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -1084,11 +1084,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;
@@ -1102,11 +1102,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;
@@ -1120,9 +1120,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;
@@ -1147,9 +1147,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;
@@ -1174,9 +1174,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;
@@ -1190,12 +1190,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1209,32 +1209,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;
@@ -1259,9 +1259,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;
@@ -1275,9 +1275,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;
@@ -1291,18 +1291,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -1316,11 +1316,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 */

diff --git a/device/include/pic16/pic18f8620.h b/device/include/pic16/pic18f8620.h
index 5da917c803521e317d7acbedfc5a8e2c1e4dd8ee..a2d2211b0bf66e963fb511568b18e1c9e42c2663 100644 (file)
--- a/device/include/pic16/pic18f8620.h
+++ b/device/include/pic16/pic18f8620.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F8620_H__
 #define __PIC18F8620_H__
 
-extern __sfr __at 0xf6b RCSTA2;
+extern __sfr __at (0xf6b) RCSTA2;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RCSTA2bits_t;
 
-extern volatile __RCSTA2bits_t __at 0xf6b RCSTA2bits;
+extern volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-extern __sfr __at 0xf6c TXSTA2;
+extern __sfr __at (0xf6c) TXSTA2;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -45,12 +45,12 @@ typedef union {
        };
 } __TXSTA2bits_t;
 
-extern volatile __TXSTA2bits_t __at 0xf6c TXSTA2bits;
+extern volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-extern __sfr __at 0xf6d TXREG2;
-extern __sfr __at 0xf6e RCREG2;
-extern __sfr __at 0xf6f SPBRG2;
-extern __sfr __at 0xf70 CCP5CON;
+extern __sfr __at (0xf6d) TXREG2;
+extern __sfr __at (0xf6e) RCREG2;
+extern __sfr __at (0xf6f) SPBRG2;
+extern __sfr __at (0xf70) CCP5CON;
 typedef union {
        struct {
                unsigned CCP5M0:1;
@@ -64,11 +64,11 @@ typedef union {
        };
 } __CCP5CONbits_t;
 
-extern volatile __CCP5CONbits_t __at 0xf70 CCP5CONbits;
+extern volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-extern __sfr __at 0xf71 CCPR5L;
-extern __sfr __at 0xf72 CCPR5H;
-extern __sfr __at 0xf73 CCP4CON;
+extern __sfr __at (0xf71) CCPR5L;
+extern __sfr __at (0xf72) CCPR5H;
+extern __sfr __at (0xf73) CCP4CON;
 typedef union {
        struct {
                unsigned CCP4M0:1;
@@ -82,11 +82,11 @@ typedef union {
        };
 } __CCP4CONbits_t;
 
-extern volatile __CCP4CONbits_t __at 0xf73 CCP4CONbits;
+extern volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-extern __sfr __at 0xf74 CCPR4L;
-extern __sfr __at 0xf75 CCPR4H;
-extern __sfr __at 0xf76 T4CON;
+extern __sfr __at (0xf74) CCPR4L;
+extern __sfr __at (0xf75) CCPR4H;
+extern __sfr __at (0xf76) T4CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -100,11 +100,11 @@ typedef union {
        };
 } __T4CONbits_t;
 
-extern volatile __T4CONbits_t __at 0xf76 T4CONbits;
+extern volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-extern __sfr __at 0xf77 PR4;
-extern __sfr __at 0xf78 TMR4;
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf77) PR4;
+extern __sfr __at (0xf78) TMR4;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -151,9 +151,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;
@@ -178,9 +178,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -216,9 +216,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -243,9 +243,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -281,9 +281,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf85 PORTF;
+extern __sfr __at (0xf85) PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -297,9 +297,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-extern __sfr __at 0xf86 PORTG;
+extern __sfr __at (0xf86) PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -313,9 +313,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-extern __sfr __at 0xf87 PORTH;
+extern __sfr __at (0xf87) PORTH;
 typedef union {
        struct {
                unsigned RH0:1;
@@ -329,9 +329,9 @@ typedef union {
        };
 } __PORTHbits_t;
 
-extern volatile __PORTHbits_t __at 0xf87 PORTHbits;
+extern volatile __PORTHbits_t __at (0xf87) PORTHbits;
 
-extern __sfr __at 0xf88 PORTJ;
+extern __sfr __at (0xf88) PORTJ;
 typedef union {
        struct {
                unsigned RJ0:1;
@@ -345,9 +345,9 @@ typedef union {
        };
 } __PORTJbits_t;
 
-extern volatile __PORTJbits_t __at 0xf88 PORTJbits;
+extern volatile __PORTJbits_t __at (0xf88) PORTJbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -361,9 +361,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;
@@ -377,9 +377,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -393,9 +393,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -409,9 +409,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -425,9 +425,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf8e LATF;
+extern __sfr __at (0xf8e) LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -441,9 +441,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t __at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-extern __sfr __at 0xf8f LATG;
+extern __sfr __at (0xf8f) LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -457,9 +457,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t __at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-extern __sfr __at 0xf90 LATH;
+extern __sfr __at (0xf90) LATH;
 typedef union {
        struct {
                unsigned LATH0:1;
@@ -473,9 +473,9 @@ typedef union {
        };
 } __LATHbits_t;
 
-extern volatile __LATHbits_t __at 0xf90 LATHbits;
+extern volatile __LATHbits_t __at (0xf90) LATHbits;
 
-extern __sfr __at 0xf91 LATJ;
+extern __sfr __at (0xf91) LATJ;
 typedef union {
        struct {
                unsigned LATJ0:1;
@@ -489,9 +489,9 @@ typedef union {
        };
 } __LATJbits_t;
 
-extern volatile __LATJbits_t __at 0xf91 LATJbits;
+extern volatile __LATJbits_t __at (0xf91) LATJbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -505,9 +505,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;
@@ -521,9 +521,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -537,9 +537,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -553,9 +553,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -569,9 +569,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf97 TRISF;
+extern __sfr __at (0xf97) TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -585,9 +585,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-extern __sfr __at 0xf98 TRISG;
+extern __sfr __at (0xf98) TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -601,9 +601,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-extern __sfr __at 0xf99 TRISH;
+extern __sfr __at (0xf99) TRISH;
 typedef union {
        struct {
                unsigned TRISH0:1;
@@ -617,9 +617,9 @@ typedef union {
        };
 } __TRISHbits_t;
 
-extern volatile __TRISHbits_t __at 0xf99 TRISHbits;
+extern volatile __TRISHbits_t __at (0xf99) TRISHbits;
 
-extern __sfr __at 0xf9a TRISJ;
+extern __sfr __at (0xf9a) TRISJ;
 typedef union {
        struct {
                unsigned TRISJ0:1;
@@ -633,9 +633,9 @@ typedef union {
        };
 } __TRISJbits_t;
 
-extern volatile __TRISJbits_t __at 0xf9a TRISJbits;
+extern volatile __TRISJbits_t __at (0xf9a) TRISJbits;
 
-extern __sfr __at 0xf9c MEMCON;
+extern __sfr __at (0xf9c) MEMCON;
 typedef union {
        struct {
                unsigned WM0:1;
@@ -649,9 +649,9 @@ typedef union {
        };
 } __MEMCONbits_t;
 
-extern volatile __MEMCONbits_t __at 0xf9c MEMCONbits;
+extern volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -665,9 +665,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;
@@ -681,9 +681,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;
@@ -697,9 +697,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 CCP2IE:1;
@@ -713,9 +713,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 CCP2IF:1;
@@ -729,9 +729,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 CCP2IP:1;
@@ -745,9 +745,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned CCP3IE:1;
@@ -761,9 +761,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned CCP3IF:1;
@@ -777,9 +777,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned CCP3IP:1;
@@ -793,9 +793,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -809,13 +809,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 EEADRH;
-extern __sfr __at 0xfab RCSTA1;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) EEADRH;
+extern __sfr __at (0xfab) RCSTA1;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -829,9 +829,9 @@ typedef union {
        };
 } __RCSTA1bits_t;
 
-extern volatile __RCSTA1bits_t __at 0xfab RCSTA1bits;
+extern volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-extern __sfr __at 0xfac TXSTA1;
+extern __sfr __at (0xfac) TXSTA1;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -845,12 +845,12 @@ typedef union {
        };
 } __TXSTA1bits_t;
 
-extern volatile __TXSTA1bits_t __at 0xfac TXSTA1bits;
+extern volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-extern __sfr __at 0xfad TXREG1;
-extern __sfr __at 0xfae RCREG1;
-extern __sfr __at 0xfaf SPBRG1;
-extern __sfr __at 0xfb0 PSPCON;
+extern __sfr __at (0xfad) TXREG1;
+extern __sfr __at (0xfae) RCREG1;
+extern __sfr __at (0xfaf) SPBRG1;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -864,9 +864,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -880,11 +880,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -898,9 +898,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -914,9 +914,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb7 CCP3CON;
+extern __sfr __at (0xfb7) CCP3CON;
 typedef union {
        struct {
                unsigned CCP3M0:1;
@@ -930,11 +930,11 @@ typedef union {
        };
 } __CCP3CONbits_t;
 
-extern volatile __CCP3CONbits_t __at 0xfb7 CCP3CONbits;
+extern volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
 
-extern __sfr __at 0xfb8 CCPR3L;
-extern __sfr __at 0xfb9 CCPR3H;
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfb8) CCPR3L;
+extern __sfr __at (0xfb9) CCPR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -948,11 +948,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -966,11 +966,11 @@ typedef union {
        };
 } __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;
@@ -984,9 +984,9 @@ typedef union {
        };
 } __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;
@@ -1000,9 +1000,9 @@ typedef union {
        };
 } __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;
@@ -1016,11 +1016,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -1034,9 +1034,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -1050,9 +1050,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -1066,11 +1066,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -1084,11 +1084,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;
@@ -1102,11 +1102,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;
@@ -1120,9 +1120,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;
@@ -1147,9 +1147,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;
@@ -1174,9 +1174,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;
@@ -1190,12 +1190,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1209,32 +1209,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;
@@ -1259,9 +1259,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;
@@ -1275,9 +1275,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;
@@ -1291,18 +1291,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -1316,11 +1316,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 */

diff --git a/device/include/pic16/pic18f8680.h b/device/include/pic16/pic18f8680.h
index a3ef85a8389f24093a127c33680b2bc1387b906c..e88a216dbd20aa624003e92634b95cdd2ea5b114 100644 (file)
--- a/device/include/pic16/pic18f8680.h
+++ b/device/include/pic16/pic18f8680.h
@@ -15,8 +15,8 @@
 #ifndef __PIC18F8680_H__
 #define __PIC18F8680_H__
 
-extern __sfr __at 0xf00 RXF0SIDH;
-extern __sfr __at 0xf01 RXF0SIDL;
+extern __sfr __at (0xf00) RXF0SIDH;
+extern __sfr __at (0xf01) RXF0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -30,12 +30,12 @@ typedef union {
        };
 } __RXF0SIDLbits_t;
 
-extern volatile __RXF0SIDLbits_t __at 0xf01 RXF0SIDLbits;
+extern volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-extern __sfr __at 0xf02 RXF0EIDH;
-extern __sfr __at 0xf03 RXF0EIDL;
-extern __sfr __at 0xf04 RXF1SIDH;
-extern __sfr __at 0xf05 RXF1SIDL;
+extern __sfr __at (0xf02) RXF0EIDH;
+extern __sfr __at (0xf03) RXF0EIDL;
+extern __sfr __at (0xf04) RXF1SIDH;
+extern __sfr __at (0xf05) RXF1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -49,14 +49,14 @@ typedef union {
        };
 } __RXF1SIDLbits_t;
 
-extern volatile __RXF1SIDLbits_t __at 0xf05 RXF1SIDLbits;
+extern volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-extern __sfr __at 0xf06 RXF1EIDH;
-extern __sfr __at 0xf07 RXF1EIDL;
-extern __sfr __at 0xf08 RXF2SIDH;
-extern __sfr __at 0xf09 RXF2SIDL;
-extern __sfr __at 0xf0a RXF2EIDH;
-extern __sfr __at 0xf0b RXF2EIDL;
+extern __sfr __at (0xf06) RXF1EIDH;
+extern __sfr __at (0xf07) RXF1EIDL;
+extern __sfr __at (0xf08) RXF2SIDH;
+extern __sfr __at (0xf09) RXF2SIDL;
+extern __sfr __at (0xf0a) RXF2EIDH;
+extern __sfr __at (0xf0b) RXF2EIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -70,10 +70,10 @@ typedef union {
        };
 } __RXF2EIDLbits_t;
 
-extern volatile __RXF2EIDLbits_t __at 0xf0b RXF2EIDLbits;
+extern volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-extern __sfr __at 0xf0c RXF3SIDH;
-extern __sfr __at 0xf0d RXF3SIDL;
+extern __sfr __at (0xf0c) RXF3SIDH;
+extern __sfr __at (0xf0d) RXF3SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -87,12 +87,12 @@ typedef union {
        };
 } __RXF3SIDLbits_t;
 
-extern volatile __RXF3SIDLbits_t __at 0xf0d RXF3SIDLbits;
+extern volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-extern __sfr __at 0xf0e RXF3EIDH;
-extern __sfr __at 0xf0f RXF3EIDL;
-extern __sfr __at 0xf10 RXF4SIDH;
-extern __sfr __at 0xf11 RXF4SIDL;
+extern __sfr __at (0xf0e) RXF3EIDH;
+extern __sfr __at (0xf0f) RXF3EIDL;
+extern __sfr __at (0xf10) RXF4SIDH;
+extern __sfr __at (0xf11) RXF4SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -106,12 +106,12 @@ typedef union {
        };
 } __RXF4SIDLbits_t;
 
-extern volatile __RXF4SIDLbits_t __at 0xf11 RXF4SIDLbits;
+extern volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-extern __sfr __at 0xf12 RXF4EIDH;
-extern __sfr __at 0xf13 RXF4EIDL;
-extern __sfr __at 0xf14 RXF5SIDH;
-extern __sfr __at 0xf15 RXF5SIDL;
+extern __sfr __at (0xf12) RXF4EIDH;
+extern __sfr __at (0xf13) RXF4EIDL;
+extern __sfr __at (0xf14) RXF5SIDH;
+extern __sfr __at (0xf15) RXF5SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -125,12 +125,12 @@ typedef union {
        };
 } __RXF5SIDLbits_t;
 
-extern volatile __RXF5SIDLbits_t __at 0xf15 RXF5SIDLbits;
+extern volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-extern __sfr __at 0xf16 RXF5EIDH;
-extern __sfr __at 0xf17 RXF5EIDL;
-extern __sfr __at 0xf18 RXM0SIDH;
-extern __sfr __at 0xf19 RXM0SIDL;
+extern __sfr __at (0xf16) RXF5EIDH;
+extern __sfr __at (0xf17) RXF5EIDL;
+extern __sfr __at (0xf18) RXM0SIDH;
+extern __sfr __at (0xf19) RXM0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -144,12 +144,12 @@ typedef union {
        };
 } __RXM0SIDLbits_t;
 
-extern volatile __RXM0SIDLbits_t __at 0xf19 RXM0SIDLbits;
+extern volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-extern __sfr __at 0xf1a RXM0EIDH;
-extern __sfr __at 0xf1b RXM0EIDL;
-extern __sfr __at 0xf1c RXM1SIDH;
-extern __sfr __at 0xf1d RXM1SIDL;
+extern __sfr __at (0xf1a) RXM0EIDH;
+extern __sfr __at (0xf1b) RXM0EIDL;
+extern __sfr __at (0xf1c) RXM1SIDH;
+extern __sfr __at (0xf1d) RXM1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -163,11 +163,11 @@ typedef union {
        };
 } __RXM1SIDLbits_t;
 
-extern volatile __RXM1SIDLbits_t __at 0xf1d RXM1SIDLbits;
+extern volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-extern __sfr __at 0xf1e RXM1EIDH;
-extern __sfr __at 0xf1f RXM1EIDL;
-extern __sfr __at 0xf20 TXB2CON;
+extern __sfr __at (0xf1e) RXM1EIDH;
+extern __sfr __at (0xf1f) RXM1EIDL;
+extern __sfr __at (0xf20) TXB2CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -181,10 +181,10 @@ typedef union {
        };
 } __TXB2CONbits_t;
 
-extern volatile __TXB2CONbits_t __at 0xf20 TXB2CONbits;
+extern volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-extern __sfr __at 0xf21 TXB2SIDH;
-extern __sfr __at 0xf22 TXB2SIDL;
+extern __sfr __at (0xf21) TXB2SIDH;
+extern __sfr __at (0xf22) TXB2SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -198,11 +198,11 @@ typedef union {
        };
 } __TXB2SIDLbits_t;
 
-extern volatile __TXB2SIDLbits_t __at 0xf22 TXB2SIDLbits;
+extern volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-extern __sfr __at 0xf23 TXB2EIDH;
-extern __sfr __at 0xf24 TXB2EIDL;
-extern __sfr __at 0xf25 TXB2DLC;
+extern __sfr __at (0xf23) TXB2EIDH;
+extern __sfr __at (0xf24) TXB2EIDL;
+extern __sfr __at (0xf25) TXB2DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -216,18 +216,18 @@ typedef union {
        };
 } __TXB2DLCbits_t;
 
-extern volatile __TXB2DLCbits_t __at 0xf25 TXB2DLCbits;
+extern volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-extern __sfr __at 0xf26 TXB2D0;
-extern __sfr __at 0xf27 TXB2D1;
-extern __sfr __at 0xf28 TXB2D2;
-extern __sfr __at 0xf29 TXB2D3;
-extern __sfr __at 0xf2a TXB2D4;
-extern __sfr __at 0xf2b TXB2D5;
-extern __sfr __at 0xf2c TXB2D6;
-extern __sfr __at 0xf2d TXB2D7;
-extern __sfr __at 0xf2e CANSTATRO3;
-extern __sfr __at 0xf30 TXB1CON;
+extern __sfr __at (0xf26) TXB2D0;
+extern __sfr __at (0xf27) TXB2D1;
+extern __sfr __at (0xf28) TXB2D2;
+extern __sfr __at (0xf29) TXB2D3;
+extern __sfr __at (0xf2a) TXB2D4;
+extern __sfr __at (0xf2b) TXB2D5;
+extern __sfr __at (0xf2c) TXB2D6;
+extern __sfr __at (0xf2d) TXB2D7;
+extern __sfr __at (0xf2e) CANSTATRO3;
+extern __sfr __at (0xf30) TXB1CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -241,10 +241,10 @@ typedef union {
        };
 } __TXB1CONbits_t;
 
-extern volatile __TXB1CONbits_t __at 0xf30 TXB1CONbits;
+extern volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-extern __sfr __at 0xf31 TXB1SIDH;
-extern __sfr __at 0xf32 TXB1SIDL;
+extern __sfr __at (0xf31) TXB1SIDH;
+extern __sfr __at (0xf32) TXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -258,11 +258,11 @@ typedef union {
        };
 } __TXB1SIDLbits_t;
 
-extern volatile __TXB1SIDLbits_t __at 0xf32 TXB1SIDLbits;
+extern volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-extern __sfr __at 0xf33 TXB1EIDH;
-extern __sfr __at 0xf34 TXB1EIDL;
-extern __sfr __at 0xf35 TXB1DLC;
+extern __sfr __at (0xf33) TXB1EIDH;
+extern __sfr __at (0xf34) TXB1EIDL;
+extern __sfr __at (0xf35) TXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -276,18 +276,18 @@ typedef union {
        };
 } __TXB1DLCbits_t;
 
-extern volatile __TXB1DLCbits_t __at 0xf35 TXB1DLCbits;
+extern volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-extern __sfr __at 0xf36 TXB1D0;
-extern __sfr __at 0xf37 TXB1D1;
-extern __sfr __at 0xf38 TXB1D2;
-extern __sfr __at 0xf39 TXB1D3;
-extern __sfr __at 0xf3a TXB1D4;
-extern __sfr __at 0xf3b TXB1D5;
-extern __sfr __at 0xf3c TXB1D6;
-extern __sfr __at 0xf3d TXB1D7;
-extern __sfr __at 0xf3e CANSTATRO2;
-extern __sfr __at 0xf40 TXB0CON;
+extern __sfr __at (0xf36) TXB1D0;
+extern __sfr __at (0xf37) TXB1D1;
+extern __sfr __at (0xf38) TXB1D2;
+extern __sfr __at (0xf39) TXB1D3;
+extern __sfr __at (0xf3a) TXB1D4;
+extern __sfr __at (0xf3b) TXB1D5;
+extern __sfr __at (0xf3c) TXB1D6;
+extern __sfr __at (0xf3d) TXB1D7;
+extern __sfr __at (0xf3e) CANSTATRO2;
+extern __sfr __at (0xf40) TXB0CON;
 typedef union {
        struct {
                unsigned TXPRI0:1;
@@ -301,13 +301,13 @@ typedef union {
        };
 } __TXB0CONbits_t;
 
-extern volatile __TXB0CONbits_t __at 0xf40 TXB0CONbits;
+extern volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-extern __sfr __at 0xf41 TXB0SIDH;
-extern __sfr __at 0xf42 TXB0SIDL;
-extern __sfr __at 0xf43 TXB0EIDH;
-extern __sfr __at 0xf44 TXB0EIDL;
-extern __sfr __at 0xf45 TXB0DLC;
+extern __sfr __at (0xf41) TXB0SIDH;
+extern __sfr __at (0xf42) TXB0SIDL;
+extern __sfr __at (0xf43) TXB0EIDH;
+extern __sfr __at (0xf44) TXB0EIDL;
+extern __sfr __at (0xf45) TXB0DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -321,18 +321,18 @@ typedef union {
        };
 } __TXB0DLCbits_t;
 
-extern volatile __TXB0DLCbits_t __at 0xf45 TXB0DLCbits;
+extern volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-extern __sfr __at 0xf46 TXB0D0;
-extern __sfr __at 0xf47 TXB0D1;
-extern __sfr __at 0xf48 TXB0D2;
-extern __sfr __at 0xf49 TXB0D3;
-extern __sfr __at 0xf4a TXB0D4;
-extern __sfr __at 0xf4b TXB0D5;
-extern __sfr __at 0xf4c TXB0D6;
-extern __sfr __at 0xf4d TXB0D7;
-extern __sfr __at 0xf4e CANSTATRO1;
-extern __sfr __at 0xf50 RXB1CON;
+extern __sfr __at (0xf46) TXB0D0;
+extern __sfr __at (0xf47) TXB0D1;
+extern __sfr __at (0xf48) TXB0D2;
+extern __sfr __at (0xf49) TXB0D3;
+extern __sfr __at (0xf4a) TXB0D4;
+extern __sfr __at (0xf4b) TXB0D5;
+extern __sfr __at (0xf4c) TXB0D6;
+extern __sfr __at (0xf4d) TXB0D7;
+extern __sfr __at (0xf4e) CANSTATRO1;
+extern __sfr __at (0xf50) RXB1CON;
 typedef union {
        struct {
                unsigned :1;
@@ -346,10 +346,10 @@ typedef union {
        };
 } __RXB1CONbits_t;
 
-extern volatile __RXB1CONbits_t __at 0xf50 RXB1CONbits;
+extern volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-extern __sfr __at 0xf51 RXB1SIDH;
-extern __sfr __at 0xf52 RXB1SIDL;
+extern __sfr __at (0xf51) RXB1SIDH;
+extern __sfr __at (0xf52) RXB1SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -363,11 +363,11 @@ typedef union {
        };
 } __RXB1SIDLbits_t;
 
-extern volatile __RXB1SIDLbits_t __at 0xf52 RXB1SIDLbits;
+extern volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-extern __sfr __at 0xf53 RXB1EIDH;
-extern __sfr __at 0xf54 RXB1EIDL;
-extern __sfr __at 0xf55 RXB1DLC;
+extern __sfr __at (0xf53) RXB1EIDH;
+extern __sfr __at (0xf54) RXB1EIDL;
+extern __sfr __at (0xf55) RXB1DLC;
 typedef union {
        struct {
                unsigned DLC0:1;
@@ -381,18 +381,18 @@ typedef union {
        };
 } __RXB1DLCbits_t;
 
-extern volatile __RXB1DLCbits_t __at 0xf55 RXB1DLCbits;
+extern volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-extern __sfr __at 0xf56 RXB1D0;
-extern __sfr __at 0xf57 RXB1D1;
-extern __sfr __at 0xf58 RXB1D2;
-extern __sfr __at 0xf59 RXB1D3;
-extern __sfr __at 0xf5a RXB1D4;
-extern __sfr __at 0xf5b RXB1D5;
-extern __sfr __at 0xf5c RXB1D6;
-extern __sfr __at 0xf5d RXB1D7;
-extern __sfr __at 0xf5e CANSTATRO0;
-extern __sfr __at 0xf60 RXB0CON;
+extern __sfr __at (0xf56) RXB1D0;
+extern __sfr __at (0xf57) RXB1D1;
+extern __sfr __at (0xf58) RXB1D2;
+extern __sfr __at (0xf59) RXB1D3;
+extern __sfr __at (0xf5a) RXB1D4;
+extern __sfr __at (0xf5b) RXB1D5;
+extern __sfr __at (0xf5c) RXB1D6;
+extern __sfr __at (0xf5d) RXB1D7;
+extern __sfr __at (0xf5e) CANSTATRO0;
+extern __sfr __at (0xf60) RXB0CON;
 typedef union {
        struct {
                unsigned FILHIT0:1;
@@ -406,10 +406,10 @@ typedef union {
        };
 } __RXB0CONbits_t;
 
-extern volatile __RXB0CONbits_t __at 0xf60 RXB0CONbits;
+extern volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-extern __sfr __at 0xf61 RXB0SIDH;
-extern __sfr __at 0xf62 RXB0SIDL;
+extern __sfr __at (0xf61) RXB0SIDH;
+extern __sfr __at (0xf62) RXB0SIDL;
 typedef union {
        struct {
                unsigned EID16:1;
@@ -423,20 +423,20 @@ typedef union {
        };
 } __RXB0SIDLbits_t;
 
-extern volatile __RXB0SIDLbits_t __at 0xf62 RXB0SIDLbits;
+extern volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-extern __sfr __at 0xf63 RXB0EIDH;
-extern __sfr __at 0xf64 RXB0EIDL;
-extern __sfr __at 0xf65 RXB0DLC;
-extern __sfr __at 0xf66 RXB0D0;
-extern __sfr __at 0xf67 RXB0D1;
-extern __sfr __at 0xf68 RXB0D2;
-extern __sfr __at 0xf69 RXB0D3;
-extern __sfr __at 0xf6a RXB0D4;
-extern __sfr __at 0xf6b RXB0D5;
-extern __sfr __at 0xf6c RXB0D6;
-extern __sfr __at 0xf6d RXB0D7;
-extern __sfr __at 0xf6e CANSTAT;
+extern __sfr __at (0xf63) RXB0EIDH;
+extern __sfr __at (0xf64) RXB0EIDL;
+extern __sfr __at (0xf65) RXB0DLC;
+extern __sfr __at (0xf66) RXB0D0;
+extern __sfr __at (0xf67) RXB0D1;
+extern __sfr __at (0xf68) RXB0D2;
+extern __sfr __at (0xf69) RXB0D3;
+extern __sfr __at (0xf6a) RXB0D4;
+extern __sfr __at (0xf6b) RXB0D5;
+extern __sfr __at (0xf6c) RXB0D6;
+extern __sfr __at (0xf6d) RXB0D7;
+extern __sfr __at (0xf6e) CANSTAT;
 typedef union {
        struct {
                unsigned :1;
@@ -450,9 +450,9 @@ typedef union {
        };
 } __CANSTATbits_t;
 
-extern volatile __CANSTATbits_t __at 0xf6e CANSTATbits;
+extern volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-extern __sfr __at 0xf6f CANCON;
+extern __sfr __at (0xf6f) CANCON;
 typedef union {
        struct {
                unsigned :1;
@@ -466,9 +466,9 @@ typedef union {
        };
 } __CANCONbits_t;
 
-extern volatile __CANCONbits_t __at 0xf6f CANCONbits;
+extern volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-extern __sfr __at 0xf70 BRGCON1;
+extern __sfr __at (0xf70) BRGCON1;
 typedef union {
        struct {
                unsigned BRP0:1;
@@ -482,9 +482,9 @@ typedef union {
        };
 } __BRGCON1bits_t;
 
-extern volatile __BRGCON1bits_t __at 0xf70 BRGCON1bits;
+extern volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-extern __sfr __at 0xf71 BRGCON2;
+extern __sfr __at (0xf71) BRGCON2;
 typedef union {
        struct {
                unsigned PRSEG0:1;
@@ -498,9 +498,9 @@ typedef union {
        };
 } __BRGCON2bits_t;
 
-extern volatile __BRGCON2bits_t __at 0xf71 BRGCON2bits;
+extern volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-extern __sfr __at 0xf72 BRGCON3;
+extern __sfr __at (0xf72) BRGCON3;
 typedef union {
        struct {
                unsigned SEG2PH0:1;
@@ -514,9 +514,9 @@ typedef union {
        };
 } __BRGCON3bits_t;
 
-extern volatile __BRGCON3bits_t __at 0xf72 BRGCON3bits;
+extern volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-extern __sfr __at 0xf73 CIOCON;
+extern __sfr __at (0xf73) CIOCON;
 typedef union {
        struct {
                unsigned :1;
@@ -530,9 +530,9 @@ typedef union {
        };
 } __CIOCONbits_t;
 
-extern volatile __CIOCONbits_t __at 0xf73 CIOCONbits;
+extern volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-extern __sfr __at 0xf74 COMSTAT;
+extern __sfr __at (0xf74) COMSTAT;
 typedef union {
        struct {
                unsigned EWARN:1;
@@ -546,9 +546,9 @@ typedef union {
        };
 } __COMSTATbits_t;
 
-extern volatile __COMSTATbits_t __at 0xf74 COMSTATbits;
+extern volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-extern __sfr __at 0xf75 RXERRCNT;
+extern __sfr __at (0xf75) RXERRCNT;
 typedef union {
        struct {
                unsigned REC0:1;
@@ -562,9 +562,9 @@ typedef union {
        };
 } __RXERRCNTbits_t;
 
-extern volatile __RXERRCNTbits_t __at 0xf75 RXERRCNTbits;
+extern volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-extern __sfr __at 0xf76 TXERRCNT;
+extern __sfr __at (0xf76) TXERRCNT;
 typedef union {
        struct {
                unsigned TEC0:1;
@@ -578,9 +578,9 @@ typedef union {
        };
 } __TXERRCNTbits_t;
 
-extern volatile __TXERRCNTbits_t __at 0xf76 TXERRCNTbits;
+extern volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -627,9 +627,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;
@@ -654,9 +654,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -692,9 +692,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -719,9 +719,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -757,9 +757,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf85 PORTF;
+extern __sfr __at (0xf85) PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -773,9 +773,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-extern __sfr __at 0xf86 PORTG;
+extern __sfr __at (0xf86) PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -789,9 +789,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-extern __sfr __at 0xf87 PORTH;
+extern __sfr __at (0xf87) PORTH;
 typedef union {
        struct {
                unsigned RH0:1;
@@ -805,9 +805,9 @@ typedef union {
        };
 } __PORTHbits_t;
 
-extern volatile __PORTHbits_t __at 0xf87 PORTHbits;
+extern volatile __PORTHbits_t __at (0xf87) PORTHbits;
 
-extern __sfr __at 0xf88 PORTJ;
+extern __sfr __at (0xf88) PORTJ;
 typedef union {
        struct {
                unsigned RJ0:1;
@@ -821,9 +821,9 @@ typedef union {
        };
 } __PORTJbits_t;
 
-extern volatile __PORTJbits_t __at 0xf88 PORTJbits;
+extern volatile __PORTJbits_t __at (0xf88) PORTJbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -837,9 +837,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;
@@ -853,9 +853,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -869,9 +869,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -885,9 +885,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -901,9 +901,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf8e LATF;
+extern __sfr __at (0xf8e) LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -917,9 +917,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t __at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-extern __sfr __at 0xf8f LATG;
+extern __sfr __at (0xf8f) LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -933,9 +933,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t __at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-extern __sfr __at 0xf90 LATH;
+extern __sfr __at (0xf90) LATH;
 typedef union {
        struct {
                unsigned LATH0:1;
@@ -949,9 +949,9 @@ typedef union {
        };
 } __LATHbits_t;
 
-extern volatile __LATHbits_t __at 0xf90 LATHbits;
+extern volatile __LATHbits_t __at (0xf90) LATHbits;
 
-extern __sfr __at 0xf91 LATJ;
+extern __sfr __at (0xf91) LATJ;
 typedef union {
        struct {
                unsigned LATJ0:1;
@@ -965,9 +965,9 @@ typedef union {
        };
 } __LATJbits_t;
 
-extern volatile __LATJbits_t __at 0xf91 LATJbits;
+extern volatile __LATJbits_t __at (0xf91) LATJbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -981,9 +981,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;
@@ -997,9 +997,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -1013,9 +1013,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -1029,9 +1029,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -1045,9 +1045,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf97 TRISF;
+extern __sfr __at (0xf97) TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -1061,9 +1061,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-extern __sfr __at 0xf98 TRISG;
+extern __sfr __at (0xf98) TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -1077,9 +1077,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-extern __sfr __at 0xf99 TRISH;
+extern __sfr __at (0xf99) TRISH;
 typedef union {
        struct {
                unsigned TRISH0:1;
@@ -1093,9 +1093,9 @@ typedef union {
        };
 } __TRISHbits_t;
 
-extern volatile __TRISHbits_t __at 0xf99 TRISHbits;
+extern volatile __TRISHbits_t __at (0xf99) TRISHbits;
 
-extern __sfr __at 0xf9a TRISJ;
+extern __sfr __at (0xf9a) TRISJ;
 typedef union {
        struct {
                unsigned TRISJ0:1;
@@ -1109,9 +1109,9 @@ typedef union {
        };
 } __TRISJbits_t;
 
-extern volatile __TRISJbits_t __at 0xf9a TRISJbits;
+extern volatile __TRISJbits_t __at (0xf9a) TRISJbits;
 
-extern __sfr __at 0xf9c MEMCON;
+extern __sfr __at (0xf9c) MEMCON;
 typedef union {
        struct {
                unsigned WM0:1;
@@ -1125,9 +1125,9 @@ typedef union {
        };
 } __MEMCONbits_t;
 
-extern volatile __MEMCONbits_t __at 0xf9c MEMCONbits;
+extern volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -1141,9 +1141,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;
@@ -1157,9 +1157,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;
@@ -1173,9 +1173,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 CCP2IE:1;
@@ -1189,9 +1189,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 CCP2IF:1;
@@ -1205,9 +1205,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 CCP2IP:1;
@@ -1221,9 +1221,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned RX0IE:1;
@@ -1237,9 +1237,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned RX0IF:1;
@@ -1253,9 +1253,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned RX0IP:1;
@@ -1269,9 +1269,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -1285,13 +1285,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 EEADRH;
-extern __sfr __at 0xfab RCSTA;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) EEADRH;
+extern __sfr __at (0xfab) RCSTA;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -1305,9 +1305,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;
@@ -1321,12 +1321,12 @@ 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 PSPCON;
+extern __sfr __at (0xfad) TXREG;
+extern __sfr __at (0xfae) RCREG;
+extern __sfr __at (0xfaf) SPBRG;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -1340,9 +1340,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -1356,11 +1356,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -1374,9 +1374,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -1390,9 +1390,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb6 ECCPAS;
+extern __sfr __at (0xfb6) ECCPAS;
 typedef union {
        struct {
                unsigned PSSBD0:1;
@@ -1406,9 +1406,9 @@ typedef union {
        };
 } __ECCPASbits_t;
 
-extern volatile __ECCPASbits_t __at 0xfb6 ECCPASbits;
+extern volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
 
-extern __sfr __at 0xfb7 ECCP1DEL;
+extern __sfr __at (0xfb7) ECCP1DEL;
 typedef union {
        struct {
                unsigned EPDC0:1;
@@ -1422,9 +1422,9 @@ typedef union {
        };
 } __ECCP1DELbits_t;
 
-extern volatile __ECCP1DELbits_t __at 0xfb7 ECCP1DELbits;
+extern volatile __ECCP1DELbits_t __at (0xfb7) ECCP1DELbits;
 
-extern __sfr __at 0xfba ECCP1CON;
+extern __sfr __at (0xfba) ECCP1CON;
 typedef union {
        struct {
                unsigned ECCP1M0:1;
@@ -1438,9 +1438,9 @@ typedef union {
        };
 } __ECCP1CONbits_t;
 
-extern volatile __ECCP1CONbits_t __at 0xfba ECCP1CONbits;
+extern volatile __ECCP1CONbits_t __at (0xfba) ECCP1CONbits;
 
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -1454,13 +1454,13 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb ECCPR1L;
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc ECCPR1H;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfc0 ADCON2;
+extern __sfr __at (0xfbb) ECCPR1L;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) ECCPR1H;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfc0) ADCON2;
 typedef union {
        struct {
                unsigned ADCS0:1;
@@ -1474,9 +1474,9 @@ typedef union {
        };
 } __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;
@@ -1490,9 +1490,9 @@ typedef union {
        };
 } __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;
@@ -1506,11 +1506,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -1524,9 +1524,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -1540,9 +1540,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -1556,11 +1556,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -1574,11 +1574,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;
@@ -1592,11 +1592,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;
@@ -1610,9 +1610,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;
@@ -1637,9 +1637,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;
@@ -1664,9 +1664,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;
@@ -1680,12 +1680,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1699,32 +1699,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;
@@ -1749,9 +1749,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;
@@ -1765,9 +1765,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;
@@ -1781,18 +1781,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -1806,11 +1806,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 */

diff --git a/device/include/pic16/pic18f8720.h b/device/include/pic16/pic18f8720.h
index 91cbf38e2931407b1f273ac88da9b20d24995467..d2c0e5c3a901b185336618d320bb1329ab7d0a5e 100644 (file)
--- a/device/include/pic16/pic18f8720.h
+++ b/device/include/pic16/pic18f8720.h
@@ -15,7 +15,7 @@
 #ifndef __PIC18F8720_H__
 #define __PIC18F8720_H__
 
-extern __sfr __at 0xf6b RCSTA2;
+extern __sfr __at (0xf6b) RCSTA2;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -29,9 +29,9 @@ typedef union {
        };
 } __RCSTA2bits_t;
 
-extern volatile __RCSTA2bits_t __at 0xf6b RCSTA2bits;
+extern volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-extern __sfr __at 0xf6c TXSTA2;
+extern __sfr __at (0xf6c) TXSTA2;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -45,12 +45,12 @@ typedef union {
        };
 } __TXSTA2bits_t;
 
-extern volatile __TXSTA2bits_t __at 0xf6c TXSTA2bits;
+extern volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-extern __sfr __at 0xf6d TXREG2;
-extern __sfr __at 0xf6e RCREG2;
-extern __sfr __at 0xf6f SPBRG2;
-extern __sfr __at 0xf70 CCP5CON;
+extern __sfr __at (0xf6d) TXREG2;
+extern __sfr __at (0xf6e) RCREG2;
+extern __sfr __at (0xf6f) SPBRG2;
+extern __sfr __at (0xf70) CCP5CON;
 typedef union {
        struct {
                unsigned CCP5M0:1;
@@ -64,11 +64,11 @@ typedef union {
        };
 } __CCP5CONbits_t;
 
-extern volatile __CCP5CONbits_t __at 0xf70 CCP5CONbits;
+extern volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-extern __sfr __at 0xf71 CCPR5L;
-extern __sfr __at 0xf72 CCPR5H;
-extern __sfr __at 0xf73 CCP4CON;
+extern __sfr __at (0xf71) CCPR5L;
+extern __sfr __at (0xf72) CCPR5H;
+extern __sfr __at (0xf73) CCP4CON;
 typedef union {
        struct {
                unsigned CCP4M0:1;
@@ -82,11 +82,11 @@ typedef union {
        };
 } __CCP4CONbits_t;
 
-extern volatile __CCP4CONbits_t __at 0xf73 CCP4CONbits;
+extern volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-extern __sfr __at 0xf74 CCPR4L;
-extern __sfr __at 0xf75 CCPR4H;
-extern __sfr __at 0xf76 T4CON;
+extern __sfr __at (0xf74) CCPR4L;
+extern __sfr __at (0xf75) CCPR4H;
+extern __sfr __at (0xf76) T4CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -100,11 +100,11 @@ typedef union {
        };
 } __T4CONbits_t;
 
-extern volatile __T4CONbits_t __at 0xf76 T4CONbits;
+extern volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-extern __sfr __at 0xf77 PR4;
-extern __sfr __at 0xf78 TMR4;
-extern __sfr __at 0xf80 PORTA;
+extern __sfr __at (0xf77) PR4;
+extern __sfr __at (0xf78) TMR4;
+extern __sfr __at (0xf80) PORTA;
 typedef union {
        struct {
                unsigned RA0:1;
@@ -151,9 +151,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;
@@ -178,9 +178,9 @@ typedef union {
        };
 } __PORTBbits_t;
 
-extern volatile __PORTBbits_t __at 0xf81 PORTBbits;
+extern volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-extern __sfr __at 0xf82 PORTC;
+extern __sfr __at (0xf82) PORTC;
 typedef union {
        struct {
                unsigned RC0:1;
@@ -216,9 +216,9 @@ typedef union {
        };
 } __PORTCbits_t;
 
-extern volatile __PORTCbits_t __at 0xf82 PORTCbits;
+extern volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-extern __sfr __at 0xf83 PORTD;
+extern __sfr __at (0xf83) PORTD;
 typedef union {
        struct {
                unsigned RD0:1;
@@ -243,9 +243,9 @@ typedef union {
        };
 } __PORTDbits_t;
 
-extern volatile __PORTDbits_t __at 0xf83 PORTDbits;
+extern volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-extern __sfr __at 0xf84 PORTE;
+extern __sfr __at (0xf84) PORTE;
 typedef union {
        struct {
                unsigned RE0:1;
@@ -281,9 +281,9 @@ typedef union {
        };
 } __PORTEbits_t;
 
-extern volatile __PORTEbits_t __at 0xf84 PORTEbits;
+extern volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-extern __sfr __at 0xf85 PORTF;
+extern __sfr __at (0xf85) PORTF;
 typedef union {
        struct {
                unsigned RF0:1;
@@ -297,9 +297,9 @@ typedef union {
        };
 } __PORTFbits_t;
 
-extern volatile __PORTFbits_t __at 0xf85 PORTFbits;
+extern volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-extern __sfr __at 0xf86 PORTG;
+extern __sfr __at (0xf86) PORTG;
 typedef union {
        struct {
                unsigned RG0:1;
@@ -313,9 +313,9 @@ typedef union {
        };
 } __PORTGbits_t;
 
-extern volatile __PORTGbits_t __at 0xf86 PORTGbits;
+extern volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-extern __sfr __at 0xf87 PORTH;
+extern __sfr __at (0xf87) PORTH;
 typedef union {
        struct {
                unsigned RH0:1;
@@ -329,9 +329,9 @@ typedef union {
        };
 } __PORTHbits_t;
 
-extern volatile __PORTHbits_t __at 0xf87 PORTHbits;
+extern volatile __PORTHbits_t __at (0xf87) PORTHbits;
 
-extern __sfr __at 0xf88 PORTJ;
+extern __sfr __at (0xf88) PORTJ;
 typedef union {
        struct {
                unsigned RJ0:1;
@@ -345,9 +345,9 @@ typedef union {
        };
 } __PORTJbits_t;
 
-extern volatile __PORTJbits_t __at 0xf88 PORTJbits;
+extern volatile __PORTJbits_t __at (0xf88) PORTJbits;
 
-extern __sfr __at 0xf89 LATA;
+extern __sfr __at (0xf89) LATA;
 typedef union {
        struct {
                unsigned LATA0:1;
@@ -361,9 +361,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;
@@ -377,9 +377,9 @@ typedef union {
        };
 } __LATBbits_t;
 
-extern volatile __LATBbits_t __at 0xf8a LATBbits;
+extern volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-extern __sfr __at 0xf8b LATC;
+extern __sfr __at (0xf8b) LATC;
 typedef union {
        struct {
                unsigned LATC0:1;
@@ -393,9 +393,9 @@ typedef union {
        };
 } __LATCbits_t;
 
-extern volatile __LATCbits_t __at 0xf8b LATCbits;
+extern volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-extern __sfr __at 0xf8c LATD;
+extern __sfr __at (0xf8c) LATD;
 typedef union {
        struct {
                unsigned LATD0:1;
@@ -409,9 +409,9 @@ typedef union {
        };
 } __LATDbits_t;
 
-extern volatile __LATDbits_t __at 0xf8c LATDbits;
+extern volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-extern __sfr __at 0xf8d LATE;
+extern __sfr __at (0xf8d) LATE;
 typedef union {
        struct {
                unsigned LATE0:1;
@@ -425,9 +425,9 @@ typedef union {
        };
 } __LATEbits_t;
 
-extern volatile __LATEbits_t __at 0xf8d LATEbits;
+extern volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-extern __sfr __at 0xf8e LATF;
+extern __sfr __at (0xf8e) LATF;
 typedef union {
        struct {
                unsigned LATF0:1;
@@ -441,9 +441,9 @@ typedef union {
        };
 } __LATFbits_t;
 
-extern volatile __LATFbits_t __at 0xf8e LATFbits;
+extern volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-extern __sfr __at 0xf8f LATG;
+extern __sfr __at (0xf8f) LATG;
 typedef union {
        struct {
                unsigned LATG0:1;
@@ -457,9 +457,9 @@ typedef union {
        };
 } __LATGbits_t;
 
-extern volatile __LATGbits_t __at 0xf8f LATGbits;
+extern volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-extern __sfr __at 0xf90 LATH;
+extern __sfr __at (0xf90) LATH;
 typedef union {
        struct {
                unsigned LATH0:1;
@@ -473,9 +473,9 @@ typedef union {
        };
 } __LATHbits_t;
 
-extern volatile __LATHbits_t __at 0xf90 LATHbits;
+extern volatile __LATHbits_t __at (0xf90) LATHbits;
 
-extern __sfr __at 0xf91 LATJ;
+extern __sfr __at (0xf91) LATJ;
 typedef union {
        struct {
                unsigned LATJ0:1;
@@ -489,9 +489,9 @@ typedef union {
        };
 } __LATJbits_t;
 
-extern volatile __LATJbits_t __at 0xf91 LATJbits;
+extern volatile __LATJbits_t __at (0xf91) LATJbits;
 
-extern __sfr __at 0xf92 TRISA;
+extern __sfr __at (0xf92) TRISA;
 typedef union {
        struct {
                unsigned TRISA0:1;
@@ -505,9 +505,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;
@@ -521,9 +521,9 @@ typedef union {
        };
 } __TRISBbits_t;
 
-extern volatile __TRISBbits_t __at 0xf93 TRISBbits;
+extern volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-extern __sfr __at 0xf94 TRISC;
+extern __sfr __at (0xf94) TRISC;
 typedef union {
        struct {
                unsigned TRISC0:1;
@@ -537,9 +537,9 @@ typedef union {
        };
 } __TRISCbits_t;
 
-extern volatile __TRISCbits_t __at 0xf94 TRISCbits;
+extern volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-extern __sfr __at 0xf95 TRISD;
+extern __sfr __at (0xf95) TRISD;
 typedef union {
        struct {
                unsigned TRISD0:1;
@@ -553,9 +553,9 @@ typedef union {
        };
 } __TRISDbits_t;
 
-extern volatile __TRISDbits_t __at 0xf95 TRISDbits;
+extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-extern __sfr __at 0xf96 TRISE;
+extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
                unsigned TRISE0:1;
@@ -569,9 +569,9 @@ typedef union {
        };
 } __TRISEbits_t;
 
-extern volatile __TRISEbits_t __at 0xf96 TRISEbits;
+extern volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-extern __sfr __at 0xf97 TRISF;
+extern __sfr __at (0xf97) TRISF;
 typedef union {
        struct {
                unsigned TRISF0:1;
@@ -585,9 +585,9 @@ typedef union {
        };
 } __TRISFbits_t;
 
-extern volatile __TRISFbits_t __at 0xf97 TRISFbits;
+extern volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-extern __sfr __at 0xf98 TRISG;
+extern __sfr __at (0xf98) TRISG;
 typedef union {
        struct {
                unsigned TRISG0:1;
@@ -601,9 +601,9 @@ typedef union {
        };
 } __TRISGbits_t;
 
-extern volatile __TRISGbits_t __at 0xf98 TRISGbits;
+extern volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-extern __sfr __at 0xf99 TRISH;
+extern __sfr __at (0xf99) TRISH;
 typedef union {
        struct {
                unsigned TRISH0:1;
@@ -617,9 +617,9 @@ typedef union {
        };
 } __TRISHbits_t;
 
-extern volatile __TRISHbits_t __at 0xf99 TRISHbits;
+extern volatile __TRISHbits_t __at (0xf99) TRISHbits;
 
-extern __sfr __at 0xf9a TRISJ;
+extern __sfr __at (0xf9a) TRISJ;
 typedef union {
        struct {
                unsigned TRISJ0:1;
@@ -633,9 +633,9 @@ typedef union {
        };
 } __TRISJbits_t;
 
-extern volatile __TRISJbits_t __at 0xf9a TRISJbits;
+extern volatile __TRISJbits_t __at (0xf9a) TRISJbits;
 
-extern __sfr __at 0xf9c MEMCON;
+extern __sfr __at (0xf9c) MEMCON;
 typedef union {
        struct {
                unsigned WM0:1;
@@ -649,9 +649,9 @@ typedef union {
        };
 } __MEMCONbits_t;
 
-extern volatile __MEMCONbits_t __at 0xf9c MEMCONbits;
+extern volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-extern __sfr __at 0xf9d PIE1;
+extern __sfr __at (0xf9d) PIE1;
 typedef union {
        struct {
                unsigned TMR1IE:1;
@@ -665,9 +665,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;
@@ -681,9 +681,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;
@@ -697,9 +697,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 CCP2IE:1;
@@ -713,9 +713,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 CCP2IF:1;
@@ -729,9 +729,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 CCP2IP:1;
@@ -745,9 +745,9 @@ typedef union {
        };
 } __IPR2bits_t;
 
-extern volatile __IPR2bits_t __at 0xfa2 IPR2bits;
+extern volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-extern __sfr __at 0xfa3 PIE3;
+extern __sfr __at (0xfa3) PIE3;
 typedef union {
        struct {
                unsigned CCP3IE:1;
@@ -761,9 +761,9 @@ typedef union {
        };
 } __PIE3bits_t;
 
-extern volatile __PIE3bits_t __at 0xfa3 PIE3bits;
+extern volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-extern __sfr __at 0xfa4 PIR3;
+extern __sfr __at (0xfa4) PIR3;
 typedef union {
        struct {
                unsigned CCP3IF:1;
@@ -777,9 +777,9 @@ typedef union {
        };
 } __PIR3bits_t;
 
-extern volatile __PIR3bits_t __at 0xfa4 PIR3bits;
+extern volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-extern __sfr __at 0xfa5 IPR3;
+extern __sfr __at (0xfa5) IPR3;
 typedef union {
        struct {
                unsigned CCP3IP:1;
@@ -793,9 +793,9 @@ typedef union {
        };
 } __IPR3bits_t;
 
-extern volatile __IPR3bits_t __at 0xfa5 IPR3bits;
+extern volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-extern __sfr __at 0xfa6 EECON1;
+extern __sfr __at (0xfa6) EECON1;
 typedef union {
        struct {
                unsigned RD:1;
@@ -809,13 +809,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 EEADRH;
-extern __sfr __at 0xfab RCSTA1;
+extern __sfr __at (0xfa7) EECON2;
+extern __sfr __at (0xfa8) EEDATA;
+extern __sfr __at (0xfa9) EEADR;
+extern __sfr __at (0xfaa) EEADRH;
+extern __sfr __at (0xfab) RCSTA1;
 typedef union {
        struct {
                unsigned RX9D:1;
@@ -829,9 +829,9 @@ typedef union {
        };
 } __RCSTA1bits_t;
 
-extern volatile __RCSTA1bits_t __at 0xfab RCSTA1bits;
+extern volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-extern __sfr __at 0xfac TXSTA1;
+extern __sfr __at (0xfac) TXSTA1;
 typedef union {
        struct {
                unsigned TX9D:1;
@@ -845,12 +845,12 @@ typedef union {
        };
 } __TXSTA1bits_t;
 
-extern volatile __TXSTA1bits_t __at 0xfac TXSTA1bits;
+extern volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-extern __sfr __at 0xfad TXREG1;
-extern __sfr __at 0xfae RCREG1;
-extern __sfr __at 0xfaf SPBRG1;
-extern __sfr __at 0xfb0 PSPCON;
+extern __sfr __at (0xfad) TXREG1;
+extern __sfr __at (0xfae) RCREG1;
+extern __sfr __at (0xfaf) SPBRG1;
+extern __sfr __at (0xfb0) PSPCON;
 typedef union {
        struct {
                unsigned :1;
@@ -864,9 +864,9 @@ typedef union {
        };
 } __PSPCONbits_t;
 
-extern volatile __PSPCONbits_t __at 0xfb0 PSPCONbits;
+extern volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-extern __sfr __at 0xfb1 T3CON;
+extern __sfr __at (0xfb1) T3CON;
 typedef union {
        struct {
                unsigned TMR3ON:1;
@@ -880,11 +880,11 @@ 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 0xfb4 CMCON;
+extern __sfr __at (0xfb2) TMR3L;
+extern __sfr __at (0xfb3) TMR3H;
+extern __sfr __at (0xfb4) CMCON;
 typedef union {
        struct {
                unsigned CM0:1;
@@ -898,9 +898,9 @@ typedef union {
        };
 } __CMCONbits_t;
 
-extern volatile __CMCONbits_t __at 0xfb4 CMCONbits;
+extern volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-extern __sfr __at 0xfb5 CVRCON;
+extern __sfr __at (0xfb5) CVRCON;
 typedef union {
        struct {
                unsigned CVR0:1;
@@ -914,9 +914,9 @@ typedef union {
        };
 } __CVRCONbits_t;
 
-extern volatile __CVRCONbits_t __at 0xfb5 CVRCONbits;
+extern volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-extern __sfr __at 0xfb7 CCP3CON;
+extern __sfr __at (0xfb7) CCP3CON;
 typedef union {
        struct {
                unsigned CCP3M0:1;
@@ -930,11 +930,11 @@ typedef union {
        };
 } __CCP3CONbits_t;
 
-extern volatile __CCP3CONbits_t __at 0xfb7 CCP3CONbits;
+extern volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
 
-extern __sfr __at 0xfb8 CCPR3L;
-extern __sfr __at 0xfb9 CCPR3H;
-extern __sfr __at 0xfba CCP2CON;
+extern __sfr __at (0xfb8) CCPR3L;
+extern __sfr __at (0xfb9) CCPR3H;
+extern __sfr __at (0xfba) CCP2CON;
 typedef union {
        struct {
                unsigned CCP2M0:1;
@@ -948,11 +948,11 @@ typedef union {
        };
 } __CCP2CONbits_t;
 
-extern volatile __CCP2CONbits_t __at 0xfba CCP2CONbits;
+extern volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
 
-extern __sfr __at 0xfbb CCPR2L;
-extern __sfr __at 0xfbc CCPR2H;
-extern __sfr __at 0xfbd CCP1CON;
+extern __sfr __at (0xfbb) CCPR2L;
+extern __sfr __at (0xfbc) CCPR2H;
+extern __sfr __at (0xfbd) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0:1;
@@ -966,11 +966,11 @@ typedef union {
        };
 } __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;
@@ -984,9 +984,9 @@ typedef union {
        };
 } __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;
@@ -1000,9 +1000,9 @@ typedef union {
        };
 } __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;
@@ -1016,11 +1016,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 0xfc5 SSPCON2;
+extern __sfr __at (0xfc3) ADRESL;
+extern __sfr __at (0xfc4) ADRESH;
+extern __sfr __at (0xfc5) SSPCON2;
 typedef union {
        struct {
                unsigned SEN:1;
@@ -1034,9 +1034,9 @@ typedef union {
        };
 } __SSPCON2bits_t;
 
-extern volatile __SSPCON2bits_t __at 0xfc5 SSPCON2bits;
+extern volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
 
-extern __sfr __at 0xfc6 SSPCON1;
+extern __sfr __at (0xfc6) SSPCON1;
 typedef union {
        struct {
                unsigned SSPM0:1;
@@ -1050,9 +1050,9 @@ typedef union {
        };
 } __SSPCON1bits_t;
 
-extern volatile __SSPCON1bits_t __at 0xfc6 SSPCON1bits;
+extern volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
 
-extern __sfr __at 0xfc7 SSPSTAT;
+extern __sfr __at (0xfc7) SSPSTAT;
 typedef union {
        struct {
                unsigned BF:1;
@@ -1066,11 +1066,11 @@ typedef union {
        };
 } __SSPSTATbits_t;
 
-extern volatile __SSPSTATbits_t __at 0xfc7 SSPSTATbits;
+extern volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
 
-extern __sfr __at 0xfc8 SSPADD;
-extern __sfr __at 0xfc9 SSPBUF;
-extern __sfr __at 0xfca T2CON;
+extern __sfr __at (0xfc8) SSPADD;
+extern __sfr __at (0xfc9) SSPBUF;
+extern __sfr __at (0xfca) T2CON;
 typedef union {
        struct {
                unsigned T2CKPS0:1;
@@ -1084,11 +1084,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;
@@ -1102,11 +1102,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;
@@ -1120,9 +1120,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;
@@ -1147,9 +1147,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;
@@ -1174,9 +1174,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;
@@ -1190,12 +1190,12 @@ 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;
+extern __sfr __at (0xfd6) TMR0L;
+extern __sfr __at (0xfd7) TMR0H;
+extern __sfr __at (0xfd8) STATUS;
 typedef union {
        struct {
                unsigned C:1;
@@ -1209,32 +1209,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;
@@ -1259,9 +1259,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;
@@ -1275,9 +1275,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;
@@ -1291,18 +1291,18 @@ typedef union {
        };
 } __INTCONbits_t;
 
-extern volatile __INTCONbits_t __at 0xff2 INTCONbits;
+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 __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;
@@ -1316,11 +1316,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 */

diff --git a/device/include/pic16/pic18fregs.h b/device/include/pic16/pic18fregs.h
index a58e0902020a20c0fd9724eb8ece1a3ed6d21181..739d56397144b984c0554d3190711c7e516123e0 100644 (file)
--- a/device/include/pic16/pic18fregs.h
+++ b/device/include/pic16/pic18fregs.h
@@ -55,6 +55,9 @@
 #elif defined(pic18f4455)
 #  include <pic18f4455.h>
 
+#elif defined(pic18f4520)
+#  include <pic18f4520.h>
+
 #elif defined(pic18f6520)
 #  include <pic18f6520.h>
 

diff --git a/device/lib/pic16/libdev/pic18f1220.c b/device/lib/pic16/libdev/pic18f1220.c
index 4df5d688fbb007e9c8196b94cae2aa842a03d934..e56cdbf8eeec3c1d513f9863cb0f4922c33748e8 100644 (file)
--- a/device/lib/pic16/libdev/pic18f1220.c
+++ b/device/lib/pic16/libdev/pic18f1220.c
@@ -14,154 +14,154 @@
 
 #include <pic18f1220.h>
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
-
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
-
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
-
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
-
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
-
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
-
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
-
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
-
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
-
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
-
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa BAUDCTL;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
-
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
-
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb0 SPBRGH;
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
-
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
+
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
+
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
+
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
+
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
+
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
+
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
+
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
+
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
+
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
+
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) BAUDCTL;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
+
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
+
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb0) SPBRGH;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
+
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f2220.c b/device/lib/pic16/libdev/pic18f2220.c
index 076ac3372a6d992f739b27a9d71086d18ecb4aab..f4ced16151895158e46bfda379a27d2d39639e7c 100644 (file)
--- a/device/lib/pic16/libdev/pic18f2220.c
+++ b/device/lib/pic16/libdev/pic18f2220.c
@@ -14,186 +14,186 @@
 
 #include <pic18f2220.h>
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf9b OSCTUNE;
-volatile __OSCTUNEbits_t at 0xf9b OSCTUNEbits;
+__sfr __at (0xf9b) OSCTUNE;
+volatile __OSCTUNEbits_t __at (0xf9b) OSCTUNEbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
-
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
-
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
-
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
-
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
-
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
+
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
+
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
+
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
+
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
+
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f242.c b/device/lib/pic16/libdev/pic18f242.c
index d434370fc7231676e8b8f43ff5a6aad3ccfad233..99012cd826e55b1145e1dab2f9b945cfce7d5ad5 100644 (file)
--- a/device/lib/pic16/libdev/pic18f242.c
+++ b/device/lib/pic16/libdev/pic18f242.c
@@ -14,176 +14,176 @@
 
 #include <pic18f242.h>
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
-
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
-
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
-
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
-
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
-
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
-
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-volatile __T0CONbits_t at 0xfd5 T0CONbits;
-
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
+
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
+
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
+
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
+
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
+
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
+
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+volatile __T0CONbits_t __at (0xfd5) T0CONbits;
+
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f248.c b/device/lib/pic16/libdev/pic18f248.c
index 5dd454a130d376bd31db09b4ba300f5bf4c65386..611bdee7c0cd218d5a6a6c11e34882578ce82cad 100644 (file)
--- a/device/lib/pic16/libdev/pic18f248.c
+++ b/device/lib/pic16/libdev/pic18f248.c
@@ -14,507 +14,507 @@
 
 #include <pic18f248.h>
 
-sfr at 0xf00 RXF0SIDH;
-volatile __RXF0SIDHbits_t at 0xf00 RXF0SIDHbits;
+__sfr __at (0xf00) RXF0SIDH;
+volatile __RXF0SIDHbits_t __at (0xf00) RXF0SIDHbits;
 
-sfr at 0xf01 RXF0SIDL;
-volatile __RXF0SIDLbits_t at 0xf01 RXF0SIDLbits;
+__sfr __at (0xf01) RXF0SIDL;
+volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-sfr at 0xf02 RXF0EIDH;
-volatile __RXF0EIDHbits_t at 0xf02 RXF0EIDHbits;
+__sfr __at (0xf02) RXF0EIDH;
+volatile __RXF0EIDHbits_t __at (0xf02) RXF0EIDHbits;
 
-sfr at 0xf03 RXF0EIDL;
-volatile __RXF0EIDLbits_t at 0xf03 RXF0EIDLbits;
+__sfr __at (0xf03) RXF0EIDL;
+volatile __RXF0EIDLbits_t __at (0xf03) RXF0EIDLbits;
 
-sfr at 0xf04 RXF1SIDH;
-volatile __RXF1SIDHbits_t at 0xf04 RXF1SIDHbits;
+__sfr __at (0xf04) RXF1SIDH;
+volatile __RXF1SIDHbits_t __at (0xf04) RXF1SIDHbits;
 
-sfr at 0xf05 RXF1SIDL;
-volatile __RXF1SIDLbits_t at 0xf05 RXF1SIDLbits;
+__sfr __at (0xf05) RXF1SIDL;
+volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-sfr at 0xf06 RXF1EIDH;
-volatile __RXF1EIDHbits_t at 0xf06 RXF1EIDHbits;
+__sfr __at (0xf06) RXF1EIDH;
+volatile __RXF1EIDHbits_t __at (0xf06) RXF1EIDHbits;
 
-sfr at 0xf07 RXF1EIDL;
-volatile __RXF1EIDLbits_t at 0xf07 RXF1EIDLbits;
+__sfr __at (0xf07) RXF1EIDL;
+volatile __RXF1EIDLbits_t __at (0xf07) RXF1EIDLbits;
 
-sfr at 0xf08 RXF2SIDH;
-volatile __RXF2SIDHbits_t at 0xf08 RXF2SIDHbits;
+__sfr __at (0xf08) RXF2SIDH;
+volatile __RXF2SIDHbits_t __at (0xf08) RXF2SIDHbits;
 
-sfr at 0xf09 RXF2SIDL;
-volatile __RXF2SIDLbits_t at 0xf09 RXF2SIDLbits;
+__sfr __at (0xf09) RXF2SIDL;
+volatile __RXF2SIDLbits_t __at (0xf09) RXF2SIDLbits;
 
-sfr at 0xf0a RXF2EIDH;
-volatile __RXF2EIDHbits_t at 0xf0a RXF2EIDHbits;
+__sfr __at (0xf0a) RXF2EIDH;
+volatile __RXF2EIDHbits_t __at (0xf0a) RXF2EIDHbits;
 
-sfr at 0xf0b RXF2EIDL;
-volatile __RXF2EIDLbits_t at 0xf0b RXF2EIDLbits;
+__sfr __at (0xf0b) RXF2EIDL;
+volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-sfr at 0xf0c RXF3SIDH;
-volatile __RXF3SIDHbits_t at 0xf0c RXF3SIDHbits;
+__sfr __at (0xf0c) RXF3SIDH;
+volatile __RXF3SIDHbits_t __at (0xf0c) RXF3SIDHbits;
 
-sfr at 0xf0d RXF3SIDL;
-volatile __RXF3SIDLbits_t at 0xf0d RXF3SIDLbits;
+__sfr __at (0xf0d) RXF3SIDL;
+volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-sfr at 0xf0e RXF3EIDH;
-volatile __RXF3EIDHbits_t at 0xf0e RXF3EIDHbits;
+__sfr __at (0xf0e) RXF3EIDH;
+volatile __RXF3EIDHbits_t __at (0xf0e) RXF3EIDHbits;
 
-sfr at 0xf0f RXF3EIDL;
-volatile __RXF3EIDLbits_t at 0xf0f RXF3EIDLbits;
+__sfr __at (0xf0f) RXF3EIDL;
+volatile __RXF3EIDLbits_t __at (0xf0f) RXF3EIDLbits;
 
-sfr at 0xf10 RXF4SIDH;
-volatile __RXF4SIDHbits_t at 0xf10 RXF4SIDHbits;
+__sfr __at (0xf10) RXF4SIDH;
+volatile __RXF4SIDHbits_t __at (0xf10) RXF4SIDHbits;
 
-sfr at 0xf11 RXF4SIDL;
-volatile __RXF4SIDLbits_t at 0xf11 RXF4SIDLbits;
+__sfr __at (0xf11) RXF4SIDL;
+volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-sfr at 0xf12 RXF4EIDH;
-volatile __RXF4EIDHbits_t at 0xf12 RXF4EIDHbits;
+__sfr __at (0xf12) RXF4EIDH;
+volatile __RXF4EIDHbits_t __at (0xf12) RXF4EIDHbits;
 
-sfr at 0xf13 RXF4EIDL;
-volatile __RXF4EIDLbits_t at 0xf13 RXF4EIDLbits;
+__sfr __at (0xf13) RXF4EIDL;
+volatile __RXF4EIDLbits_t __at (0xf13) RXF4EIDLbits;
 
-sfr at 0xf14 RXF5SIDH;
-volatile __RXF5SIDHbits_t at 0xf14 RXF5SIDHbits;
+__sfr __at (0xf14) RXF5SIDH;
+volatile __RXF5SIDHbits_t __at (0xf14) RXF5SIDHbits;
 
-sfr at 0xf15 RXF5SIDL;
-volatile __RXF5SIDLbits_t at 0xf15 RXF5SIDLbits;
+__sfr __at (0xf15) RXF5SIDL;
+volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-sfr at 0xf16 RXF5EIDH;
-volatile __RXF5EIDHbits_t at 0xf16 RXF5EIDHbits;
+__sfr __at (0xf16) RXF5EIDH;
+volatile __RXF5EIDHbits_t __at (0xf16) RXF5EIDHbits;
 
-sfr at 0xf17 RXF5EIDL;
-volatile __RXF5EIDLbits_t at 0xf17 RXF5EIDLbits;
+__sfr __at (0xf17) RXF5EIDL;
+volatile __RXF5EIDLbits_t __at (0xf17) RXF5EIDLbits;
 
-sfr at 0xf18 RXM0SIDH;
-volatile __RXM0SIDHbits_t at 0xf18 RXM0SIDHbits;
+__sfr __at (0xf18) RXM0SIDH;
+volatile __RXM0SIDHbits_t __at (0xf18) RXM0SIDHbits;
 
-sfr at 0xf19 RXM0SIDL;
-volatile __RXM0SIDLbits_t at 0xf19 RXM0SIDLbits;
+__sfr __at (0xf19) RXM0SIDL;
+volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-sfr at 0xf1a RXM0EIDH;
-volatile __RXM0EIDHbits_t at 0xf1a RXM0EIDHbits;
+__sfr __at (0xf1a) RXM0EIDH;
+volatile __RXM0EIDHbits_t __at (0xf1a) RXM0EIDHbits;
 
-sfr at 0xf1b RXM0EIDL;
-volatile __RXM0EIDLbits_t at 0xf1b RXM0EIDLbits;
+__sfr __at (0xf1b) RXM0EIDL;
+volatile __RXM0EIDLbits_t __at (0xf1b) RXM0EIDLbits;
 
-sfr at 0xf1c RXM1SIDH;
-volatile __RXM1SIDHbits_t at 0xf1c RXM1SIDHbits;
+__sfr __at (0xf1c) RXM1SIDH;
+volatile __RXM1SIDHbits_t __at (0xf1c) RXM1SIDHbits;
 
-sfr at 0xf1d RXM1SIDL;
-volatile __RXM1SIDLbits_t at 0xf1d RXM1SIDLbits;
+__sfr __at (0xf1d) RXM1SIDL;
+volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-sfr at 0xf1e RXM1EIDH;
-volatile __RXM1EIDHbits_t at 0xf1e RXM1EIDHbits;
+__sfr __at (0xf1e) RXM1EIDH;
+volatile __RXM1EIDHbits_t __at (0xf1e) RXM1EIDHbits;
 
-sfr at 0xf1f RXM1EIDL;
-volatile __RXM1EIDLbits_t at 0xf1f RXM1EIDLbits;
+__sfr __at (0xf1f) RXM1EIDL;
+volatile __RXM1EIDLbits_t __at (0xf1f) RXM1EIDLbits;
 
-sfr at 0xf20 TXB2CON;
-volatile __TXB2CONbits_t at 0xf20 TXB2CONbits;
+__sfr __at (0xf20) TXB2CON;
+volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-sfr at 0xf21 TXB2SIDH;
-volatile __TXB2SIDHbits_t at 0xf21 TXB2SIDHbits;
+__sfr __at (0xf21) TXB2SIDH;
+volatile __TXB2SIDHbits_t __at (0xf21) TXB2SIDHbits;
 
-sfr at 0xf22 TXB2SIDL;
-volatile __TXB2SIDLbits_t at 0xf22 TXB2SIDLbits;
+__sfr __at (0xf22) TXB2SIDL;
+volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-sfr at 0xf23 TXB2EIDH;
-volatile __TXB2EIDHbits_t at 0xf23 TXB2EIDHbits;
+__sfr __at (0xf23) TXB2EIDH;
+volatile __TXB2EIDHbits_t __at (0xf23) TXB2EIDHbits;
 
-sfr at 0xf24 TXB2EIDL;
-volatile __TXB2EIDLbits_t at 0xf24 TXB2EIDLbits;
+__sfr __at (0xf24) TXB2EIDL;
+volatile __TXB2EIDLbits_t __at (0xf24) TXB2EIDLbits;
 
-sfr at 0xf25 TXB2DLC;
-volatile __TXB2DLCbits_t at 0xf25 TXB2DLCbits;
+__sfr __at (0xf25) TXB2DLC;
+volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-sfr at 0xf26 TXB2D0;
-volatile __TXB2D0bits_t at 0xf26 TXB2D0bits;
+__sfr __at (0xf26) TXB2D0;
+volatile __TXB2D0bits_t __at (0xf26) TXB2D0bits;
 
-sfr at 0xf27 TXB2D1;
-volatile __TXB2D1bits_t at 0xf27 TXB2D1bits;
+__sfr __at (0xf27) TXB2D1;
+volatile __TXB2D1bits_t __at (0xf27) TXB2D1bits;
 
-sfr at 0xf28 TXB2D2;
-volatile __TXB2D2bits_t at 0xf28 TXB2D2bits;
+__sfr __at (0xf28) TXB2D2;
+volatile __TXB2D2bits_t __at (0xf28) TXB2D2bits;
 
-sfr at 0xf29 TXB2D3;
-volatile __TXB2D3bits_t at 0xf29 TXB2D3bits;
+__sfr __at (0xf29) TXB2D3;
+volatile __TXB2D3bits_t __at (0xf29) TXB2D3bits;
 
-sfr at 0xf2a TXB2D4;
-volatile __TXB2D4bits_t at 0xf2a TXB2D4bits;
+__sfr __at (0xf2a) TXB2D4;
+volatile __TXB2D4bits_t __at (0xf2a) TXB2D4bits;
 
-sfr at 0xf2b TXB2D5;
-volatile __TXB2D5bits_t at 0xf2b TXB2D5bits;
+__sfr __at (0xf2b) TXB2D5;
+volatile __TXB2D5bits_t __at (0xf2b) TXB2D5bits;
 
-sfr at 0xf2c TXB2D6;
-volatile __TXB2D6bits_t at 0xf2c TXB2D6bits;
+__sfr __at (0xf2c) TXB2D6;
+volatile __TXB2D6bits_t __at (0xf2c) TXB2D6bits;
 
-sfr at 0xf2d TXB2D7;
-volatile __TXB2D7bits_t at 0xf2d TXB2D7bits;
+__sfr __at (0xf2d) TXB2D7;
+volatile __TXB2D7bits_t __at (0xf2d) TXB2D7bits;
 
-sfr at 0xf2e CANSTATRO4;
-volatile __CANSTATRO4bits_t at 0xf2e CANSTATRO4bits;
+__sfr __at (0xf2e) CANSTATRO4;
+volatile __CANSTATRO4bits_t __at (0xf2e) CANSTATRO4bits;
 
-sfr at 0xf30 TXB1CON;
-volatile __TXB1CONbits_t at 0xf30 TXB1CONbits;
+__sfr __at (0xf30) TXB1CON;
+volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-sfr at 0xf31 TXB1SIDH;
-volatile __TXB1SIDHbits_t at 0xf31 TXB1SIDHbits;
+__sfr __at (0xf31) TXB1SIDH;
+volatile __TXB1SIDHbits_t __at (0xf31) TXB1SIDHbits;
 
-sfr at 0xf32 TXB1SIDL;
-volatile __TXB1SIDLbits_t at 0xf32 TXB1SIDLbits;
+__sfr __at (0xf32) TXB1SIDL;
+volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-sfr at 0xf33 TXB1EIDH;
-volatile __TXB1EIDHbits_t at 0xf33 TXB1EIDHbits;
+__sfr __at (0xf33) TXB1EIDH;
+volatile __TXB1EIDHbits_t __at (0xf33) TXB1EIDHbits;
 
-sfr at 0xf34 TXB1EIDL;
-volatile __TXB1EIDLbits_t at 0xf34 TXB1EIDLbits;
+__sfr __at (0xf34) TXB1EIDL;
+volatile __TXB1EIDLbits_t __at (0xf34) TXB1EIDLbits;
 
-sfr at 0xf35 TXB1DLC;
-volatile __TXB1DLCbits_t at 0xf35 TXB1DLCbits;
+__sfr __at (0xf35) TXB1DLC;
+volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-sfr at 0xf36 TXB1D0;
-volatile __TXB1D0bits_t at 0xf36 TXB1D0bits;
+__sfr __at (0xf36) TXB1D0;
+volatile __TXB1D0bits_t __at (0xf36) TXB1D0bits;
 
-sfr at 0xf37 TXB1D1;
-volatile __TXB1D1bits_t at 0xf37 TXB1D1bits;
+__sfr __at (0xf37) TXB1D1;
+volatile __TXB1D1bits_t __at (0xf37) TXB1D1bits;
 
-sfr at 0xf38 TXB1D2;
-volatile __TXB1D2bits_t at 0xf38 TXB1D2bits;
+__sfr __at (0xf38) TXB1D2;
+volatile __TXB1D2bits_t __at (0xf38) TXB1D2bits;
 
-sfr at 0xf39 TXB1D3;
-volatile __TXB1D3bits_t at 0xf39 TXB1D3bits;
+__sfr __at (0xf39) TXB1D3;
+volatile __TXB1D3bits_t __at (0xf39) TXB1D3bits;
 
-sfr at 0xf3a TXB1D4;
-volatile __TXB1D4bits_t at 0xf3a TXB1D4bits;
+__sfr __at (0xf3a) TXB1D4;
+volatile __TXB1D4bits_t __at (0xf3a) TXB1D4bits;
 
-sfr at 0xf3b TXB1D5;
-volatile __TXB1D5bits_t at 0xf3b TXB1D5bits;
+__sfr __at (0xf3b) TXB1D5;
+volatile __TXB1D5bits_t __at (0xf3b) TXB1D5bits;
 
-sfr at 0xf3c TXB1D6;
-volatile __TXB1D6bits_t at 0xf3c TXB1D6bits;
+__sfr __at (0xf3c) TXB1D6;
+volatile __TXB1D6bits_t __at (0xf3c) TXB1D6bits;
 
-sfr at 0xf3d TXB1D7;
-volatile __TXB1D7bits_t at 0xf3d TXB1D7bits;
+__sfr __at (0xf3d) TXB1D7;
+volatile __TXB1D7bits_t __at (0xf3d) TXB1D7bits;
 
-sfr at 0xf3e CANSTATRO3;
-volatile __CANSTATRO3bits_t at 0xf3e CANSTATRO3bits;
+__sfr __at (0xf3e) CANSTATRO3;
+volatile __CANSTATRO3bits_t __at (0xf3e) CANSTATRO3bits;
 
-sfr at 0xf40 TXB0CON;
-volatile __TXB0CONbits_t at 0xf40 TXB0CONbits;
+__sfr __at (0xf40) TXB0CON;
+volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-sfr at 0xf41 TXB0SIDH;
-volatile __TXB0SIDHbits_t at 0xf41 TXB0SIDHbits;
+__sfr __at (0xf41) TXB0SIDH;
+volatile __TXB0SIDHbits_t __at (0xf41) TXB0SIDHbits;
 
-sfr at 0xf42 TXB0SIDL;
-volatile __TXB0SIDLbits_t at 0xf42 TXB0SIDLbits;
+__sfr __at (0xf42) TXB0SIDL;
+volatile __TXB0SIDLbits_t __at (0xf42) TXB0SIDLbits;
 
-sfr at 0xf43 TXB0EIDH;
-volatile __TXB0EIDHbits_t at 0xf43 TXB0EIDHbits;
+__sfr __at (0xf43) TXB0EIDH;
+volatile __TXB0EIDHbits_t __at (0xf43) TXB0EIDHbits;
 
-sfr at 0xf44 TXB0EIDL;
-volatile __TXB0EIDLbits_t at 0xf44 TXB0EIDLbits;
+__sfr __at (0xf44) TXB0EIDL;
+volatile __TXB0EIDLbits_t __at (0xf44) TXB0EIDLbits;
 
-sfr at 0xf45 TXB0DLC;
-volatile __TXB0DLCbits_t at 0xf45 TXB0DLCbits;
+__sfr __at (0xf45) TXB0DLC;
+volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-sfr at 0xf46 TXB0D0;
-volatile __TXB0D0bits_t at 0xf46 TXB0D0bits;
+__sfr __at (0xf46) TXB0D0;
+volatile __TXB0D0bits_t __at (0xf46) TXB0D0bits;
 
-sfr at 0xf47 TXB0D1;
-volatile __TXB0D1bits_t at 0xf47 TXB0D1bits;
+__sfr __at (0xf47) TXB0D1;
+volatile __TXB0D1bits_t __at (0xf47) TXB0D1bits;
 
-sfr at 0xf48 TXB0D2;
-volatile __TXB0D2bits_t at 0xf48 TXB0D2bits;
+__sfr __at (0xf48) TXB0D2;
+volatile __TXB0D2bits_t __at (0xf48) TXB0D2bits;
 
-sfr at 0xf49 TXB0D3;
-volatile __TXB0D3bits_t at 0xf49 TXB0D3bits;
+__sfr __at (0xf49) TXB0D3;
+volatile __TXB0D3bits_t __at (0xf49) TXB0D3bits;
 
-sfr at 0xf4a TXB0D4;
-volatile __TXB0D4bits_t at 0xf4a TXB0D4bits;
+__sfr __at (0xf4a) TXB0D4;
+volatile __TXB0D4bits_t __at (0xf4a) TXB0D4bits;
 
-sfr at 0xf4b TXB0D5;
-volatile __TXB0D5bits_t at 0xf4b TXB0D5bits;
+__sfr __at (0xf4b) TXB0D5;
+volatile __TXB0D5bits_t __at (0xf4b) TXB0D5bits;
 
-sfr at 0xf4c TXB0D6;
-volatile __TXB0D6bits_t at 0xf4c TXB0D6bits;
+__sfr __at (0xf4c) TXB0D6;
+volatile __TXB0D6bits_t __at (0xf4c) TXB0D6bits;
 
-sfr at 0xf4d TXB0D7;
-volatile __TXB0D7bits_t at 0xf4d TXB0D7bits;
+__sfr __at (0xf4d) TXB0D7;
+volatile __TXB0D7bits_t __at (0xf4d) TXB0D7bits;
 
-sfr at 0xf4e CANSTATRO2;
-volatile __CANSTATRO2bits_t at 0xf4e CANSTATRO2bits;
+__sfr __at (0xf4e) CANSTATRO2;
+volatile __CANSTATRO2bits_t __at (0xf4e) CANSTATRO2bits;
 
-sfr at 0xf50 RXB1CON;
-volatile __RXB1CONbits_t at 0xf50 RXB1CONbits;
+__sfr __at (0xf50) RXB1CON;
+volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-sfr at 0xf51 RXB1SIDH;
-volatile __RXB1SIDHbits_t at 0xf51 RXB1SIDHbits;
+__sfr __at (0xf51) RXB1SIDH;
+volatile __RXB1SIDHbits_t __at (0xf51) RXB1SIDHbits;
 
-sfr at 0xf52 RXB1SIDL;
-volatile __RXB1SIDLbits_t at 0xf52 RXB1SIDLbits;
+__sfr __at (0xf52) RXB1SIDL;
+volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-sfr at 0xf53 RXB1EIDH;
-volatile __RXB1EIDHbits_t at 0xf53 RXB1EIDHbits;
+__sfr __at (0xf53) RXB1EIDH;
+volatile __RXB1EIDHbits_t __at (0xf53) RXB1EIDHbits;
 
-sfr at 0xf54 RXB1EIDL;
-volatile __RXB1EIDLbits_t at 0xf54 RXB1EIDLbits;
+__sfr __at (0xf54) RXB1EIDL;
+volatile __RXB1EIDLbits_t __at (0xf54) RXB1EIDLbits;
 
-sfr at 0xf55 RXB1DLC;
-volatile __RXB1DLCbits_t at 0xf55 RXB1DLCbits;
+__sfr __at (0xf55) RXB1DLC;
+volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-sfr at 0xf56 RXB1D0;
-volatile __RXB1D0bits_t at 0xf56 RXB1D0bits;
+__sfr __at (0xf56) RXB1D0;
+volatile __RXB1D0bits_t __at (0xf56) RXB1D0bits;
 
-sfr at 0xf57 RXB1D1;
-volatile __RXB1D1bits_t at 0xf57 RXB1D1bits;
+__sfr __at (0xf57) RXB1D1;
+volatile __RXB1D1bits_t __at (0xf57) RXB1D1bits;
 
-sfr at 0xf58 RXB1D2;
-volatile __RXB1D2bits_t at 0xf58 RXB1D2bits;
+__sfr __at (0xf58) RXB1D2;
+volatile __RXB1D2bits_t __at (0xf58) RXB1D2bits;
 
-sfr at 0xf59 RXB1D3;
-volatile __RXB1D3bits_t at 0xf59 RXB1D3bits;
+__sfr __at (0xf59) RXB1D3;
+volatile __RXB1D3bits_t __at (0xf59) RXB1D3bits;
 
-sfr at 0xf5a RXB1D4;
-volatile __RXB1D4bits_t at 0xf5a RXB1D4bits;
+__sfr __at (0xf5a) RXB1D4;
+volatile __RXB1D4bits_t __at (0xf5a) RXB1D4bits;
 
-sfr at 0xf5b RXB1D5;
-volatile __RXB1D5bits_t at 0xf5b RXB1D5bits;
+__sfr __at (0xf5b) RXB1D5;
+volatile __RXB1D5bits_t __at (0xf5b) RXB1D5bits;
 
-sfr at 0xf5c RXB1D6;
-volatile __RXB1D6bits_t at 0xf5c RXB1D6bits;
+__sfr __at (0xf5c) RXB1D6;
+volatile __RXB1D6bits_t __at (0xf5c) RXB1D6bits;
 
-sfr at 0xf5d RXB1D7;
-volatile __RXB1D7bits_t at 0xf5d RXB1D7bits;
+__sfr __at (0xf5d) RXB1D7;
+volatile __RXB1D7bits_t __at (0xf5d) RXB1D7bits;
 
-sfr at 0xf5e CANSTATRO1;
-volatile __CANSTATRO1bits_t at 0xf5e CANSTATRO1bits;
+__sfr __at (0xf5e) CANSTATRO1;
+volatile __CANSTATRO1bits_t __at (0xf5e) CANSTATRO1bits;
 
-sfr at 0xf60 RXB0CON;
-volatile __RXB0CONbits_t at 0xf60 RXB0CONbits;
+__sfr __at (0xf60) RXB0CON;
+volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-sfr at 0xf61 RXB0SIDH;
-volatile __RXB0SIDHbits_t at 0xf61 RXB0SIDHbits;
+__sfr __at (0xf61) RXB0SIDH;
+volatile __RXB0SIDHbits_t __at (0xf61) RXB0SIDHbits;
 
-sfr at 0xf62 RXB0SIDL;
-volatile __RXB0SIDLbits_t at 0xf62 RXB0SIDLbits;
+__sfr __at (0xf62) RXB0SIDL;
+volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-sfr at 0xf63 RXB0EIDH;
-volatile __RXB0EIDHbits_t at 0xf63 RXB0EIDHbits;
+__sfr __at (0xf63) RXB0EIDH;
+volatile __RXB0EIDHbits_t __at (0xf63) RXB0EIDHbits;
 
-sfr at 0xf64 RXB0EIDL;
-volatile __RXB0EIDLbits_t at 0xf64 RXB0EIDLbits;
+__sfr __at (0xf64) RXB0EIDL;
+volatile __RXB0EIDLbits_t __at (0xf64) RXB0EIDLbits;
 
-sfr at 0xf65 RXB0DLC;
-volatile __RXB0DLCbits_t at 0xf65 RXB0DLCbits;
+__sfr __at (0xf65) RXB0DLC;
+volatile __RXB0DLCbits_t __at (0xf65) RXB0DLCbits;
 
-sfr at 0xf66 RXB0D0;
-sfr at 0xf67 RXB0D1;
-sfr at 0xf68 RXB0D2;
-sfr at 0xf69 RXB0D3;
-sfr at 0xf6a RXB0D4;
-sfr at 0xf6b RXB0D5;
-sfr at 0xf6c RXB0D6;
-sfr at 0xf6d RXB0D7;
-sfr at 0xf6e CANSTAT;
-volatile __CANSTATbits_t at 0xf6e CANSTATbits;
+__sfr __at (0xf66) RXB0D0;
+__sfr __at (0xf67) RXB0D1;
+__sfr __at (0xf68) RXB0D2;
+__sfr __at (0xf69) RXB0D3;
+__sfr __at (0xf6a) RXB0D4;
+__sfr __at (0xf6b) RXB0D5;
+__sfr __at (0xf6c) RXB0D6;
+__sfr __at (0xf6d) RXB0D7;
+__sfr __at (0xf6e) CANSTAT;
+volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-sfr at 0xf6f CANCON;
-volatile __CANCONbits_t at 0xf6f CANCONbits;
+__sfr __at (0xf6f) CANCON;
+volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-sfr at 0xf70 BRGCON1;
-volatile __BRGCON1bits_t at 0xf70 BRGCON1bits;
+__sfr __at (0xf70) BRGCON1;
+volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-sfr at 0xf71 BRGCON2;
-volatile __BRGCON2bits_t at 0xf71 BRGCON2bits;
+__sfr __at (0xf71) BRGCON2;
+volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-sfr at 0xf72 BRGCON3;
-volatile __BRGCON3bits_t at 0xf72 BRGCON3bits;
+__sfr __at (0xf72) BRGCON3;
+volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-sfr at 0xf73 CIOCON;
-volatile __CIOCONbits_t at 0xf73 CIOCONbits;
+__sfr __at (0xf73) CIOCON;
+volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-sfr at 0xf74 COMSTAT;
-volatile __COMSTATbits_t at 0xf74 COMSTATbits;
+__sfr __at (0xf74) COMSTAT;
+volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-sfr at 0xf75 RXERRCNT;
-volatile __RXERRCNTbits_t at 0xf75 RXERRCNTbits;
+__sfr __at (0xf75) RXERRCNT;
+volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-sfr at 0xf76 TXERRCNT;
-volatile __TXERRCNTbits_t at 0xf76 TXERRCNTbits;
+__sfr __at (0xf76) TXERRCNT;
+volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
-
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
-
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
-
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
-
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
-
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
-
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
+
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
+
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
+
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
+
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
+
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
+
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f252.c b/device/lib/pic16/libdev/pic18f252.c
index 3db32a139450b32a2819332b86875d7fc8b172bc..dcfcdb77edf05e8ec605607f944fa82d78cf3f5a 100644 (file)
--- a/device/lib/pic16/libdev/pic18f252.c
+++ b/device/lib/pic16/libdev/pic18f252.c
@@ -14,176 +14,176 @@
 
 #include <pic18f252.h>
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
-
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
-
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
-
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
-
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
-
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
-
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-volatile __T0CONbits_t at 0xfd5 T0CONbits;
-
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
+
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
+
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
+
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
+
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
+
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
+
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+volatile __T0CONbits_t __at (0xfd5) T0CONbits;
+
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f2550.c b/device/lib/pic16/libdev/pic18f2550.c
index 087c810b6b358e1f5fe288a7b503b859e2e5fd0b..3910dd894836e9af805b80bbcc746804dace03e5 100644 (file)
--- a/device/lib/pic16/libdev/pic18f2550.c
+++ b/device/lib/pic16/libdev/pic18f2550.c
@@ -16,355 +16,355 @@
 
 #include <pic18f2550.h>
 
-__sfr __at 0xF62 SPPDATA;
-volatile __SPPDATA_t __at 0xF62 SPPDATAbits;
+__sfr __at (0xF62) SPPDATA;
+volatile __SPPDATA_t __at (0xF62) SPPDATAbits;
 
-__sfr __at 0xF63 SPPCFG;
-volatile __SPPCFG_t __at 0xF63 SPPCFGbits;
+__sfr __at (0xF63) SPPCFG;
+volatile __SPPCFG_t __at (0xF63) SPPCFGbits;
 
-__sfr __at 0xF64 SPPEPS;
-volatile __SPPEPS_t __at 0xF64 SPPEPSbits;
+__sfr __at (0xF64) SPPEPS;
+volatile __SPPEPS_t __at (0xF64) SPPEPSbits;
 
-__sfr __at 0xF65 SPPCON;
-volatile __SPPCON_t __at 0xF65 SPPCONbits;
+__sfr __at (0xF65) SPPCON;
+volatile __SPPCON_t __at (0xF65) SPPCONbits;
 
-__sfr __at 0xF66 UFRML;
-volatile __UFRML_t __at 0xF66 UFRMLbits;
+__sfr __at (0xF66) UFRML;
+volatile __UFRML_t __at (0xF66) UFRMLbits;
 
-__sfr __at 0xF67 UFRMH;
-volatile __UFRMH_t __at 0xF67 UFRMHbits;
+__sfr __at (0xF67) UFRMH;
+volatile __UFRMH_t __at (0xF67) UFRMHbits;
 
-__sfr __at 0xF68 UIR;
-volatile __UIR_t __at 0xF68 UIRbits;
+__sfr __at (0xF68) UIR;
+volatile __UIR_t __at (0xF68) UIRbits;
 
-__sfr __at 0xF69 UIE;
-volatile __UIE_t __at 0xF69 UIEbits;
+__sfr __at (0xF69) UIE;
+volatile __UIE_t __at (0xF69) UIEbits;
 
-__sfr __at 0xF6A UEIR;
-volatile __UEIR_t __at 0xF6A UEIRbits;
+__sfr __at (0xF6A) UEIR;
+volatile __UEIR_t __at (0xF6A) UEIRbits;
 
-__sfr __at 0xF6B UEIE;
-volatile __UEIE_t __at 0xF6B UEIEbits;
+__sfr __at (0xF6B) UEIE;
+volatile __UEIE_t __at (0xF6B) UEIEbits;
 
-__sfr __at 0xF6C USTAT;
-volatile __USTAT_t __at 0xF6C USTATbits;
+__sfr __at (0xF6C) USTAT;
+volatile __USTAT_t __at (0xF6C) USTATbits;
 
-__sfr __at 0xF6D UCON;
-volatile __UCON_t __at 0xF6D UCONbits;
+__sfr __at (0xF6D) UCON;
+volatile __UCON_t __at (0xF6D) UCONbits;
 
-__sfr __at 0xF6E UADDR;
-volatile __UADDR_t __at 0xF6E UADDRbits;
+__sfr __at (0xF6E) UADDR;
+volatile __UADDR_t __at (0xF6E) UADDRbits;
 
-__sfr __at 0xF6F UCFG;
-volatile __UCFG_t __at 0xF6F UCFGbits;
+__sfr __at (0xF6F) UCFG;
+volatile __UCFG_t __at (0xF6F) UCFGbits;
 
-__sfr __at 0xF70 UEP0;
-volatile __UEP0_t __at 0xF70 UEP0bits;
+__sfr __at (0xF70) UEP0;
+volatile __UEP0_t __at (0xF70) UEP0bits;
 
-__sfr __at 0xF71 UEP1;
-volatile __UEP1_t __at 0xF71 UEP1bits;
+__sfr __at (0xF71) UEP1;
+volatile __UEP1_t __at (0xF71) UEP1bits;
 
-__sfr __at 0xF72 UEP2;
-volatile __UEP2_t __at 0xF72 UEP2bits;
+__sfr __at (0xF72) UEP2;
+volatile __UEP2_t __at (0xF72) UEP2bits;
 
-__sfr __at 0xF73 UEP3;
-volatile __UEP3_t __at 0xF73 UEP3bits;
+__sfr __at (0xF73) UEP3;
+volatile __UEP3_t __at (0xF73) UEP3bits;
 
-__sfr __at 0xF74 UEP4;
-volatile __UEP4_t __at 0xF74 UEP4bits;
+__sfr __at (0xF74) UEP4;
+volatile __UEP4_t __at (0xF74) UEP4bits;
 
-__sfr __at 0xF75 UEP5;
-volatile __UEP5_t __at 0xF75 UEP5bits;
+__sfr __at (0xF75) UEP5;
+volatile __UEP5_t __at (0xF75) UEP5bits;
 
-__sfr __at 0xF76 UEP6;
-volatile __UEP6_t __at 0xF76 UEP6bits;
+__sfr __at (0xF76) UEP6;
+volatile __UEP6_t __at (0xF76) UEP6bits;
 
-__sfr __at 0xF77 UEP7;
-volatile __UEP7_t __at 0xF77 UEP7bits;
+__sfr __at (0xF77) UEP7;
+volatile __UEP7_t __at (0xF77) UEP7bits;
 
-__sfr __at 0xF78 UEP8;
-volatile __UEP8_t __at 0xF78 UEP8bits;
+__sfr __at (0xF78) UEP8;
+volatile __UEP8_t __at (0xF78) UEP8bits;
 
-__sfr __at 0xF79 UEP9;
-volatile __UEP9_t __at 0xF79 UEP9bits;
+__sfr __at (0xF79) UEP9;
+volatile __UEP9_t __at (0xF79) UEP9bits;
 
-__sfr __at 0xF7A UEP10;
-volatile __UEP10_t __at 0xF7A UEP10bits;
+__sfr __at (0xF7A) UEP10;
+volatile __UEP10_t __at (0xF7A) UEP10bits;
 
-__sfr __at 0xF7B UEP11;
-volatile __UEP11_t __at 0xF7B UEP11bits;
+__sfr __at (0xF7B) UEP11;
+volatile __UEP11_t __at (0xF7B) UEP11bits;
 
-__sfr __at 0xF7C UEP12;
-volatile __UEP12_t __at 0xF7C UEP12bits;
+__sfr __at (0xF7C) UEP12;
+volatile __UEP12_t __at (0xF7C) UEP12bits;
 
-__sfr __at 0xF7D UEP13;
-volatile __UEP13_t __at 0xF7D UEP13bits;
+__sfr __at (0xF7D) UEP13;
+volatile __UEP13_t __at (0xF7D) UEP13bits;
 
-__sfr __at 0xF7E UEP14;
-volatile __UEP14_t __at 0xF7E UEP14bits;
+__sfr __at (0xF7E) UEP14;
+volatile __UEP14_t __at (0xF7E) UEP14bits;
 
-__sfr __at 0xF7F UEP15;
-volatile __UEP15_t __at 0xF7F UEP15bits;
+__sfr __at (0xF7F) UEP15;
+volatile __UEP15_t __at (0xF7F) UEP15bits;
 
-__sfr __at 0xF80 PORTA;
-volatile __PORTA_t __at 0xF80 PORTAbits;
+__sfr __at (0xF80) PORTA;
+volatile __PORTA_t __at (0xF80) PORTAbits;
 
-__sfr __at 0xF81 PORTB;
-volatile __PORTB_t __at 0xF81 PORTBbits;
+__sfr __at (0xF81) PORTB;
+volatile __PORTB_t __at (0xF81) PORTBbits;
 
-__sfr __at 0xF82 PORTC;
-volatile __PORTC_t __at 0xF82 PORTCbits;
+__sfr __at (0xF82) PORTC;
+volatile __PORTC_t __at (0xF82) PORTCbits;
 
-__sfr __at 0xF84 PORTE;
-volatile __PORTE_t __at 0xF84 PORTEbits;
+__sfr __at (0xF84) PORTE;
+volatile __PORTE_t __at (0xF84) PORTEbits;
 
-__sfr __at 0xF89 LATA;
-volatile __LATA_t __at 0xF89 LATAbits;
+__sfr __at (0xF89) LATA;
+volatile __LATA_t __at (0xF89) LATAbits;
 
-__sfr __at 0xF8A LATB;
-volatile __LATB_t __at 0xF8A LATBbits;
+__sfr __at (0xF8A) LATB;
+volatile __LATB_t __at (0xF8A) LATBbits;
 
-__sfr __at 0xF8B LATC;
-volatile __LATC_t __at 0xF8B LATCbits;
+__sfr __at (0xF8B) LATC;
+volatile __LATC_t __at (0xF8B) LATCbits;
 
-__sfr __at 0xF92 TRISA;
-volatile __TRISA_t __at 0xF92 TRISAbits;
+__sfr __at (0xF92) TRISA;
+volatile __TRISA_t __at (0xF92) TRISAbits;
 
-__sfr __at 0xF93 TRISB;
-volatile __TRISB_t __at 0xF93 TRISBbits;
+__sfr __at (0xF93) TRISB;
+volatile __TRISB_t __at (0xF93) TRISBbits;
 
-__sfr __at 0xF94 TRISC;
-volatile __TRISC_t __at 0xF94 TRISCbits;
+__sfr __at (0xF94) TRISC;
+volatile __TRISC_t __at (0xF94) TRISCbits;
 
-__sfr __at 0xF9B OSCTUNE;
-volatile __OSCTUNE_t __at 0xF9B OSCTUNEbits;
+__sfr __at (0xF9B) OSCTUNE;
+volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;
 
-__sfr __at 0xF9D PIE1;
-volatile __PIE1_t __at 0xF9D PIE1bits;
+__sfr __at (0xF9D) PIE1;
+volatile __PIE1_t __at (0xF9D) PIE1bits;
 
-__sfr __at 0xF9E PIR1;
-volatile __PIR1_t __at 0xF9E PIR1bits;
+__sfr __at (0xF9E) PIR1;
+volatile __PIR1_t __at (0xF9E) PIR1bits;
 
-__sfr __at 0xF9F IPR1;
-volatile __IPR1_t __at 0xF9F IPR1bits;
+__sfr __at (0xF9F) IPR1;
+volatile __IPR1_t __at (0xF9F) IPR1bits;
 
-__sfr __at 0xFA0 PIE2;
-volatile __PIE2_t __at 0xFA0 PIE2bits;
+__sfr __at (0xFA0) PIE2;
+volatile __PIE2_t __at (0xFA0) PIE2bits;
 
-__sfr __at 0xFA1 PIR2;
-volatile __PIR2_t __at 0xFA1 PIR2bits;
+__sfr __at (0xFA1) PIR2;
+volatile __PIR2_t __at (0xFA1) PIR2bits;
 
-__sfr __at 0xFA2 IPR2;
-volatile __IPR2_t __at 0xFA2 IPR2bits;
+__sfr __at (0xFA2) IPR2;
+volatile __IPR2_t __at (0xFA2) IPR2bits;
 
-__sfr __at 0xFA6 EECON1;
-volatile __EECON1_t __at 0xFA6 EECON1bits;
+__sfr __at (0xFA6) EECON1;
+volatile __EECON1_t __at (0xFA6) EECON1bits;
 
-__sfr __at 0xFA7 EECON2;
+__sfr __at (0xFA7) EECON2;
 
-__sfr __at 0xFA8 EEDATA;
+__sfr __at (0xFA8) EEDATA;
 
-__sfr __at 0xFA9 EEADR;
+__sfr __at (0xFA9) EEADR;
 
-__sfr __at 0xFAB RCSTA;
-volatile __RCSTA_t __at 0xFAB RCSTAbits;
+__sfr __at (0xFAB) RCSTA;
+volatile __RCSTA_t __at (0xFAB) RCSTAbits;
 
-__sfr __at 0xFAC TXSTA;
-volatile __TXSTA_t __at 0xFAC TXSTAbits;
+__sfr __at (0xFAC) TXSTA;
+volatile __TXSTA_t __at (0xFAC) TXSTAbits;
 
-__sfr __at 0xFAD TXREG;
+__sfr __at (0xFAD) TXREG;
 
-__sfr __at 0xFAE RCREG;
+__sfr __at (0xFAE) RCREG;
 
-__sfr __at 0xFAF SPBRG;
+__sfr __at (0xFAF) SPBRG;
 
-__sfr __at 0xFB0 SPBRGH;
+__sfr __at (0xFB0) SPBRGH;
 
-__sfr __at 0xFB1 T3CON;
-volatile __T3CON_t __at 0xFB1 T3CONbits;
+__sfr __at (0xFB1) T3CON;
+volatile __T3CON_t __at (0xFB1) T3CONbits;
 
-__sfr __at 0xFB2 TMR3L;
+__sfr __at (0xFB2) TMR3L;
 
-__sfr __at 0xFB3 TMR3H;
+__sfr __at (0xFB3) TMR3H;
 
-__sfr __at 0xFB4 CMCON;
-volatile __CMCON_t __at 0xFB4 CMCONbits;
+__sfr __at (0xFB4) CMCON;
+volatile __CMCON_t __at (0xFB4) CMCONbits;
 
-__sfr __at 0xFB5 CVRCON;
-volatile __CVRCON_t __at 0xFB5 CVRCONbits;
+__sfr __at (0xFB5) CVRCON;
+volatile __CVRCON_t __at (0xFB5) CVRCONbits;
 
-__sfr __at 0xFB6 ECCP1AS;
-volatile __ECCP1AS_t __at 0xFB6 ECCP1ASbits;
+__sfr __at (0xFB6) ECCP1AS;
+volatile __ECCP1AS_t __at (0xFB6) ECCP1ASbits;
 
-__sfr __at 0xFB7 ECCP1DEL;
-volatile __ECCP1DEL_t __at 0xFB7 ECCP1DELbits;
+__sfr __at (0xFB7) ECCP1DEL;
+volatile __ECCP1DEL_t __at (0xFB7) ECCP1DELbits;
 
-__sfr __at 0xFB8 BAUDCON;
-volatile __BAUDCON_t __at 0xFB8 BAUDCONbits;
+__sfr __at (0xFB8) BAUDCON;
+volatile __BAUDCON_t __at (0xFB8) BAUDCONbits;
 
-__sfr __at 0xFBA CCP2CON;
-volatile __CCP2CON_t __at 0xFBA CCP2CONbits;
+__sfr __at (0xFBA) CCP2CON;
+volatile __CCP2CON_t __at (0xFBA) CCP2CONbits;
 
-__sfr __at 0xFBB CCPR2L;
+__sfr __at (0xFBB) CCPR2L;
 
-__sfr __at 0xFBC CCPR2H;
+__sfr __at (0xFBC) CCPR2H;
 
-__sfr __at 0xFBD CCP1CON;
-volatile __CCP1CON_t __at 0xFBD CCP1CONbits;
+__sfr __at (0xFBD) CCP1CON;
+volatile __CCP1CON_t __at (0xFBD) CCP1CONbits;
 
-__sfr __at 0xFBE CCPR1L;
+__sfr __at (0xFBE) CCPR1L;
 
-__sfr __at 0xFBF CCPR1H;
+__sfr __at (0xFBF) CCPR1H;
 
-__sfr __at 0xFC0 ADCON2;
-volatile __ADCON2_t __at 0xFC0 ADCON2bits;
+__sfr __at (0xFC0) ADCON2;
+volatile __ADCON2_t __at (0xFC0) ADCON2bits;
 
-__sfr __at 0xFC1 ADCON1;
-volatile __ADCON1_t __at 0xFC1 ADCON1bits;
+__sfr __at (0xFC1) ADCON1;
+volatile __ADCON1_t __at (0xFC1) ADCON1bits;
 
-__sfr __at 0xFC2 ADCON0;
-volatile __ADCON0_t __at 0xFC2 ADCON0bits;
+__sfr __at (0xFC2) ADCON0;
+volatile __ADCON0_t __at (0xFC2) ADCON0bits;
 
-__sfr __at 0xFC3 ADRESL;
+__sfr __at (0xFC3) ADRESL;
 
-__sfr __at 0xFC4 ADRESH;
+__sfr __at (0xFC4) ADRESH;
 
-__sfr __at 0xFC5 SSPCON2;
-volatile __SSPCON2_t __at 0xFC5 SSPCON2bits;
+__sfr __at (0xFC5) SSPCON2;
+volatile __SSPCON2_t __at (0xFC5) SSPCON2bits;
 
-__sfr __at 0xFC6 SSPCON1;
-volatile __SSPCON1_t __at 0xFC6 SSPCON1bits;
+__sfr __at (0xFC6) SSPCON1;
+volatile __SSPCON1_t __at (0xFC6) SSPCON1bits;
 
-__sfr __at 0xFC7 SSPSTAT;
-volatile __SSPSTAT_t __at 0xFC7 SSPSTATbits;
+__sfr __at (0xFC7) SSPSTAT;
+volatile __SSPSTAT_t __at (0xFC7) SSPSTATbits;
 
-__sfr __at 0xFC8 SSPADD;
+__sfr __at (0xFC8) SSPADD;
 
-__sfr __at 0xFC9 SSPBUF;
+__sfr __at (0xFC9) SSPBUF;
 
-__sfr __at 0xFCA T2CON;
-volatile __T2CON_t __at 0xFCA T2CONbits;
+__sfr __at (0xFCA) T2CON;
+volatile __T2CON_t __at (0xFCA) T2CONbits;
 
-__sfr __at 0xFCB PR2;
+__sfr __at (0xFCB) PR2;
 
-__sfr __at 0xFCC TMR2;
+__sfr __at (0xFCC) TMR2;
 
-__sfr __at 0xFCD T1CON;
-volatile __T1CON_t __at 0xFCD T1CONbits;
+__sfr __at (0xFCD) T1CON;
+volatile __T1CON_t __at (0xFCD) T1CONbits;
 
-__sfr __at 0xFCE TMR1L;
+__sfr __at (0xFCE) TMR1L;
 
-__sfr __at 0xFCF TMR1H;
+__sfr __at (0xFCF) TMR1H;
 
-__sfr __at 0xFD0 RCON;
-volatile __RCON_t __at 0xFD0 RCONbits;
+__sfr __at (0xFD0) RCON;
+volatile __RCON_t __at (0xFD0) RCONbits;
 
-__sfr __at 0xFD1 WDTCON;
-volatile __WDTCON_t __at 0xFD1 WDTCONbits;
+__sfr __at (0xFD1) WDTCON;
+volatile __WDTCON_t __at (0xFD1) WDTCONbits;
 
-__sfr __at 0xFD2 HLVDCON;
-volatile __HLVDCON_t __at 0xFD2 HLVDCONbits;
+__sfr __at (0xFD2) HLVDCON;
+volatile __HLVDCON_t __at (0xFD2) HLVDCONbits;
 
-__sfr __at 0xFD3 OSCCON;
-volatile __OSCCON_t __at 0xFD3 OSCCONbits;
+__sfr __at (0xFD3) OSCCON;
+volatile __OSCCON_t __at (0xFD3) OSCCONbits;
 
-__sfr __at 0xFD5 T0CON;
-volatile __T0CON_t __at 0xFD5 T0CONbits;
+__sfr __at (0xFD5) T0CON;
+volatile __T0CON_t __at (0xFD5) T0CONbits;
 
-__sfr __at 0xFD6 TMR0L;
+__sfr __at (0xFD6) TMR0L;
 
-__sfr __at 0xFD7 TMR0H;
+__sfr __at (0xFD7) TMR0H;
 
-__sfr __at 0xFD8 STATUS;
-volatile __STATUS_t __at 0xFD8 STATUSbits;
+__sfr __at (0xFD8) STATUS;
+volatile __STATUS_t __at (0xFD8) STATUSbits;
 
-__sfr __at 0xFD9 FSR2L;
+__sfr __at (0xFD9) FSR2L;
 
-__sfr __at 0xFDA FSR2H;
-volatile __FSR2H_t __at 0xFDA FSR2Hbits;
+__sfr __at (0xFDA) FSR2H;
+volatile __FSR2H_t __at (0xFDA) FSR2Hbits;
 
-__sfr __at 0xFDB PLUSW2;
+__sfr __at (0xFDB) PLUSW2;
 
-__sfr __at 0xFDC PREINC2;
+__sfr __at (0xFDC) PREINC2;
 
-__sfr __at 0xFDD POSTDEC2;
+__sfr __at (0xFDD) POSTDEC2;
 
-__sfr __at 0xFDE POSTINC2;
+__sfr __at (0xFDE) POSTINC2;
 
-__sfr __at 0xFDF INDF2;
+__sfr __at (0xFDF) INDF2;
 
-__sfr __at 0xFE0 BSR;
-volatile __BSR_t __at 0xFE0 BSRbits;
+__sfr __at (0xFE0) BSR;
+volatile __BSR_t __at (0xFE0) BSRbits;
 
-__sfr __at 0xFE1 FSR1L;
+__sfr __at (0xFE1) FSR1L;
 
-__sfr __at 0xFE2 FSR1H;
-volatile __FSR1H_t __at 0xFE2 FSR1Hbits;
+__sfr __at (0xFE2) FSR1H;
+volatile __FSR1H_t __at (0xFE2) FSR1Hbits;
 
-__sfr __at 0xFE3 PLUSW1;
+__sfr __at (0xFE3) PLUSW1;
 
-__sfr __at 0xFE4 PREINC1;
+__sfr __at (0xFE4) PREINC1;
 
-__sfr __at 0xFE5 POSTDEC1;
+__sfr __at (0xFE5) POSTDEC1;
 
-__sfr __at 0xFE6 POSTINC1;
+__sfr __at (0xFE6) POSTINC1;
 
-__sfr __at 0xFE7 INDF1;
+__sfr __at (0xFE7) INDF1;
 
-__sfr __at 0xFE8 WREG;
+__sfr __at (0xFE8) WREG;
 
-__sfr __at 0xFE9 FSR0L;
+__sfr __at (0xFE9) FSR0L;
 
-__sfr __at 0xFEA FSR0H;
-volatile __FSR0H_t __at 0xFEA FSR0Hbits;
+__sfr __at (0xFEA) FSR0H;
+volatile __FSR0H_t __at (0xFEA) FSR0Hbits;
 
-__sfr __at 0xFEB PLUSW0;
+__sfr __at (0xFEB) PLUSW0;
 
-__sfr __at 0xFEC PREINC0;
+__sfr __at (0xFEC) PREINC0;
 
-__sfr __at 0xFED POSTDEC0;
+__sfr __at (0xFED) POSTDEC0;
 
-__sfr __at 0xFEE POSTINC0;
+__sfr __at (0xFEE) POSTINC0;
 
-__sfr __at 0xFEF INDF0;
+__sfr __at (0xFEF) INDF0;
 
-__sfr __at 0xFF0 INTCON3;
-volatile __INTCON3_t __at 0xFF0 INTCON3bits;
+__sfr __at (0xFF0) INTCON3;
+volatile __INTCON3_t __at (0xFF0) INTCON3bits;
 
-__sfr __at 0xFF1 INTCON2;
-volatile __INTCON2_t __at 0xFF1 INTCON2bits;
+__sfr __at (0xFF1) INTCON2;
+volatile __INTCON2_t __at (0xFF1) INTCON2bits;
 
-__sfr __at 0xFF2 INTCON;
-volatile __INTCON_t __at 0xFF2 INTCONbits;
+__sfr __at (0xFF2) INTCON;
+volatile __INTCON_t __at (0xFF2) INTCONbits;
 
-__sfr __at 0xFF3 PRODL;
+__sfr __at (0xFF3) PRODL;
 
-__sfr __at 0xFF4 PRODH;
+__sfr __at (0xFF4) PRODH;
 
-__sfr __at 0xFF5 TABLAT;
+__sfr __at (0xFF5) TABLAT;
 
-__sfr __at 0xFF6 TBLPTRL;
+__sfr __at (0xFF6) TBLPTRL;
 
-__sfr __at 0xFF7 TBLPTRH;
+__sfr __at (0xFF7) TBLPTRH;
 
-__sfr __at 0xFF8 TBLPTRU;
-volatile __TBLPTRU_t __at 0xFF8 TBLPTRUbits;
+__sfr __at (0xFF8) TBLPTRU;
+volatile __TBLPTRU_t __at (0xFF8) TBLPTRUbits;
 
-__sfr __at 0xFF9 PCL;
+__sfr __at (0xFF9) PCL;
 
-__sfr __at 0xFFA PCLATH;
-volatile __PCLATH_t __at 0xFFA PCLATHbits;
+__sfr __at (0xFFA) PCLATH;
+volatile __PCLATH_t __at (0xFFA) PCLATHbits;
 
-__sfr __at 0xFFB PCLATU;
-volatile __PCLATU_t __at 0xFFB PCLATUbits;
+__sfr __at (0xFFB) PCLATU;
+volatile __PCLATU_t __at (0xFFB) PCLATUbits;
 
-__sfr __at 0xFFC STKPTR;
-volatile __STKPTR_t __at 0xFFC STKPTRbits;
+__sfr __at (0xFFC) STKPTR;
+volatile __STKPTR_t __at (0xFFC) STKPTRbits;
 
-__sfr __at 0xFFD TOSL;
+__sfr __at (0xFFD) TOSL;
 
-__sfr __at 0xFFE TOSH;
+__sfr __at (0xFFE) TOSH;
 
-__sfr __at 0xFFF TOSU;
-volatile __TOSU_t __at 0xFFF TOSUbits;
+__sfr __at (0xFFF) TOSU;
+volatile __TOSU_t __at (0xFFF) TOSUbits;
 

diff --git a/device/lib/pic16/libdev/pic18f258.c b/device/lib/pic16/libdev/pic18f258.c
index 0b73c2b3299d41567c919278220e60bd15533a8f..5f03ce1c57258ee61d4f6028be9a3f36143c1ad1 100644 (file)
--- a/device/lib/pic16/libdev/pic18f258.c
+++ b/device/lib/pic16/libdev/pic18f258.c
@@ -14,507 +14,507 @@
 
 #include <pic18f258.h>
 
-sfr at 0xf00 RXF0SIDH;
-volatile __RXF0SIDHbits_t at 0xf00 RXF0SIDHbits;
+__sfr __at (0xf00) RXF0SIDH;
+volatile __RXF0SIDHbits_t __at (0xf00) RXF0SIDHbits;
 
-sfr at 0xf01 RXF0SIDL;
-volatile __RXF0SIDLbits_t at 0xf01 RXF0SIDLbits;
+__sfr __at (0xf01) RXF0SIDL;
+volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-sfr at 0xf02 RXF0EIDH;
-volatile __RXF0EIDHbits_t at 0xf02 RXF0EIDHbits;
+__sfr __at (0xf02) RXF0EIDH;
+volatile __RXF0EIDHbits_t __at (0xf02) RXF0EIDHbits;
 
-sfr at 0xf03 RXF0EIDL;
-volatile __RXF0EIDLbits_t at 0xf03 RXF0EIDLbits;
+__sfr __at (0xf03) RXF0EIDL;
+volatile __RXF0EIDLbits_t __at (0xf03) RXF0EIDLbits;
 
-sfr at 0xf04 RXF1SIDH;
-volatile __RXF1SIDHbits_t at 0xf04 RXF1SIDHbits;
+__sfr __at (0xf04) RXF1SIDH;
+volatile __RXF1SIDHbits_t __at (0xf04) RXF1SIDHbits;
 
-sfr at 0xf05 RXF1SIDL;
-volatile __RXF1SIDLbits_t at 0xf05 RXF1SIDLbits;
+__sfr __at (0xf05) RXF1SIDL;
+volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-sfr at 0xf06 RXF1EIDH;
-volatile __RXF1EIDHbits_t at 0xf06 RXF1EIDHbits;
+__sfr __at (0xf06) RXF1EIDH;
+volatile __RXF1EIDHbits_t __at (0xf06) RXF1EIDHbits;
 
-sfr at 0xf07 RXF1EIDL;
-volatile __RXF1EIDLbits_t at 0xf07 RXF1EIDLbits;
+__sfr __at (0xf07) RXF1EIDL;
+volatile __RXF1EIDLbits_t __at (0xf07) RXF1EIDLbits;
 
-sfr at 0xf08 RXF2SIDH;
-volatile __RXF2SIDHbits_t at 0xf08 RXF2SIDHbits;
+__sfr __at (0xf08) RXF2SIDH;
+volatile __RXF2SIDHbits_t __at (0xf08) RXF2SIDHbits;
 
-sfr at 0xf09 RXF2SIDL;
-volatile __RXF2SIDLbits_t at 0xf09 RXF2SIDLbits;
+__sfr __at (0xf09) RXF2SIDL;
+volatile __RXF2SIDLbits_t __at (0xf09) RXF2SIDLbits;
 
-sfr at 0xf0a RXF2EIDH;
-volatile __RXF2EIDHbits_t at 0xf0a RXF2EIDHbits;
+__sfr __at (0xf0a) RXF2EIDH;
+volatile __RXF2EIDHbits_t __at (0xf0a) RXF2EIDHbits;
 
-sfr at 0xf0b RXF2EIDL;
-volatile __RXF2EIDLbits_t at 0xf0b RXF2EIDLbits;
+__sfr __at (0xf0b) RXF2EIDL;
+volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-sfr at 0xf0c RXF3SIDH;
-volatile __RXF3SIDHbits_t at 0xf0c RXF3SIDHbits;
+__sfr __at (0xf0c) RXF3SIDH;
+volatile __RXF3SIDHbits_t __at (0xf0c) RXF3SIDHbits;
 
-sfr at 0xf0d RXF3SIDL;
-volatile __RXF3SIDLbits_t at 0xf0d RXF3SIDLbits;
+__sfr __at (0xf0d) RXF3SIDL;
+volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-sfr at 0xf0e RXF3EIDH;
-volatile __RXF3EIDHbits_t at 0xf0e RXF3EIDHbits;
+__sfr __at (0xf0e) RXF3EIDH;
+volatile __RXF3EIDHbits_t __at (0xf0e) RXF3EIDHbits;
 
-sfr at 0xf0f RXF3EIDL;
-volatile __RXF3EIDLbits_t at 0xf0f RXF3EIDLbits;
+__sfr __at (0xf0f) RXF3EIDL;
+volatile __RXF3EIDLbits_t __at (0xf0f) RXF3EIDLbits;
 
-sfr at 0xf10 RXF4SIDH;
-volatile __RXF4SIDHbits_t at 0xf10 RXF4SIDHbits;
+__sfr __at (0xf10) RXF4SIDH;
+volatile __RXF4SIDHbits_t __at (0xf10) RXF4SIDHbits;
 
-sfr at 0xf11 RXF4SIDL;
-volatile __RXF4SIDLbits_t at 0xf11 RXF4SIDLbits;
+__sfr __at (0xf11) RXF4SIDL;
+volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-sfr at 0xf12 RXF4EIDH;
-volatile __RXF4EIDHbits_t at 0xf12 RXF4EIDHbits;
+__sfr __at (0xf12) RXF4EIDH;
+volatile __RXF4EIDHbits_t __at (0xf12) RXF4EIDHbits;
 
-sfr at 0xf13 RXF4EIDL;
-volatile __RXF4EIDLbits_t at 0xf13 RXF4EIDLbits;
+__sfr __at (0xf13) RXF4EIDL;
+volatile __RXF4EIDLbits_t __at (0xf13) RXF4EIDLbits;
 
-sfr at 0xf14 RXF5SIDH;
-volatile __RXF5SIDHbits_t at 0xf14 RXF5SIDHbits;
+__sfr __at (0xf14) RXF5SIDH;
+volatile __RXF5SIDHbits_t __at (0xf14) RXF5SIDHbits;
 
-sfr at 0xf15 RXF5SIDL;
-volatile __RXF5SIDLbits_t at 0xf15 RXF5SIDLbits;
+__sfr __at (0xf15) RXF5SIDL;
+volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-sfr at 0xf16 RXF5EIDH;
-volatile __RXF5EIDHbits_t at 0xf16 RXF5EIDHbits;
+__sfr __at (0xf16) RXF5EIDH;
+volatile __RXF5EIDHbits_t __at (0xf16) RXF5EIDHbits;
 
-sfr at 0xf17 RXF5EIDL;
-volatile __RXF5EIDLbits_t at 0xf17 RXF5EIDLbits;
+__sfr __at (0xf17) RXF5EIDL;
+volatile __RXF5EIDLbits_t __at (0xf17) RXF5EIDLbits;
 
-sfr at 0xf18 RXM0SIDH;
-volatile __RXM0SIDHbits_t at 0xf18 RXM0SIDHbits;
+__sfr __at (0xf18) RXM0SIDH;
+volatile __RXM0SIDHbits_t __at (0xf18) RXM0SIDHbits;
 
-sfr at 0xf19 RXM0SIDL;
-volatile __RXM0SIDLbits_t at 0xf19 RXM0SIDLbits;
+__sfr __at (0xf19) RXM0SIDL;
+volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-sfr at 0xf1a RXM0EIDH;
-volatile __RXM0EIDHbits_t at 0xf1a RXM0EIDHbits;
+__sfr __at (0xf1a) RXM0EIDH;
+volatile __RXM0EIDHbits_t __at (0xf1a) RXM0EIDHbits;
 
-sfr at 0xf1b RXM0EIDL;
-volatile __RXM0EIDLbits_t at 0xf1b RXM0EIDLbits;
+__sfr __at (0xf1b) RXM0EIDL;
+volatile __RXM0EIDLbits_t __at (0xf1b) RXM0EIDLbits;
 
-sfr at 0xf1c RXM1SIDH;
-volatile __RXM1SIDHbits_t at 0xf1c RXM1SIDHbits;
+__sfr __at (0xf1c) RXM1SIDH;
+volatile __RXM1SIDHbits_t __at (0xf1c) RXM1SIDHbits;
 
-sfr at 0xf1d RXM1SIDL;
-volatile __RXM1SIDLbits_t at 0xf1d RXM1SIDLbits;
+__sfr __at (0xf1d) RXM1SIDL;
+volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-sfr at 0xf1e RXM1EIDH;
-volatile __RXM1EIDHbits_t at 0xf1e RXM1EIDHbits;
+__sfr __at (0xf1e) RXM1EIDH;
+volatile __RXM1EIDHbits_t __at (0xf1e) RXM1EIDHbits;
 
-sfr at 0xf1f RXM1EIDL;
-volatile __RXM1EIDLbits_t at 0xf1f RXM1EIDLbits;
+__sfr __at (0xf1f) RXM1EIDL;
+volatile __RXM1EIDLbits_t __at (0xf1f) RXM1EIDLbits;
 
-sfr at 0xf20 TXB2CON;
-volatile __TXB2CONbits_t at 0xf20 TXB2CONbits;
+__sfr __at (0xf20) TXB2CON;
+volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-sfr at 0xf21 TXB2SIDH;
-volatile __TXB2SIDHbits_t at 0xf21 TXB2SIDHbits;
+__sfr __at (0xf21) TXB2SIDH;
+volatile __TXB2SIDHbits_t __at (0xf21) TXB2SIDHbits;
 
-sfr at 0xf22 TXB2SIDL;
-volatile __TXB2SIDLbits_t at 0xf22 TXB2SIDLbits;
+__sfr __at (0xf22) TXB2SIDL;
+volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-sfr at 0xf23 TXB2EIDH;
-volatile __TXB2EIDHbits_t at 0xf23 TXB2EIDHbits;
+__sfr __at (0xf23) TXB2EIDH;
+volatile __TXB2EIDHbits_t __at (0xf23) TXB2EIDHbits;
 
-sfr at 0xf24 TXB2EIDL;
-volatile __TXB2EIDLbits_t at 0xf24 TXB2EIDLbits;
+__sfr __at (0xf24) TXB2EIDL;
+volatile __TXB2EIDLbits_t __at (0xf24) TXB2EIDLbits;
 
-sfr at 0xf25 TXB2DLC;
-volatile __TXB2DLCbits_t at 0xf25 TXB2DLCbits;
+__sfr __at (0xf25) TXB2DLC;
+volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-sfr at 0xf26 TXB2D0;
-volatile __TXB2D0bits_t at 0xf26 TXB2D0bits;
+__sfr __at (0xf26) TXB2D0;
+volatile __TXB2D0bits_t __at (0xf26) TXB2D0bits;
 
-sfr at 0xf27 TXB2D1;
-volatile __TXB2D1bits_t at 0xf27 TXB2D1bits;
+__sfr __at (0xf27) TXB2D1;
+volatile __TXB2D1bits_t __at (0xf27) TXB2D1bits;
 
-sfr at 0xf28 TXB2D2;
-volatile __TXB2D2bits_t at 0xf28 TXB2D2bits;
+__sfr __at (0xf28) TXB2D2;
+volatile __TXB2D2bits_t __at (0xf28) TXB2D2bits;
 
-sfr at 0xf29 TXB2D3;
-volatile __TXB2D3bits_t at 0xf29 TXB2D3bits;
+__sfr __at (0xf29) TXB2D3;
+volatile __TXB2D3bits_t __at (0xf29) TXB2D3bits;
 
-sfr at 0xf2a TXB2D4;
-volatile __TXB2D4bits_t at 0xf2a TXB2D4bits;
+__sfr __at (0xf2a) TXB2D4;
+volatile __TXB2D4bits_t __at (0xf2a) TXB2D4bits;
 
-sfr at 0xf2b TXB2D5;
-volatile __TXB2D5bits_t at 0xf2b TXB2D5bits;
+__sfr __at (0xf2b) TXB2D5;
+volatile __TXB2D5bits_t __at (0xf2b) TXB2D5bits;
 
-sfr at 0xf2c TXB2D6;
-volatile __TXB2D6bits_t at 0xf2c TXB2D6bits;
+__sfr __at (0xf2c) TXB2D6;
+volatile __TXB2D6bits_t __at (0xf2c) TXB2D6bits;
 
-sfr at 0xf2d TXB2D7;
-volatile __TXB2D7bits_t at 0xf2d TXB2D7bits;
+__sfr __at (0xf2d) TXB2D7;
+volatile __TXB2D7bits_t __at (0xf2d) TXB2D7bits;
 
-sfr at 0xf2e CANSTATRO4;
-volatile __CANSTATRO4bits_t at 0xf2e CANSTATRO4bits;
+__sfr __at (0xf2e) CANSTATRO4;
+volatile __CANSTATRO4bits_t __at (0xf2e) CANSTATRO4bits;
 
-sfr at 0xf30 TXB1CON;
-volatile __TXB1CONbits_t at 0xf30 TXB1CONbits;
+__sfr __at (0xf30) TXB1CON;
+volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-sfr at 0xf31 TXB1SIDH;
-volatile __TXB1SIDHbits_t at 0xf31 TXB1SIDHbits;
+__sfr __at (0xf31) TXB1SIDH;
+volatile __TXB1SIDHbits_t __at (0xf31) TXB1SIDHbits;
 
-sfr at 0xf32 TXB1SIDL;
-volatile __TXB1SIDLbits_t at 0xf32 TXB1SIDLbits;
+__sfr __at (0xf32) TXB1SIDL;
+volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-sfr at 0xf33 TXB1EIDH;
-volatile __TXB1EIDHbits_t at 0xf33 TXB1EIDHbits;
+__sfr __at (0xf33) TXB1EIDH;
+volatile __TXB1EIDHbits_t __at (0xf33) TXB1EIDHbits;
 
-sfr at 0xf34 TXB1EIDL;
-volatile __TXB1EIDLbits_t at 0xf34 TXB1EIDLbits;
+__sfr __at (0xf34) TXB1EIDL;
+volatile __TXB1EIDLbits_t __at (0xf34) TXB1EIDLbits;
 
-sfr at 0xf35 TXB1DLC;
-volatile __TXB1DLCbits_t at 0xf35 TXB1DLCbits;
+__sfr __at (0xf35) TXB1DLC;
+volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-sfr at 0xf36 TXB1D0;
-volatile __TXB1D0bits_t at 0xf36 TXB1D0bits;
+__sfr __at (0xf36) TXB1D0;
+volatile __TXB1D0bits_t __at (0xf36) TXB1D0bits;
 
-sfr at 0xf37 TXB1D1;
-volatile __TXB1D1bits_t at 0xf37 TXB1D1bits;
+__sfr __at (0xf37) TXB1D1;
+volatile __TXB1D1bits_t __at (0xf37) TXB1D1bits;
 
-sfr at 0xf38 TXB1D2;
-volatile __TXB1D2bits_t at 0xf38 TXB1D2bits;
+__sfr __at (0xf38) TXB1D2;
+volatile __TXB1D2bits_t __at (0xf38) TXB1D2bits;
 
-sfr at 0xf39 TXB1D3;
-volatile __TXB1D3bits_t at 0xf39 TXB1D3bits;
+__sfr __at (0xf39) TXB1D3;
+volatile __TXB1D3bits_t __at (0xf39) TXB1D3bits;
 
-sfr at 0xf3a TXB1D4;
-volatile __TXB1D4bits_t at 0xf3a TXB1D4bits;
+__sfr __at (0xf3a) TXB1D4;
+volatile __TXB1D4bits_t __at (0xf3a) TXB1D4bits;
 
-sfr at 0xf3b TXB1D5;
-volatile __TXB1D5bits_t at 0xf3b TXB1D5bits;
+__sfr __at (0xf3b) TXB1D5;
+volatile __TXB1D5bits_t __at (0xf3b) TXB1D5bits;
 
-sfr at 0xf3c TXB1D6;
-volatile __TXB1D6bits_t at 0xf3c TXB1D6bits;
+__sfr __at (0xf3c) TXB1D6;
+volatile __TXB1D6bits_t __at (0xf3c) TXB1D6bits;
 
-sfr at 0xf3d TXB1D7;
-volatile __TXB1D7bits_t at 0xf3d TXB1D7bits;
+__sfr __at (0xf3d) TXB1D7;
+volatile __TXB1D7bits_t __at (0xf3d) TXB1D7bits;
 
-sfr at 0xf3e CANSTATRO3;
-volatile __CANSTATRO3bits_t at 0xf3e CANSTATRO3bits;
+__sfr __at (0xf3e) CANSTATRO3;
+volatile __CANSTATRO3bits_t __at (0xf3e) CANSTATRO3bits;
 
-sfr at 0xf40 TXB0CON;
-volatile __TXB0CONbits_t at 0xf40 TXB0CONbits;
+__sfr __at (0xf40) TXB0CON;
+volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-sfr at 0xf41 TXB0SIDH;
-volatile __TXB0SIDHbits_t at 0xf41 TXB0SIDHbits;
+__sfr __at (0xf41) TXB0SIDH;
+volatile __TXB0SIDHbits_t __at (0xf41) TXB0SIDHbits;
 
-sfr at 0xf42 TXB0SIDL;
-volatile __TXB0SIDLbits_t at 0xf42 TXB0SIDLbits;
+__sfr __at (0xf42) TXB0SIDL;
+volatile __TXB0SIDLbits_t __at (0xf42) TXB0SIDLbits;
 
-sfr at 0xf43 TXB0EIDH;
-volatile __TXB0EIDHbits_t at 0xf43 TXB0EIDHbits;
+__sfr __at (0xf43) TXB0EIDH;
+volatile __TXB0EIDHbits_t __at (0xf43) TXB0EIDHbits;
 
-sfr at 0xf44 TXB0EIDL;
-volatile __TXB0EIDLbits_t at 0xf44 TXB0EIDLbits;
+__sfr __at (0xf44) TXB0EIDL;
+volatile __TXB0EIDLbits_t __at (0xf44) TXB0EIDLbits;
 
-sfr at 0xf45 TXB0DLC;
-volatile __TXB0DLCbits_t at 0xf45 TXB0DLCbits;
+__sfr __at (0xf45) TXB0DLC;
+volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-sfr at 0xf46 TXB0D0;
-volatile __TXB0D0bits_t at 0xf46 TXB0D0bits;
+__sfr __at (0xf46) TXB0D0;
+volatile __TXB0D0bits_t __at (0xf46) TXB0D0bits;
 
-sfr at 0xf47 TXB0D1;
-volatile __TXB0D1bits_t at 0xf47 TXB0D1bits;
+__sfr __at (0xf47) TXB0D1;
+volatile __TXB0D1bits_t __at (0xf47) TXB0D1bits;
 
-sfr at 0xf48 TXB0D2;
-volatile __TXB0D2bits_t at 0xf48 TXB0D2bits;
+__sfr __at (0xf48) TXB0D2;
+volatile __TXB0D2bits_t __at (0xf48) TXB0D2bits;
 
-sfr at 0xf49 TXB0D3;
-volatile __TXB0D3bits_t at 0xf49 TXB0D3bits;
+__sfr __at (0xf49) TXB0D3;
+volatile __TXB0D3bits_t __at (0xf49) TXB0D3bits;
 
-sfr at 0xf4a TXB0D4;
-volatile __TXB0D4bits_t at 0xf4a TXB0D4bits;
+__sfr __at (0xf4a) TXB0D4;
+volatile __TXB0D4bits_t __at (0xf4a) TXB0D4bits;
 
-sfr at 0xf4b TXB0D5;
-volatile __TXB0D5bits_t at 0xf4b TXB0D5bits;
+__sfr __at (0xf4b) TXB0D5;
+volatile __TXB0D5bits_t __at (0xf4b) TXB0D5bits;
 
-sfr at 0xf4c TXB0D6;
-volatile __TXB0D6bits_t at 0xf4c TXB0D6bits;
+__sfr __at (0xf4c) TXB0D6;
+volatile __TXB0D6bits_t __at (0xf4c) TXB0D6bits;
 
-sfr at 0xf4d TXB0D7;
-volatile __TXB0D7bits_t at 0xf4d TXB0D7bits;
+__sfr __at (0xf4d) TXB0D7;
+volatile __TXB0D7bits_t __at (0xf4d) TXB0D7bits;
 
-sfr at 0xf4e CANSTATRO2;
-volatile __CANSTATRO2bits_t at 0xf4e CANSTATRO2bits;
+__sfr __at (0xf4e) CANSTATRO2;
+volatile __CANSTATRO2bits_t __at (0xf4e) CANSTATRO2bits;
 
-sfr at 0xf50 RXB1CON;
-volatile __RXB1CONbits_t at 0xf50 RXB1CONbits;
+__sfr __at (0xf50) RXB1CON;
+volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-sfr at 0xf51 RXB1SIDH;
-volatile __RXB1SIDHbits_t at 0xf51 RXB1SIDHbits;
+__sfr __at (0xf51) RXB1SIDH;
+volatile __RXB1SIDHbits_t __at (0xf51) RXB1SIDHbits;
 
-sfr at 0xf52 RXB1SIDL;
-volatile __RXB1SIDLbits_t at 0xf52 RXB1SIDLbits;
+__sfr __at (0xf52) RXB1SIDL;
+volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-sfr at 0xf53 RXB1EIDH;
-volatile __RXB1EIDHbits_t at 0xf53 RXB1EIDHbits;
+__sfr __at (0xf53) RXB1EIDH;
+volatile __RXB1EIDHbits_t __at (0xf53) RXB1EIDHbits;
 
-sfr at 0xf54 RXB1EIDL;
-volatile __RXB1EIDLbits_t at 0xf54 RXB1EIDLbits;
+__sfr __at (0xf54) RXB1EIDL;
+volatile __RXB1EIDLbits_t __at (0xf54) RXB1EIDLbits;
 
-sfr at 0xf55 RXB1DLC;
-volatile __RXB1DLCbits_t at 0xf55 RXB1DLCbits;
+__sfr __at (0xf55) RXB1DLC;
+volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-sfr at 0xf56 RXB1D0;
-volatile __RXB1D0bits_t at 0xf56 RXB1D0bits;
+__sfr __at (0xf56) RXB1D0;
+volatile __RXB1D0bits_t __at (0xf56) RXB1D0bits;
 
-sfr at 0xf57 RXB1D1;
-volatile __RXB1D1bits_t at 0xf57 RXB1D1bits;
+__sfr __at (0xf57) RXB1D1;
+volatile __RXB1D1bits_t __at (0xf57) RXB1D1bits;
 
-sfr at 0xf58 RXB1D2;
-volatile __RXB1D2bits_t at 0xf58 RXB1D2bits;
+__sfr __at (0xf58) RXB1D2;
+volatile __RXB1D2bits_t __at (0xf58) RXB1D2bits;
 
-sfr at 0xf59 RXB1D3;
-volatile __RXB1D3bits_t at 0xf59 RXB1D3bits;
+__sfr __at (0xf59) RXB1D3;
+volatile __RXB1D3bits_t __at (0xf59) RXB1D3bits;
 
-sfr at 0xf5a RXB1D4;
-volatile __RXB1D4bits_t at 0xf5a RXB1D4bits;
+__sfr __at (0xf5a) RXB1D4;
+volatile __RXB1D4bits_t __at (0xf5a) RXB1D4bits;
 
-sfr at 0xf5b RXB1D5;
-volatile __RXB1D5bits_t at 0xf5b RXB1D5bits;
+__sfr __at (0xf5b) RXB1D5;
+volatile __RXB1D5bits_t __at (0xf5b) RXB1D5bits;
 
-sfr at 0xf5c RXB1D6;
-volatile __RXB1D6bits_t at 0xf5c RXB1D6bits;
+__sfr __at (0xf5c) RXB1D6;
+volatile __RXB1D6bits_t __at (0xf5c) RXB1D6bits;
 
-sfr at 0xf5d RXB1D7;
-volatile __RXB1D7bits_t at 0xf5d RXB1D7bits;
+__sfr __at (0xf5d) RXB1D7;
+volatile __RXB1D7bits_t __at (0xf5d) RXB1D7bits;
 
-sfr at 0xf5e CANSTATRO1;
-volatile __CANSTATRO1bits_t at 0xf5e CANSTATRO1bits;
+__sfr __at (0xf5e) CANSTATRO1;
+volatile __CANSTATRO1bits_t __at (0xf5e) CANSTATRO1bits;
 
-sfr at 0xf60 RXB0CON;
-volatile __RXB0CONbits_t at 0xf60 RXB0CONbits;
+__sfr __at (0xf60) RXB0CON;
+volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-sfr at 0xf61 RXB0SIDH;
-volatile __RXB0SIDHbits_t at 0xf61 RXB0SIDHbits;
+__sfr __at (0xf61) RXB0SIDH;
+volatile __RXB0SIDHbits_t __at (0xf61) RXB0SIDHbits;
 
-sfr at 0xf62 RXB0SIDL;
-volatile __RXB0SIDLbits_t at 0xf62 RXB0SIDLbits;
+__sfr __at (0xf62) RXB0SIDL;
+volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-sfr at 0xf63 RXB0EIDH;
-volatile __RXB0EIDHbits_t at 0xf63 RXB0EIDHbits;
+__sfr __at (0xf63) RXB0EIDH;
+volatile __RXB0EIDHbits_t __at (0xf63) RXB0EIDHbits;
 
-sfr at 0xf64 RXB0EIDL;
-volatile __RXB0EIDLbits_t at 0xf64 RXB0EIDLbits;
+__sfr __at (0xf64) RXB0EIDL;
+volatile __RXB0EIDLbits_t __at (0xf64) RXB0EIDLbits;
 
-sfr at 0xf65 RXB0DLC;
-volatile __RXB0DLCbits_t at 0xf65 RXB0DLCbits;
+__sfr __at (0xf65) RXB0DLC;
+volatile __RXB0DLCbits_t __at (0xf65) RXB0DLCbits;
 
-sfr at 0xf66 RXB0D0;
-sfr at 0xf67 RXB0D1;
-sfr at 0xf68 RXB0D2;
-sfr at 0xf69 RXB0D3;
-sfr at 0xf6a RXB0D4;
-sfr at 0xf6b RXB0D5;
-sfr at 0xf6c RXB0D6;
-sfr at 0xf6d RXB0D7;
-sfr at 0xf6e CANSTAT;
-volatile __CANSTATbits_t at 0xf6e CANSTATbits;
+__sfr __at (0xf66) RXB0D0;
+__sfr __at (0xf67) RXB0D1;
+__sfr __at (0xf68) RXB0D2;
+__sfr __at (0xf69) RXB0D3;
+__sfr __at (0xf6a) RXB0D4;
+__sfr __at (0xf6b) RXB0D5;
+__sfr __at (0xf6c) RXB0D6;
+__sfr __at (0xf6d) RXB0D7;
+__sfr __at (0xf6e) CANSTAT;
+volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-sfr at 0xf6f CANCON;
-volatile __CANCONbits_t at 0xf6f CANCONbits;
+__sfr __at (0xf6f) CANCON;
+volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-sfr at 0xf70 BRGCON1;
-volatile __BRGCON1bits_t at 0xf70 BRGCON1bits;
+__sfr __at (0xf70) BRGCON1;
+volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-sfr at 0xf71 BRGCON2;
-volatile __BRGCON2bits_t at 0xf71 BRGCON2bits;
+__sfr __at (0xf71) BRGCON2;
+volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-sfr at 0xf72 BRGCON3;
-volatile __BRGCON3bits_t at 0xf72 BRGCON3bits;
+__sfr __at (0xf72) BRGCON3;
+volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-sfr at 0xf73 CIOCON;
-volatile __CIOCONbits_t at 0xf73 CIOCONbits;
+__sfr __at (0xf73) CIOCON;
+volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-sfr at 0xf74 COMSTAT;
-volatile __COMSTATbits_t at 0xf74 COMSTATbits;
+__sfr __at (0xf74) COMSTAT;
+volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-sfr at 0xf75 RXERRCNT;
-volatile __RXERRCNTbits_t at 0xf75 RXERRCNTbits;
+__sfr __at (0xf75) RXERRCNT;
+volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-sfr at 0xf76 TXERRCNT;
-volatile __TXERRCNTbits_t at 0xf76 TXERRCNTbits;
+__sfr __at (0xf76) TXERRCNT;
+volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
-
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
-
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
-
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
-
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
-
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
-
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
+
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
+
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
+
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
+
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
+
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
+
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f4331.c b/device/lib/pic16/libdev/pic18f4331.c
index a631d018202cf333285b8134337674922ba353e7..ba6192b4d0545957fc1a104ba2845924fac11f1f 100644 (file)
--- a/device/lib/pic16/libdev/pic18f4331.c
+++ b/device/lib/pic16/libdev/pic18f4331.c
@@ -16,376 +16,376 @@
 
 #include <pic18f4331.h>
 
-__sfr __at 0xF60 DFLTCON;
-volatile __DFLTCON_t __at 0xF60 DFLTCONbits;
+__sfr __at (0xF60) DFLTCON;
+volatile __DFLTCON_t __at (0xF60) DFLTCONbits;
 
-__sfr __at 0xF61 CAP3CON;
-volatile __CAP3CON_t __at 0xF61 CAP3CONbits;
+__sfr __at (0xF61) CAP3CON;
+volatile __CAP3CON_t __at (0xF61) CAP3CONbits;
 
-__sfr __at 0xF62 CAP2CON;
-volatile __CAP2CON_t __at 0xF62 CAP2CONbits;
+__sfr __at (0xF62) CAP2CON;
+volatile __CAP2CON_t __at (0xF62) CAP2CONbits;
 
-__sfr __at 0xF63 CAP1CON;
-volatile __CAP1CON_t __at 0xF63 CAP1CONbits;
+__sfr __at (0xF63) CAP1CON;
+volatile __CAP1CON_t __at (0xF63) CAP1CONbits;
 
-__sfr __at 0xF64 CAP3BUFL;
+__sfr __at (0xF64) CAP3BUFL;
 
-__sfr __at 0xF65 CAP3BUFH;
+__sfr __at (0xF65) CAP3BUFH;
 
-__sfr __at 0xF66 CAP2BUFL;
+__sfr __at (0xF66) CAP2BUFL;
 
-__sfr __at 0xF67 CAP2BUFH;
+__sfr __at (0xF67) CAP2BUFH;
 
-__sfr __at 0xF68 CAP1BUFL;
+__sfr __at (0xF68) CAP1BUFL;
 
-__sfr __at 0xF69 CAP1BUFH;
+__sfr __at (0xF69) CAP1BUFH;
 
-__sfr __at 0xF6A OVDCONS;
-volatile __OVDCONS_t __at 0xF6A OVDCONSbits;
+__sfr __at (0xF6A) OVDCONS;
+volatile __OVDCONS_t __at (0xF6A) OVDCONSbits;
 
-__sfr __at 0xF6B OVDCOND;
-volatile __OVDCOND_t __at 0xF6B OVDCONDbits;
+__sfr __at (0xF6B) OVDCOND;
+volatile __OVDCOND_t __at (0xF6B) OVDCONDbits;
 
-__sfr __at 0xF6C FLTCONFIG;
-volatile __FLTCONFIG_t __at 0xF6C FLTCONFIGbits;
+__sfr __at (0xF6C) FLTCONFIG;
+volatile __FLTCONFIG_t __at (0xF6C) FLTCONFIGbits;
 
-__sfr __at 0xF6D DTCON;
-volatile __DTCON_t __at 0xF6D DTCONbits;
+__sfr __at (0xF6D) DTCON;
+volatile __DTCON_t __at (0xF6D) DTCONbits;
 
-__sfr __at 0xF6E PWMCON1;
-volatile __PWMCON1_t __at 0xF6E PWMCON1bits;
+__sfr __at (0xF6E) PWMCON1;
+volatile __PWMCON1_t __at (0xF6E) PWMCON1bits;
 
-__sfr __at 0xF6F PWMCON0;
-volatile __PWMCON0_t __at 0xF6F PWMCON0bits;
+__sfr __at (0xF6F) PWMCON0;
+volatile __PWMCON0_t __at (0xF6F) PWMCON0bits;
 
-__sfr __at 0xF70 SEVTCMPH;
-volatile __SEVTCMPH_t __at 0xF70 SEVTCMPHbits;
+__sfr __at (0xF70) SEVTCMPH;
+volatile __SEVTCMPH_t __at (0xF70) SEVTCMPHbits;
 
-__sfr __at 0xF71 SEVTCMPL;
+__sfr __at (0xF71) SEVTCMPL;
 
-__sfr __at 0xF72 PDC3H;
-volatile __PDC3H_t __at 0xF72 PDC3Hbits;
+__sfr __at (0xF72) PDC3H;
+volatile __PDC3H_t __at (0xF72) PDC3Hbits;
 
-__sfr __at 0xF73 PDC3L;
+__sfr __at (0xF73) PDC3L;
 
-__sfr __at 0xF74 PDC2H;
-volatile __PDC2H_t __at 0xF74 PDC2Hbits;
+__sfr __at (0xF74) PDC2H;
+volatile __PDC2H_t __at (0xF74) PDC2Hbits;
 
-__sfr __at 0xF75 PDC2L;
+__sfr __at (0xF75) PDC2L;
 
-__sfr __at 0xF76 PDC1H;
-volatile __PDC1H_t __at 0xF76 PDC1Hbits;
+__sfr __at (0xF76) PDC1H;
+volatile __PDC1H_t __at (0xF76) PDC1Hbits;
 
-__sfr __at 0xF77 PDC1L;
+__sfr __at (0xF77) PDC1L;
 
-__sfr __at 0xF78 PDC0H;
-volatile __PDC0H_t __at 0xF78 PDC0Hbits;
+__sfr __at (0xF78) PDC0H;
+volatile __PDC0H_t __at (0xF78) PDC0Hbits;
 
-__sfr __at 0xF79 PDC0L;
+__sfr __at (0xF79) PDC0L;
 
-__sfr __at 0xF7A PTPERH;
-volatile __PTPERH_t __at 0xF7A PTPERHbits;
+__sfr __at (0xF7A) PTPERH;
+volatile __PTPERH_t __at (0xF7A) PTPERHbits;
 
-__sfr __at 0xF7B PTPERL;
+__sfr __at (0xF7B) PTPERL;
 
-__sfr __at 0xF7C PTMRH;
-volatile __PTMRH_t __at 0xF7C PTMRHbits;
+__sfr __at (0xF7C) PTMRH;
+volatile __PTMRH_t __at (0xF7C) PTMRHbits;
 
-__sfr __at 0xF7D PTMRL;
+__sfr __at (0xF7D) PTMRL;
 
-__sfr __at 0xF7E PTCON1;
-volatile __PTCON1_t __at 0xF7E PTCON1bits;
+__sfr __at (0xF7E) PTCON1;
+volatile __PTCON1_t __at (0xF7E) PTCON1bits;
 
-__sfr __at 0xF7F PTCON0;
-volatile __PTCON0_t __at 0xF7F PTCON0bits;
+__sfr __at (0xF7F) PTCON0;
+volatile __PTCON0_t __at (0xF7F) PTCON0bits;
 
-__sfr __at 0xF80 PORTA;
-volatile __PORTA_t __at 0xF80 PORTAbits;
+__sfr __at (0xF80) PORTA;
+volatile __PORTA_t __at (0xF80) PORTAbits;
 
-__sfr __at 0xF81 PORTB;
-volatile __PORTB_t __at 0xF81 PORTBbits;
+__sfr __at (0xF81) PORTB;
+volatile __PORTB_t __at (0xF81) PORTBbits;
 
-__sfr __at 0xF82 PORTC;
-volatile __PORTC_t __at 0xF82 PORTCbits;
+__sfr __at (0xF82) PORTC;
+volatile __PORTC_t __at (0xF82) PORTCbits;
 
-__sfr __at 0xF83 PORTD;
-volatile __PORTD_t __at 0xF83 PORTDbits;
+__sfr __at (0xF83) PORTD;
+volatile __PORTD_t __at (0xF83) PORTDbits;
 
-__sfr __at 0xF84 PORTE;
-volatile __PORTE_t __at 0xF84 PORTEbits;
+__sfr __at (0xF84) PORTE;
+volatile __PORTE_t __at (0xF84) PORTEbits;
 
-__sfr __at 0xF87 TMR5L;
+__sfr __at (0xF87) TMR5L;
 
-__sfr __at 0xF88 TMR5H;
+__sfr __at (0xF88) TMR5H;
 
-__sfr __at 0xF89 LATA;
-volatile __LATA_t __at 0xF89 LATAbits;
+__sfr __at (0xF89) LATA;
+volatile __LATA_t __at (0xF89) LATAbits;
 
-__sfr __at 0xF8A LATB;
-volatile __LATB_t __at 0xF8A LATBbits;
+__sfr __at (0xF8A) LATB;
+volatile __LATB_t __at (0xF8A) LATBbits;
 
-__sfr __at 0xF8B LATC;
-volatile __LATC_t __at 0xF8B LATCbits;
+__sfr __at (0xF8B) LATC;
+volatile __LATC_t __at (0xF8B) LATCbits;
 
-__sfr __at 0xF8C LATD;
-volatile __LATD_t __at 0xF8C LATDbits;
+__sfr __at (0xF8C) LATD;
+volatile __LATD_t __at (0xF8C) LATDbits;
 
-__sfr __at 0xF8D LATE;
-volatile __LATE_t __at 0xF8D LATEbits;
+__sfr __at (0xF8D) LATE;
+volatile __LATE_t __at (0xF8D) LATEbits;
 
-__sfr __at 0xF90 PR5L;
+__sfr __at (0xF90) PR5L;
 
-__sfr __at 0xF91 PR5H;
+__sfr __at (0xF91) PR5H;
 
-__sfr __at 0xF92 TRISA;
-volatile __TRISA_t __at 0xF92 TRISAbits;
+__sfr __at (0xF92) TRISA;
+volatile __TRISA_t __at (0xF92) TRISAbits;
 
-__sfr __at 0xF93 TRISB;
-volatile __TRISB_t __at 0xF93 TRISBbits;
+__sfr __at (0xF93) TRISB;
+volatile __TRISB_t __at (0xF93) TRISBbits;
 
-__sfr __at 0xF94 TRISC;
-volatile __TRISC_t __at 0xF94 TRISCbits;
+__sfr __at (0xF94) TRISC;
+volatile __TRISC_t __at (0xF94) TRISCbits;
 
-__sfr __at 0xF95 TRISD;
-volatile __TRISD_t __at 0xF95 TRISDbits;
+__sfr __at (0xF95) TRISD;
+volatile __TRISD_t __at (0xF95) TRISDbits;
 
-__sfr __at 0xF96 TRISE;
-volatile __TRISE_t __at 0xF96 TRISEbits;
+__sfr __at (0xF96) TRISE;
+volatile __TRISE_t __at (0xF96) TRISEbits;
 
-__sfr __at 0xF99 ADCHS;
-volatile __ADCHS_t __at 0xF99 ADCHSbits;
+__sfr __at (0xF99) ADCHS;
+volatile __ADCHS_t __at (0xF99) ADCHSbits;
 
-__sfr __at 0xF9A ADCON3;
-volatile __ADCON3_t __at 0xF9A ADCON3bits;
+__sfr __at (0xF9A) ADCON3;
+volatile __ADCON3_t __at (0xF9A) ADCON3bits;
 
-__sfr __at 0xF9B OSCTUNE;
-volatile __OSCTUNE_t __at 0xF9B OSCTUNEbits;
+__sfr __at (0xF9B) OSCTUNE;
+volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;
 
-__sfr __at 0xF9D PIE1;
-volatile __PIE1_t __at 0xF9D PIE1bits;
+__sfr __at (0xF9D) PIE1;
+volatile __PIE1_t __at (0xF9D) PIE1bits;
 
-__sfr __at 0xF9E PIR1;
-volatile __PIR1_t __at 0xF9E PIR1bits;
+__sfr __at (0xF9E) PIR1;
+volatile __PIR1_t __at (0xF9E) PIR1bits;
 
-__sfr __at 0xF9F IPR1;
-volatile __IPR1_t __at 0xF9F IPR1bits;
+__sfr __at (0xF9F) IPR1;
+volatile __IPR1_t __at (0xF9F) IPR1bits;
 
-__sfr __at 0xFA0 PIE2;
-volatile __PIE2_t __at 0xFA0 PIE2bits;
+__sfr __at (0xFA0) PIE2;
+volatile __PIE2_t __at (0xFA0) PIE2bits;
 
-__sfr __at 0xFA1 PIR2;
-volatile __PIR2_t __at 0xFA1 PIR2bits;
+__sfr __at (0xFA1) PIR2;
+volatile __PIR2_t __at (0xFA1) PIR2bits;
 
-__sfr __at 0xFA2 IPR2;
-volatile __IPR2_t __at 0xFA2 IPR2bits;
+__sfr __at (0xFA2) IPR2;
+volatile __IPR2_t __at (0xFA2) IPR2bits;
 
-__sfr __at 0xFA3 PIE3;
-volatile __PIE3_t __at 0xFA3 PIE3bits;
+__sfr __at (0xFA3) PIE3;
+volatile __PIE3_t __at (0xFA3) PIE3bits;
 
-__sfr __at 0xFA4 PIR3;
-volatile __PIR3_t __at 0xFA4 PIR3bits;
+__sfr __at (0xFA4) PIR3;
+volatile __PIR3_t __at (0xFA4) PIR3bits;
 
-__sfr __at 0xFA5 IPR3;
-volatile __IPR3_t __at 0xFA5 IPR3bits;
+__sfr __at (0xFA5) IPR3;
+volatile __IPR3_t __at (0xFA5) IPR3bits;
 
-__sfr __at 0xFA6 EECON1;
-volatile __EECON1_t __at 0xFA6 EECON1bits;
+__sfr __at (0xFA6) EECON1;
+volatile __EECON1_t __at (0xFA6) EECON1bits;
 
-__sfr __at 0xFA7 EECON2;
+__sfr __at (0xFA7) EECON2;
 
-__sfr __at 0xFA8 EEDATA;
+__sfr __at (0xFA8) EEDATA;
 
-__sfr __at 0xFA9 EEADR;
+__sfr __at (0xFA9) EEADR;
 
-__sfr __at 0xFAA BAUDCTL;
-volatile __BAUDCTL_t __at 0xFAA BAUDCTLbits;
+__sfr __at (0xFAA) BAUDCTL;
+volatile __BAUDCTL_t __at (0xFAA) BAUDCTLbits;
 
-__sfr __at 0xFAB RCSTA;
-volatile __RCSTA_t __at 0xFAB RCSTAbits;
+__sfr __at (0xFAB) RCSTA;
+volatile __RCSTA_t __at (0xFAB) RCSTAbits;
 
-__sfr __at 0xFAC TXSTA;
-volatile __TXSTA_t __at 0xFAC TXSTAbits;
+__sfr __at (0xFAC) TXSTA;
+volatile __TXSTA_t __at (0xFAC) TXSTAbits;
 
-__sfr __at 0xFAD TXREG;
+__sfr __at (0xFAD) TXREG;
 
-__sfr __at 0xFAE RCREG;
+__sfr __at (0xFAE) RCREG;
 
-__sfr __at 0xFAF SPBRG;
+__sfr __at (0xFAF) SPBRG;
 
-__sfr __at 0xFB0 SPBRGH;
+__sfr __at (0xFB0) SPBRGH;
 
-__sfr __at 0xFB6 QEICON;
-volatile __QEICON_t __at 0xFB6 QEICONbits;
+__sfr __at (0xFB6) QEICON;
+volatile __QEICON_t __at (0xFB6) QEICONbits;
 
-__sfr __at 0xFB7 T5CON;
-volatile __T5CON_t __at 0xFB7 T5CONbits;
+__sfr __at (0xFB7) T5CON;
+volatile __T5CON_t __at (0xFB7) T5CONbits;
 
-__sfr __at 0xFB8 ANSEL0;
-volatile __ANSEL0_t __at 0xFB8 ANSEL0bits;
+__sfr __at (0xFB8) ANSEL0;
+volatile __ANSEL0_t __at (0xFB8) ANSEL0bits;
 
-__sfr __at 0xFB9 ANSEL1;
-volatile __ANSEL1_t __at 0xFB9 ANSEL1bits;
+__sfr __at (0xFB9) ANSEL1;
+volatile __ANSEL1_t __at (0xFB9) ANSEL1bits;
 
-__sfr __at 0xFBA CCP2CON;
-volatile __CCP2CON_t __at 0xFBA CCP2CONbits;
+__sfr __at (0xFBA) CCP2CON;
+volatile __CCP2CON_t __at (0xFBA) CCP2CONbits;
 
-__sfr __at 0xFBB CCPR2L;
+__sfr __at (0xFBB) CCPR2L;
 
-__sfr __at 0xFBC CCPR2H;
+__sfr __at (0xFBC) CCPR2H;
 
-__sfr __at 0xFBD CCP1CON;
-volatile __CCP1CON_t __at 0xFBD CCP1CONbits;
+__sfr __at (0xFBD) CCP1CON;
+volatile __CCP1CON_t __at (0xFBD) CCP1CONbits;
 
-__sfr __at 0xFBE CCPR1L;
+__sfr __at (0xFBE) CCPR1L;
 
-__sfr __at 0xFBF CCPR1H;
+__sfr __at (0xFBF) CCPR1H;
 
-__sfr __at 0xFC0 ADCON2;
-volatile __ADCON2_t __at 0xFC0 ADCON2bits;
+__sfr __at (0xFC0) ADCON2;
+volatile __ADCON2_t __at (0xFC0) ADCON2bits;
 
-__sfr __at 0xFC1 ADCON1;
-volatile __ADCON1_t __at 0xFC1 ADCON1bits;
+__sfr __at (0xFC1) ADCON1;
+volatile __ADCON1_t __at (0xFC1) ADCON1bits;
 
-__sfr __at 0xFC2 ADCON0;
-volatile __ADCON0_t __at 0xFC2 ADCON0bits;
+__sfr __at (0xFC2) ADCON0;
+volatile __ADCON0_t __at (0xFC2) ADCON0bits;
 
-__sfr __at 0xFC3 ADRESL;
+__sfr __at (0xFC3) ADRESL;
 
-__sfr __at 0xFC4 ADRESH;
+__sfr __at (0xFC4) ADRESH;
 
-__sfr __at 0xFC6 SSPCON;
-volatile __SSPCON_t __at 0xFC6 SSPCONbits;
+__sfr __at (0xFC6) SSPCON;
+volatile __SSPCON_t __at (0xFC6) SSPCONbits;
 
-__sfr __at 0xFC7 SSPSTAT;
-volatile __SSPSTAT_t __at 0xFC7 SSPSTATbits;
+__sfr __at (0xFC7) SSPSTAT;
+volatile __SSPSTAT_t __at (0xFC7) SSPSTATbits;
 
-__sfr __at 0xFC8 SSPADD;
+__sfr __at (0xFC8) SSPADD;
 
-__sfr __at 0xFC9 SSPBUF;
+__sfr __at (0xFC9) SSPBUF;
 
-__sfr __at 0xFCA T2CON;
-volatile __T2CON_t __at 0xFCA T2CONbits;
+__sfr __at (0xFCA) T2CON;
+volatile __T2CON_t __at (0xFCA) T2CONbits;
 
-__sfr __at 0xFCB PR2;
+__sfr __at (0xFCB) PR2;
 
-__sfr __at 0xFCC TMR2;
+__sfr __at (0xFCC) TMR2;
 
-__sfr __at 0xFCD T1CON;
-volatile __T1CON_t __at 0xFCD T1CONbits;
+__sfr __at (0xFCD) T1CON;
+volatile __T1CON_t __at (0xFCD) T1CONbits;
 
-__sfr __at 0xFCE TMR1L;
+__sfr __at (0xFCE) TMR1L;
 
-__sfr __at 0xFCF TMR1H;
+__sfr __at (0xFCF) TMR1H;
 
-__sfr __at 0xFD0 RCON;
-volatile __RCON_t __at 0xFD0 RCONbits;
+__sfr __at (0xFD0) RCON;
+volatile __RCON_t __at (0xFD0) RCONbits;
 
-__sfr __at 0xFD1 WDTCON;
-volatile __WDTCON_t __at 0xFD1 WDTCONbits;
+__sfr __at (0xFD1) WDTCON;
+volatile __WDTCON_t __at (0xFD1) WDTCONbits;
 
-__sfr __at 0xFD2 LVDCON;
-volatile __LVDCON_t __at 0xFD2 LVDCONbits;
+__sfr __at (0xFD2) LVDCON;
+volatile __LVDCON_t __at (0xFD2) LVDCONbits;
 
-__sfr __at 0xFD3 OSCCON;
-volatile __OSCCON_t __at 0xFD3 OSCCONbits;
+__sfr __at (0xFD3) OSCCON;
+volatile __OSCCON_t __at (0xFD3) OSCCONbits;
 
-__sfr __at 0xFD5 T0CON;
-volatile __T0CON_t __at 0xFD5 T0CONbits;
+__sfr __at (0xFD5) T0CON;
+volatile __T0CON_t __at (0xFD5) T0CONbits;
 
-__sfr __at 0xFD6 TMR0L;
+__sfr __at (0xFD6) TMR0L;
 
-__sfr __at 0xFD7 TMR0H;
+__sfr __at (0xFD7) TMR0H;
 
-__sfr __at 0xFD8 STATUS;
-volatile __STATUS_t __at 0xFD8 STATUSbits;
+__sfr __at (0xFD8) STATUS;
+volatile __STATUS_t __at (0xFD8) STATUSbits;
 
-__sfr __at 0xFD9 FSR2L;
+__sfr __at (0xFD9) FSR2L;
 
-__sfr __at 0xFDA FSR2H;
-volatile __FSR2H_t __at 0xFDA FSR2Hbits;
+__sfr __at (0xFDA) FSR2H;
+volatile __FSR2H_t __at (0xFDA) FSR2Hbits;
 
-__sfr __at 0xFDB PLUSW2;
+__sfr __at (0xFDB) PLUSW2;
 
-__sfr __at 0xFDC PREINC2;
+__sfr __at (0xFDC) PREINC2;
 
-__sfr __at 0xFDD POSTDEC2;
+__sfr __at (0xFDD) POSTDEC2;
 
-__sfr __at 0xFDE POSTINC2;
+__sfr __at (0xFDE) POSTINC2;
 
-__sfr __at 0xFDF INDF2;
+__sfr __at (0xFDF) INDF2;
 
-__sfr __at 0xFE0 BSR;
-volatile __BSR_t __at 0xFE0 BSRbits;
+__sfr __at (0xFE0) BSR;
+volatile __BSR_t __at (0xFE0) BSRbits;
 
-__sfr __at 0xFE1 FSR1L;
+__sfr __at (0xFE1) FSR1L;
 
-__sfr __at 0xFE2 FSR1H;
-volatile __FSR1H_t __at 0xFE2 FSR1Hbits;
+__sfr __at (0xFE2) FSR1H;
+volatile __FSR1H_t __at (0xFE2) FSR1Hbits;
 
-__sfr __at 0xFE3 PLUSW1;
+__sfr __at (0xFE3) PLUSW1;
 
-__sfr __at 0xFE4 PREINC1;
+__sfr __at (0xFE4) PREINC1;
 
-__sfr __at 0xFE5 POSTDEC1;
+__sfr __at (0xFE5) POSTDEC1;
 
-__sfr __at 0xFE6 POSTINC1;
+__sfr __at (0xFE6) POSTINC1;
 
-__sfr __at 0xFE7 INDF1;
+__sfr __at (0xFE7) INDF1;
 
-__sfr __at 0xFE8 WREG;
+__sfr __at (0xFE8) WREG;
 
-__sfr __at 0xFE9 FSR0L;
+__sfr __at (0xFE9) FSR0L;
 
-__sfr __at 0xFEA FSR0H;
-volatile __FSR0H_t __at 0xFEA FSR0Hbits;
+__sfr __at (0xFEA) FSR0H;
+volatile __FSR0H_t __at (0xFEA) FSR0Hbits;
 
-__sfr __at 0xFEB PLUSW0;
+__sfr __at (0xFEB) PLUSW0;
 
-__sfr __at 0xFEC PREINC0;
+__sfr __at (0xFEC) PREINC0;
 
-__sfr __at 0xFED POSTDEC0;
+__sfr __at (0xFED) POSTDEC0;
 
-__sfr __at 0xFEE POSTINC0;
+__sfr __at (0xFEE) POSTINC0;
 
-__sfr __at 0xFEF INDF0;
+__sfr __at (0xFEF) INDF0;
 
-__sfr __at 0xFF0 INTCON3;
-volatile __INTCON3_t __at 0xFF0 INTCON3bits;
+__sfr __at (0xFF0) INTCON3;
+volatile __INTCON3_t __at (0xFF0) INTCON3bits;
 
-__sfr __at 0xFF1 INTCON2;
-volatile __INTCON2_t __at 0xFF1 INTCON2bits;
+__sfr __at (0xFF1) INTCON2;
+volatile __INTCON2_t __at (0xFF1) INTCON2bits;
 
-__sfr __at 0xFF2 INTCON;
-volatile __INTCON_t __at 0xFF2 INTCONbits;
+__sfr __at (0xFF2) INTCON;
+volatile __INTCON_t __at (0xFF2) INTCONbits;
 
-__sfr __at 0xFF3 PRODL;
+__sfr __at (0xFF3) PRODL;
 
-__sfr __at 0xFF4 PRODH;
+__sfr __at (0xFF4) PRODH;
 
-__sfr __at 0xFF5 TABLAT;
+__sfr __at (0xFF5) TABLAT;
 
-__sfr __at 0xFF6 TBLPTRL;
+__sfr __at (0xFF6) TBLPTRL;
 
-__sfr __at 0xFF7 TBLPTRH;
+__sfr __at (0xFF7) TBLPTRH;
 
-__sfr __at 0xFF8 TBLPTRU;
-volatile __TBLPTRU_t __at 0xFF8 TBLPTRUbits;
+__sfr __at (0xFF8) TBLPTRU;
+volatile __TBLPTRU_t __at (0xFF8) TBLPTRUbits;
 
-__sfr __at 0xFF9 PCL;
+__sfr __at (0xFF9) PCL;
 
-__sfr __at 0xFFA PCLATH;
-volatile __PCLATH_t __at 0xFFA PCLATHbits;
+__sfr __at (0xFFA) PCLATH;
+volatile __PCLATH_t __at (0xFFA) PCLATHbits;
 
-__sfr __at 0xFFB PCLATU;
-volatile __PCLATU_t __at 0xFFB PCLATUbits;
+__sfr __at (0xFFB) PCLATU;
+volatile __PCLATU_t __at (0xFFB) PCLATUbits;
 
-__sfr __at 0xFFC STKPTR;
-volatile __STKPTR_t __at 0xFFC STKPTRbits;
+__sfr __at (0xFFC) STKPTR;
+volatile __STKPTR_t __at (0xFFC) STKPTRbits;
 
-__sfr __at 0xFFD TOSL;
+__sfr __at (0xFFD) TOSL;
 
-__sfr __at 0xFFE TOSH;
+__sfr __at (0xFFE) TOSH;
 
-__sfr __at 0xFFF TOSU;
-volatile __TOSU_t __at 0xFFF TOSUbits;
+__sfr __at (0xFFF) TOSU;
+volatile __TOSU_t __at (0xFFF) TOSUbits;
 

diff --git a/device/lib/pic16/libdev/pic18f442.c b/device/lib/pic16/libdev/pic18f442.c
index 75c5c798f3316ba2d317d23720786f249165693f..bebadf42312e321ac9e2a3ba8e825bd627eac39a 100644 (file)
--- a/device/lib/pic16/libdev/pic18f442.c
+++ b/device/lib/pic16/libdev/pic18f442.c
@@ -14,194 +14,194 @@
 
 #include <pic18f442.h>
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
-
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
-
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
+
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
+
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
 
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
-
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-volatile __T0CONbits_t at 0xfd5 T0CONbits;
-
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
+
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+volatile __T0CONbits_t __at (0xfd5) T0CONbits;
+
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f4455.c b/device/lib/pic16/libdev/pic18f4455.c
index 235618afe60caa3cd6ac1e16dda1390cdac034aa..0e98cd4e0ebbe86798f13b8811b3916b7c59660b 100644 (file)
--- a/device/lib/pic16/libdev/pic18f4455.c
+++ b/device/lib/pic16/libdev/pic18f4455.c
@@ -16,370 +16,370 @@
 
 #include <pic18f4455.h>
 
-__sfr __at 0xF62 SPPDATA;
-volatile __SPPDATA_t __at 0xF62 SPPDATAbits;
+__sfr __at (0xF62) SPPDATA;
+volatile __SPPDATA_t __at (0xF62) SPPDATAbits;
 
-__sfr __at 0xF63 SPPCFG;
-volatile __SPPCFG_t __at 0xF63 SPPCFGbits;
+__sfr __at (0xF63) SPPCFG;
+volatile __SPPCFG_t __at (0xF63) SPPCFGbits;
 
-__sfr __at 0xF64 SPPEPS;
-volatile __SPPEPS_t __at 0xF64 SPPEPSbits;
+__sfr __at (0xF64) SPPEPS;
+volatile __SPPEPS_t __at (0xF64) SPPEPSbits;
 
-__sfr __at 0xF65 SPPCON;
-volatile __SPPCON_t __at 0xF65 SPPCONbits;
+__sfr __at (0xF65) SPPCON;
+volatile __SPPCON_t __at (0xF65) SPPCONbits;
 
-__sfr __at 0xF66 UFRML;
-volatile __UFRML_t __at 0xF66 UFRMLbits;
+__sfr __at (0xF66) UFRML;
+volatile __UFRML_t __at (0xF66) UFRMLbits;
 
-__sfr __at 0xF67 UFRMH;
-volatile __UFRMH_t __at 0xF67 UFRMHbits;
+__sfr __at (0xF67) UFRMH;
+volatile __UFRMH_t __at (0xF67) UFRMHbits;
 
-__sfr __at 0xF68 UIR;
-volatile __UIR_t __at 0xF68 UIRbits;
+__sfr __at (0xF68) UIR;
+volatile __UIR_t __at (0xF68) UIRbits;
 
-__sfr __at 0xF69 UIE;
-volatile __UIE_t __at 0xF69 UIEbits;
+__sfr __at (0xF69) UIE;
+volatile __UIE_t __at (0xF69) UIEbits;
 
-__sfr __at 0xF6A UEIR;
-volatile __UEIR_t __at 0xF6A UEIRbits;
+__sfr __at (0xF6A) UEIR;
+volatile __UEIR_t __at (0xF6A) UEIRbits;
 
-__sfr __at 0xF6B UEIE;
-volatile __UEIE_t __at 0xF6B UEIEbits;
+__sfr __at (0xF6B) UEIE;
+volatile __UEIE_t __at (0xF6B) UEIEbits;
 
-__sfr __at 0xF6C USTAT;
-volatile __USTAT_t __at 0xF6C USTATbits;
+__sfr __at (0xF6C) USTAT;
+volatile __USTAT_t __at (0xF6C) USTATbits;
 
-__sfr __at 0xF6D UCON;
-volatile __UCON_t __at 0xF6D UCONbits;
+__sfr __at (0xF6D) UCON;
+volatile __UCON_t __at (0xF6D) UCONbits;
 
-__sfr __at 0xF6E UADDR;
-volatile __UADDR_t __at 0xF6E UADDRbits;
+__sfr __at (0xF6E) UADDR;
+volatile __UADDR_t __at (0xF6E) UADDRbits;
 
-__sfr __at 0xF6F UCFG;
-volatile __UCFG_t __at 0xF6F UCFGbits;
+__sfr __at (0xF6F) UCFG;
+volatile __UCFG_t __at (0xF6F) UCFGbits;
 
-__sfr __at 0xF70 UEP0;
-volatile __UEP0_t __at 0xF70 UEP0bits;
+__sfr __at (0xF70) UEP0;
+volatile __UEP0_t __at (0xF70) UEP0bits;
 
-__sfr __at 0xF71 UEP1;
-volatile __UEP1_t __at 0xF71 UEP1bits;
+__sfr __at (0xF71) UEP1;
+volatile __UEP1_t __at (0xF71) UEP1bits;
 
-__sfr __at 0xF72 UEP2;
-volatile __UEP2_t __at 0xF72 UEP2bits;
+__sfr __at (0xF72) UEP2;
+volatile __UEP2_t __at (0xF72) UEP2bits;
 
-__sfr __at 0xF73 UEP3;
-volatile __UEP3_t __at 0xF73 UEP3bits;
+__sfr __at (0xF73) UEP3;
+volatile __UEP3_t __at (0xF73) UEP3bits;
 
-__sfr __at 0xF74 UEP4;
-volatile __UEP4_t __at 0xF74 UEP4bits;
+__sfr __at (0xF74) UEP4;
+volatile __UEP4_t __at (0xF74) UEP4bits;
 
-__sfr __at 0xF75 UEP5;
-volatile __UEP5_t __at 0xF75 UEP5bits;
+__sfr __at (0xF75) UEP5;
+volatile __UEP5_t __at (0xF75) UEP5bits;
 
-__sfr __at 0xF76 UEP6;
-volatile __UEP6_t __at 0xF76 UEP6bits;
+__sfr __at (0xF76) UEP6;
+volatile __UEP6_t __at (0xF76) UEP6bits;
 
-__sfr __at 0xF77 UEP7;
-volatile __UEP7_t __at 0xF77 UEP7bits;
+__sfr __at (0xF77) UEP7;
+volatile __UEP7_t __at (0xF77) UEP7bits;
 
-__sfr __at 0xF78 UEP8;
-volatile __UEP8_t __at 0xF78 UEP8bits;
+__sfr __at (0xF78) UEP8;
+volatile __UEP8_t __at (0xF78) UEP8bits;
 
-__sfr __at 0xF79 UEP9;
-volatile __UEP9_t __at 0xF79 UEP9bits;
+__sfr __at (0xF79) UEP9;
+volatile __UEP9_t __at (0xF79) UEP9bits;
 
-__sfr __at 0xF7A UEP10;
-volatile __UEP10_t __at 0xF7A UEP10bits;
+__sfr __at (0xF7A) UEP10;
+volatile __UEP10_t __at (0xF7A) UEP10bits;
 
-__sfr __at 0xF7B UEP11;
-volatile __UEP11_t __at 0xF7B UEP11bits;
+__sfr __at (0xF7B) UEP11;
+volatile __UEP11_t __at (0xF7B) UEP11bits;
 
-__sfr __at 0xF7C UEP12;
-volatile __UEP12_t __at 0xF7C UEP12bits;
+__sfr __at (0xF7C) UEP12;
+volatile __UEP12_t __at (0xF7C) UEP12bits;
 
-__sfr __at 0xF7D UEP13;
-volatile __UEP13_t __at 0xF7D UEP13bits;
+__sfr __at (0xF7D) UEP13;
+volatile __UEP13_t __at (0xF7D) UEP13bits;
 
-__sfr __at 0xF7E UEP14;
-volatile __UEP14_t __at 0xF7E UEP14bits;
+__sfr __at (0xF7E) UEP14;
+volatile __UEP14_t __at (0xF7E) UEP14bits;
 
-__sfr __at 0xF7F UEP15;
-volatile __UEP15_t __at 0xF7F UEP15bits;
+__sfr __at (0xF7F) UEP15;
+volatile __UEP15_t __at (0xF7F) UEP15bits;
 
-__sfr __at 0xF80 PORTA;
-volatile __PORTA_t __at 0xF80 PORTAbits;
+__sfr __at (0xF80) PORTA;
+volatile __PORTA_t __at (0xF80) PORTAbits;
 
-__sfr __at 0xF81 PORTB;
-volatile __PORTB_t __at 0xF81 PORTBbits;
+__sfr __at (0xF81) PORTB;
+volatile __PORTB_t __at (0xF81) PORTBbits;
 
-__sfr __at 0xF82 PORTC;
-volatile __PORTC_t __at 0xF82 PORTCbits;
+__sfr __at (0xF82) PORTC;
+volatile __PORTC_t __at (0xF82) PORTCbits;
 
-__sfr __at 0xF83 PORTD;
-volatile __PORTD_t __at 0xF83 PORTDbits;
+__sfr __at (0xF83) PORTD;
+volatile __PORTD_t __at (0xF83) PORTDbits;
 
-__sfr __at 0xF84 PORTE;
-volatile __PORTE_t __at 0xF84 PORTEbits;
+__sfr __at (0xF84) PORTE;
+volatile __PORTE_t __at (0xF84) PORTEbits;
 
-__sfr __at 0xF89 LATA;
-volatile __LATA_t __at 0xF89 LATAbits;
+__sfr __at (0xF89) LATA;
+volatile __LATA_t __at (0xF89) LATAbits;
 
-__sfr __at 0xF8A LATB;
-volatile __LATB_t __at 0xF8A LATBbits;
+__sfr __at (0xF8A) LATB;
+volatile __LATB_t __at (0xF8A) LATBbits;
 
-__sfr __at 0xF8B LATC;
-volatile __LATC_t __at 0xF8B LATCbits;
+__sfr __at (0xF8B) LATC;
+volatile __LATC_t __at (0xF8B) LATCbits;
 
-__sfr __at 0xF8C LATD;
-volatile __LATD_t __at 0xF8C LATDbits;
+__sfr __at (0xF8C) LATD;
+volatile __LATD_t __at (0xF8C) LATDbits;
 
-__sfr __at 0xF8D LATE;
-volatile __LATE_t __at 0xF8D LATEbits;
+__sfr __at (0xF8D) LATE;
+volatile __LATE_t __at (0xF8D) LATEbits;
 
-__sfr __at 0xF92 TRISA;
-volatile __TRISA_t __at 0xF92 TRISAbits;
+__sfr __at (0xF92) TRISA;
+volatile __TRISA_t __at (0xF92) TRISAbits;
 
-__sfr __at 0xF93 TRISB;
-volatile __TRISB_t __at 0xF93 TRISBbits;
+__sfr __at (0xF93) TRISB;
+volatile __TRISB_t __at (0xF93) TRISBbits;
 
-__sfr __at 0xF94 TRISC;
-volatile __TRISC_t __at 0xF94 TRISCbits;
+__sfr __at (0xF94) TRISC;
+volatile __TRISC_t __at (0xF94) TRISCbits;
 
-__sfr __at 0xF95 TRISD;
-volatile __TRISD_t __at 0xF95 TRISDbits;
+__sfr __at (0xF95) TRISD;
+volatile __TRISD_t __at (0xF95) TRISDbits;
 
-__sfr __at 0xF96 TRISE;
-volatile __TRISE_t __at 0xF96 TRISEbits;
+__sfr __at (0xF96) TRISE;
+volatile __TRISE_t __at (0xF96) TRISEbits;
 
-__sfr __at 0xF9B OSCTUNE;
-volatile __OSCTUNE_t __at 0xF9B OSCTUNEbits;
+__sfr __at (0xF9B) OSCTUNE;
+volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;
 
-__sfr __at 0xF9D PIE1;
-volatile __PIE1_t __at 0xF9D PIE1bits;
+__sfr __at (0xF9D) PIE1;
+volatile __PIE1_t __at (0xF9D) PIE1bits;
 
-__sfr __at 0xF9E PIR1;
-volatile __PIR1_t __at 0xF9E PIR1bits;
+__sfr __at (0xF9E) PIR1;
+volatile __PIR1_t __at (0xF9E) PIR1bits;
 
-__sfr __at 0xF9F IPR1;
-volatile __IPR1_t __at 0xF9F IPR1bits;
+__sfr __at (0xF9F) IPR1;
+volatile __IPR1_t __at (0xF9F) IPR1bits;
 
-__sfr __at 0xFA0 PIE2;
-volatile __PIE2_t __at 0xFA0 PIE2bits;
+__sfr __at (0xFA0) PIE2;
+volatile __PIE2_t __at (0xFA0) PIE2bits;
 
-__sfr __at 0xFA1 PIR2;
-volatile __PIR2_t __at 0xFA1 PIR2bits;
+__sfr __at (0xFA1) PIR2;
+volatile __PIR2_t __at (0xFA1) PIR2bits;
 
-__sfr __at 0xFA2 IPR2;
-volatile __IPR2_t __at 0xFA2 IPR2bits;
+__sfr __at (0xFA2) IPR2;
+volatile __IPR2_t __at (0xFA2) IPR2bits;
 
-__sfr __at 0xFA6 EECON1;
-volatile __EECON1_t __at 0xFA6 EECON1bits;
+__sfr __at (0xFA6) EECON1;
+volatile __EECON1_t __at (0xFA6) EECON1bits;
 
-__sfr __at 0xFA7 EECON2;
+__sfr __at (0xFA7) EECON2;
 
-__sfr __at 0xFA8 EEDATA;
+__sfr __at (0xFA8) EEDATA;
 
-__sfr __at 0xFA9 EEADR;
+__sfr __at (0xFA9) EEADR;
 
-__sfr __at 0xFAB RCSTA;
-volatile __RCSTA_t __at 0xFAB RCSTAbits;
+__sfr __at (0xFAB) RCSTA;
+volatile __RCSTA_t __at (0xFAB) RCSTAbits;
 
-__sfr __at 0xFAC TXSTA;
-volatile __TXSTA_t __at 0xFAC TXSTAbits;
+__sfr __at (0xFAC) TXSTA;
+volatile __TXSTA_t __at (0xFAC) TXSTAbits;
 
-__sfr __at 0xFAD TXREG;
+__sfr __at (0xFAD) TXREG;
 
-__sfr __at 0xFAE RCREG;
+__sfr __at (0xFAE) RCREG;
 
-__sfr __at 0xFAF SPBRG;
+__sfr __at (0xFAF) SPBRG;
 
-__sfr __at 0xFB0 SPBRGH;
+__sfr __at (0xFB0) SPBRGH;
 
-__sfr __at 0xFB1 T3CON;
-volatile __T3CON_t __at 0xFB1 T3CONbits;
+__sfr __at (0xFB1) T3CON;
+volatile __T3CON_t __at (0xFB1) T3CONbits;
 
-__sfr __at 0xFB2 TMR3L;
+__sfr __at (0xFB2) TMR3L;
 
-__sfr __at 0xFB3 TMR3H;
+__sfr __at (0xFB3) TMR3H;
 
-__sfr __at 0xFB4 CMCON;
-volatile __CMCON_t __at 0xFB4 CMCONbits;
+__sfr __at (0xFB4) CMCON;
+volatile __CMCON_t __at (0xFB4) CMCONbits;
 
-__sfr __at 0xFB5 CVRCON;
-volatile __CVRCON_t __at 0xFB5 CVRCONbits;
+__sfr __at (0xFB5) CVRCON;
+volatile __CVRCON_t __at (0xFB5) CVRCONbits;
 
-__sfr __at 0xFB6 ECCP1AS;
-volatile __ECCP1AS_t __at 0xFB6 ECCP1ASbits;
+__sfr __at (0xFB6) ECCP1AS;
+volatile __ECCP1AS_t __at (0xFB6) ECCP1ASbits;
 
-__sfr __at 0xFB7 ECCP1DEL;
-volatile __ECCP1DEL_t __at 0xFB7 ECCP1DELbits;
+__sfr __at (0xFB7) ECCP1DEL;
+volatile __ECCP1DEL_t __at (0xFB7) ECCP1DELbits;
 
-__sfr __at 0xFB8 BAUDCON;
-volatile __BAUDCON_t __at 0xFB8 BAUDCONbits;
+__sfr __at (0xFB8) BAUDCON;
+volatile __BAUDCON_t __at (0xFB8) BAUDCONbits;
 
-__sfr __at 0xFBA CCP2CON;
-volatile __CCP2CON_t __at 0xFBA CCP2CONbits;
+__sfr __at (0xFBA) CCP2CON;
+volatile __CCP2CON_t __at (0xFBA) CCP2CONbits;
 
-__sfr __at 0xFBB CCPR2L;
+__sfr __at (0xFBB) CCPR2L;
 
-__sfr __at 0xFBC CCPR2H;
+__sfr __at (0xFBC) CCPR2H;
 
-__sfr __at 0xFBD ECCP1CON;
-volatile __ECCP1CON_t __at 0xFBD ECCP1CONbits;
+__sfr __at (0xFBD) ECCP1CON;
+volatile __ECCP1CON_t __at (0xFBD) ECCP1CONbits;
 
-__sfr __at 0xFBE CCPR1L;
+__sfr __at (0xFBE) CCPR1L;
 
-__sfr __at 0xFBF CCPR1H;
+__sfr __at (0xFBF) CCPR1H;
 
-__sfr __at 0xFC0 ADCON2;
-volatile __ADCON2_t __at 0xFC0 ADCON2bits;
+__sfr __at (0xFC0) ADCON2;
+volatile __ADCON2_t __at (0xFC0) ADCON2bits;
 
-__sfr __at 0xFC1 ADCON1;
-volatile __ADCON1_t __at 0xFC1 ADCON1bits;
+__sfr __at (0xFC1) ADCON1;
+volatile __ADCON1_t __at (0xFC1) ADCON1bits;
 
-__sfr __at 0xFC2 ADCON0;
-volatile __ADCON0_t __at 0xFC2 ADCON0bits;
+__sfr __at (0xFC2) ADCON0;
+volatile __ADCON0_t __at (0xFC2) ADCON0bits;
 
-__sfr __at 0xFC3 ADRESL;
+__sfr __at (0xFC3) ADRESL;
 
-__sfr __at 0xFC4 ADRESH;
+__sfr __at (0xFC4) ADRESH;
 
-__sfr __at 0xFC5 SSPCON2;
-volatile __SSPCON2_t __at 0xFC5 SSPCON2bits;
+__sfr __at (0xFC5) SSPCON2;
+volatile __SSPCON2_t __at (0xFC5) SSPCON2bits;
 
-__sfr __at 0xFC6 SSPCON1;
-volatile __SSPCON1_t __at 0xFC6 SSPCON1bits;
+__sfr __at (0xFC6) SSPCON1;
+volatile __SSPCON1_t __at (0xFC6) SSPCON1bits;
 
-__sfr __at 0xFC7 SSPSTAT;
-volatile __SSPSTAT_t __at 0xFC7 SSPSTATbits;
+__sfr __at (0xFC7) SSPSTAT;
+volatile __SSPSTAT_t __at (0xFC7) SSPSTATbits;
 
-__sfr __at 0xFC8 SSPADD;
+__sfr __at (0xFC8) SSPADD;
 
-__sfr __at 0xFC9 SSPBUF;
+__sfr __at (0xFC9) SSPBUF;
 
-__sfr __at 0xFCA T2CON;
-volatile __T2CON_t __at 0xFCA T2CONbits;
+__sfr __at (0xFCA) T2CON;
+volatile __T2CON_t __at (0xFCA) T2CONbits;
 
-__sfr __at 0xFCB PR2;
+__sfr __at (0xFCB) PR2;
 
-__sfr __at 0xFCC TMR2;
+__sfr __at (0xFCC) TMR2;
 
-__sfr __at 0xFCD T1CON;
-volatile __T1CON_t __at 0xFCD T1CONbits;
+__sfr __at (0xFCD) T1CON;
+volatile __T1CON_t __at (0xFCD) T1CONbits;
 
-__sfr __at 0xFCE TMR1L;
+__sfr __at (0xFCE) TMR1L;
 
-__sfr __at 0xFCF TMR1H;
+__sfr __at (0xFCF) TMR1H;
 
-__sfr __at 0xFD0 RCON;
-volatile __RCON_t __at 0xFD0 RCONbits;
+__sfr __at (0xFD0) RCON;
+volatile __RCON_t __at (0xFD0) RCONbits;
 
-__sfr __at 0xFD1 WDTCON;
-volatile __WDTCON_t __at 0xFD1 WDTCONbits;
+__sfr __at (0xFD1) WDTCON;
+volatile __WDTCON_t __at (0xFD1) WDTCONbits;
 
-__sfr __at 0xFD2 HLVDCON;
-volatile __HLVDCON_t __at 0xFD2 HLVDCONbits;
+__sfr __at (0xFD2) HLVDCON;
+volatile __HLVDCON_t __at (0xFD2) HLVDCONbits;
 
-__sfr __at 0xFD3 OSCCON;
-volatile __OSCCON_t __at 0xFD3 OSCCONbits;
+__sfr __at (0xFD3) OSCCON;
+volatile __OSCCON_t __at (0xFD3) OSCCONbits;
 
-__sfr __at 0xFD5 T0CON;
-volatile __T0CON_t __at 0xFD5 T0CONbits;
+__sfr __at (0xFD5) T0CON;
+volatile __T0CON_t __at (0xFD5) T0CONbits;
 
-__sfr __at 0xFD6 TMR0L;
+__sfr __at (0xFD6) TMR0L;
 
-__sfr __at 0xFD7 TMR0H;
+__sfr __at (0xFD7) TMR0H;
 
-__sfr __at 0xFD8 STATUS;
-volatile __STATUS_t __at 0xFD8 STATUSbits;
+__sfr __at (0xFD8) STATUS;
+volatile __STATUS_t __at (0xFD8) STATUSbits;
 
-__sfr __at 0xFD9 FSR2L;
+__sfr __at (0xFD9) FSR2L;
 
-__sfr __at 0xFDA FSR2H;
-volatile __FSR2H_t __at 0xFDA FSR2Hbits;
+__sfr __at (0xFDA) FSR2H;
+volatile __FSR2H_t __at (0xFDA) FSR2Hbits;
 
-__sfr __at 0xFDB PLUSW2;
+__sfr __at (0xFDB) PLUSW2;
 
-__sfr __at 0xFDC PREINC2;
+__sfr __at (0xFDC) PREINC2;
 
-__sfr __at 0xFDD POSTDEC2;
+__sfr __at (0xFDD) POSTDEC2;
 
-__sfr __at 0xFDE POSTINC2;
+__sfr __at (0xFDE) POSTINC2;
 
-__sfr __at 0xFDF INDF2;
+__sfr __at (0xFDF) INDF2;
 
-__sfr __at 0xFE0 BSR;
-volatile __BSR_t __at 0xFE0 BSRbits;
+__sfr __at (0xFE0) BSR;
+volatile __BSR_t __at (0xFE0) BSRbits;
 
-__sfr __at 0xFE1 FSR1L;
+__sfr __at (0xFE1) FSR1L;
 
-__sfr __at 0xFE2 FSR1H;
-volatile __FSR1H_t __at 0xFE2 FSR1Hbits;
+__sfr __at (0xFE2) FSR1H;
+volatile __FSR1H_t __at (0xFE2) FSR1Hbits;
 
-__sfr __at 0xFE3 PLUSW1;
+__sfr __at (0xFE3) PLUSW1;
 
-__sfr __at 0xFE4 PREINC1;
+__sfr __at (0xFE4) PREINC1;
 
-__sfr __at 0xFE5 POSTDEC1;
+__sfr __at (0xFE5) POSTDEC1;
 
-__sfr __at 0xFE6 POSTINC1;
+__sfr __at (0xFE6) POSTINC1;
 
-__sfr __at 0xFE7 INDF1;
+__sfr __at (0xFE7) INDF1;
 
-__sfr __at 0xFE8 WREG;
+__sfr __at (0xFE8) WREG;
 
-__sfr __at 0xFE9 FSR0L;
+__sfr __at (0xFE9) FSR0L;
 
-__sfr __at 0xFEA FSR0H;
-volatile __FSR0H_t __at 0xFEA FSR0Hbits;
+__sfr __at (0xFEA) FSR0H;
+volatile __FSR0H_t __at (0xFEA) FSR0Hbits;
 
-__sfr __at 0xFEB PLUSW0;
+__sfr __at (0xFEB) PLUSW0;
 
-__sfr __at 0xFEC PREINC0;
+__sfr __at (0xFEC) PREINC0;
 
-__sfr __at 0xFED POSTDEC0;
+__sfr __at (0xFED) POSTDEC0;
 
-__sfr __at 0xFEE POSTINC0;
+__sfr __at (0xFEE) POSTINC0;
 
-__sfr __at 0xFEF INDF0;
+__sfr __at (0xFEF) INDF0;
 
-__sfr __at 0xFF0 INTCON3;
-volatile __INTCON3_t __at 0xFF0 INTCON3bits;
+__sfr __at (0xFF0) INTCON3;
+volatile __INTCON3_t __at (0xFF0) INTCON3bits;
 
-__sfr __at 0xFF1 INTCON2;
-volatile __INTCON2_t __at 0xFF1 INTCON2bits;
+__sfr __at (0xFF1) INTCON2;
+volatile __INTCON2_t __at (0xFF1) INTCON2bits;
 
-__sfr __at 0xFF2 INTCON;
-volatile __INTCON_t __at 0xFF2 INTCONbits;
+__sfr __at (0xFF2) INTCON;
+volatile __INTCON_t __at (0xFF2) INTCONbits;
 
-__sfr __at 0xFF3 PRODL;
+__sfr __at (0xFF3) PRODL;
 
-__sfr __at 0xFF4 PRODH;
+__sfr __at (0xFF4) PRODH;
 
-__sfr __at 0xFF5 TABLAT;
+__sfr __at (0xFF5) TABLAT;
 
-__sfr __at 0xFF6 TBLPTRL;
+__sfr __at (0xFF6) TBLPTRL;
 
-__sfr __at 0xFF7 TBLPTRH;
+__sfr __at (0xFF7) TBLPTRH;
 
-__sfr __at 0xFF8 TBLPTRU;
-volatile __TBLPTRU_t __at 0xFF8 TBLPTRUbits;
+__sfr __at (0xFF8) TBLPTRU;
+volatile __TBLPTRU_t __at (0xFF8) TBLPTRUbits;
 
-__sfr __at 0xFF9 PCL;
+__sfr __at (0xFF9) PCL;
 
-__sfr __at 0xFFA PCLATH;
-volatile __PCLATH_t __at 0xFFA PCLATHbits;
+__sfr __at (0xFFA) PCLATH;
+volatile __PCLATH_t __at (0xFFA) PCLATHbits;
 
-__sfr __at 0xFFB PCLATU;
-volatile __PCLATU_t __at 0xFFB PCLATUbits;
+__sfr __at (0xFFB) PCLATU;
+volatile __PCLATU_t __at (0xFFB) PCLATUbits;
 
-__sfr __at 0xFFC STKPTR;
-volatile __STKPTR_t __at 0xFFC STKPTRbits;
+__sfr __at (0xFFC) STKPTR;
+volatile __STKPTR_t __at (0xFFC) STKPTRbits;
 
-__sfr __at 0xFFD TOSL;
+__sfr __at (0xFFD) TOSL;
 
-__sfr __at 0xFFE TOSH;
+__sfr __at (0xFFE) TOSH;
 
-__sfr __at 0xFFF TOSU;
-volatile __TOSU_t __at 0xFFF TOSUbits;
+__sfr __at (0xFFF) TOSU;
+volatile __TOSU_t __at (0xFFF) TOSUbits;
 

diff --git a/device/lib/pic16/libdev/pic18f448.c b/device/lib/pic16/libdev/pic18f448.c
index 84fe46a731b24e08528f5493d520a8f317f48aa9..c976dcf2ac701c0c54cf2d2b050776b27392d118 100644 (file)
--- a/device/lib/pic16/libdev/pic18f448.c
+++ b/device/lib/pic16/libdev/pic18f448.c
@@ -14,545 +14,545 @@
 
 #include <pic18f448.h>
 
-sfr at 0xf00 RXF0SIDH;
-volatile __RXF0SIDHbits_t at 0xf00 RXF0SIDHbits;
+__sfr __at (0xf00) RXF0SIDH;
+volatile __RXF0SIDHbits_t __at (0xf00) RXF0SIDHbits;
 
-sfr at 0xf01 RXF0SIDL;
-volatile __RXF0SIDLbits_t at 0xf01 RXF0SIDLbits;
+__sfr __at (0xf01) RXF0SIDL;
+volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-sfr at 0xf02 RXF0EIDH;
-volatile __RXF0EIDHbits_t at 0xf02 RXF0EIDHbits;
+__sfr __at (0xf02) RXF0EIDH;
+volatile __RXF0EIDHbits_t __at (0xf02) RXF0EIDHbits;
 
-sfr at 0xf03 RXF0EIDL;
-volatile __RXF0EIDLbits_t at 0xf03 RXF0EIDLbits;
+__sfr __at (0xf03) RXF0EIDL;
+volatile __RXF0EIDLbits_t __at (0xf03) RXF0EIDLbits;
 
-sfr at 0xf04 RXF1SIDH;
-volatile __RXF1SIDHbits_t at 0xf04 RXF1SIDHbits;
+__sfr __at (0xf04) RXF1SIDH;
+volatile __RXF1SIDHbits_t __at (0xf04) RXF1SIDHbits;
 
-sfr at 0xf05 RXF1SIDL;
-volatile __RXF1SIDLbits_t at 0xf05 RXF1SIDLbits;
+__sfr __at (0xf05) RXF1SIDL;
+volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-sfr at 0xf06 RXF1EIDH;
-volatile __RXF1EIDHbits_t at 0xf06 RXF1EIDHbits;
+__sfr __at (0xf06) RXF1EIDH;
+volatile __RXF1EIDHbits_t __at (0xf06) RXF1EIDHbits;
 
-sfr at 0xf07 RXF1EIDL;
-volatile __RXF1EIDLbits_t at 0xf07 RXF1EIDLbits;
+__sfr __at (0xf07) RXF1EIDL;
+volatile __RXF1EIDLbits_t __at (0xf07) RXF1EIDLbits;
 
-sfr at 0xf08 RXF2SIDH;
-volatile __RXF2SIDHbits_t at 0xf08 RXF2SIDHbits;
+__sfr __at (0xf08) RXF2SIDH;
+volatile __RXF2SIDHbits_t __at (0xf08) RXF2SIDHbits;
 
-sfr at 0xf09 RXF2SIDL;
-volatile __RXF2SIDLbits_t at 0xf09 RXF2SIDLbits;
+__sfr __at (0xf09) RXF2SIDL;
+volatile __RXF2SIDLbits_t __at (0xf09) RXF2SIDLbits;
 
-sfr at 0xf0a RXF2EIDH;
-volatile __RXF2EIDHbits_t at 0xf0a RXF2EIDHbits;
+__sfr __at (0xf0a) RXF2EIDH;
+volatile __RXF2EIDHbits_t __at (0xf0a) RXF2EIDHbits;
 
-sfr at 0xf0b RXF2EIDL;
-volatile __RXF2EIDLbits_t at 0xf0b RXF2EIDLbits;
+__sfr __at (0xf0b) RXF2EIDL;
+volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-sfr at 0xf0c RXF3SIDH;
-volatile __RXF3SIDHbits_t at 0xf0c RXF3SIDHbits;
+__sfr __at (0xf0c) RXF3SIDH;
+volatile __RXF3SIDHbits_t __at (0xf0c) RXF3SIDHbits;
 
-sfr at 0xf0d RXF3SIDL;
-volatile __RXF3SIDLbits_t at 0xf0d RXF3SIDLbits;
+__sfr __at (0xf0d) RXF3SIDL;
+volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-sfr at 0xf0e RXF3EIDH;
-volatile __RXF3EIDHbits_t at 0xf0e RXF3EIDHbits;
+__sfr __at (0xf0e) RXF3EIDH;
+volatile __RXF3EIDHbits_t __at (0xf0e) RXF3EIDHbits;
 
-sfr at 0xf0f RXF3EIDL;
-volatile __RXF3EIDLbits_t at 0xf0f RXF3EIDLbits;
+__sfr __at (0xf0f) RXF3EIDL;
+volatile __RXF3EIDLbits_t __at (0xf0f) RXF3EIDLbits;
 
-sfr at 0xf10 RXF4SIDH;
-volatile __RXF4SIDHbits_t at 0xf10 RXF4SIDHbits;
+__sfr __at (0xf10) RXF4SIDH;
+volatile __RXF4SIDHbits_t __at (0xf10) RXF4SIDHbits;
 
-sfr at 0xf11 RXF4SIDL;
-volatile __RXF4SIDLbits_t at 0xf11 RXF4SIDLbits;
+__sfr __at (0xf11) RXF4SIDL;
+volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-sfr at 0xf12 RXF4EIDH;
-volatile __RXF4EIDHbits_t at 0xf12 RXF4EIDHbits;
+__sfr __at (0xf12) RXF4EIDH;
+volatile __RXF4EIDHbits_t __at (0xf12) RXF4EIDHbits;
 
-sfr at 0xf13 RXF4EIDL;
-volatile __RXF4EIDLbits_t at 0xf13 RXF4EIDLbits;
+__sfr __at (0xf13) RXF4EIDL;
+volatile __RXF4EIDLbits_t __at (0xf13) RXF4EIDLbits;
 
-sfr at 0xf14 RXF5SIDH;
-volatile __RXF5SIDHbits_t at 0xf14 RXF5SIDHbits;
+__sfr __at (0xf14) RXF5SIDH;
+volatile __RXF5SIDHbits_t __at (0xf14) RXF5SIDHbits;
 
-sfr at 0xf15 RXF5SIDL;
-volatile __RXF5SIDLbits_t at 0xf15 RXF5SIDLbits;
+__sfr __at (0xf15) RXF5SIDL;
+volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-sfr at 0xf16 RXF5EIDH;
-volatile __RXF5EIDHbits_t at 0xf16 RXF5EIDHbits;
+__sfr __at (0xf16) RXF5EIDH;
+volatile __RXF5EIDHbits_t __at (0xf16) RXF5EIDHbits;
 
-sfr at 0xf17 RXF5EIDL;
-volatile __RXF5EIDLbits_t at 0xf17 RXF5EIDLbits;
+__sfr __at (0xf17) RXF5EIDL;
+volatile __RXF5EIDLbits_t __at (0xf17) RXF5EIDLbits;
 
-sfr at 0xf18 RXM0SIDH;
-volatile __RXM0SIDHbits_t at 0xf18 RXM0SIDHbits;
+__sfr __at (0xf18) RXM0SIDH;
+volatile __RXM0SIDHbits_t __at (0xf18) RXM0SIDHbits;
 
-sfr at 0xf19 RXM0SIDL;
-volatile __RXM0SIDLbits_t at 0xf19 RXM0SIDLbits;
+__sfr __at (0xf19) RXM0SIDL;
+volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-sfr at 0xf1a RXM0EIDH;
-volatile __RXM0EIDHbits_t at 0xf1a RXM0EIDHbits;
+__sfr __at (0xf1a) RXM0EIDH;
+volatile __RXM0EIDHbits_t __at (0xf1a) RXM0EIDHbits;
 
-sfr at 0xf1b RXM0EIDL;
-volatile __RXM0EIDLbits_t at 0xf1b RXM0EIDLbits;
+__sfr __at (0xf1b) RXM0EIDL;
+volatile __RXM0EIDLbits_t __at (0xf1b) RXM0EIDLbits;
 
-sfr at 0xf1c RXM1SIDH;
-volatile __RXM1SIDHbits_t at 0xf1c RXM1SIDHbits;
+__sfr __at (0xf1c) RXM1SIDH;
+volatile __RXM1SIDHbits_t __at (0xf1c) RXM1SIDHbits;
 
-sfr at 0xf1d RXM1SIDL;
-volatile __RXM1SIDLbits_t at 0xf1d RXM1SIDLbits;
+__sfr __at (0xf1d) RXM1SIDL;
+volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-sfr at 0xf1e RXM1EIDH;
-volatile __RXM1EIDHbits_t at 0xf1e RXM1EIDHbits;
+__sfr __at (0xf1e) RXM1EIDH;
+volatile __RXM1EIDHbits_t __at (0xf1e) RXM1EIDHbits;
 
-sfr at 0xf1f RXM1EIDL;
-volatile __RXM1EIDLbits_t at 0xf1f RXM1EIDLbits;
+__sfr __at (0xf1f) RXM1EIDL;
+volatile __RXM1EIDLbits_t __at (0xf1f) RXM1EIDLbits;
 
-sfr at 0xf20 TXB2CON;
-volatile __TXB2CONbits_t at 0xf20 TXB2CONbits;
+__sfr __at (0xf20) TXB2CON;
+volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-sfr at 0xf21 TXB2SIDH;
-volatile __TXB2SIDHbits_t at 0xf21 TXB2SIDHbits;
+__sfr __at (0xf21) TXB2SIDH;
+volatile __TXB2SIDHbits_t __at (0xf21) TXB2SIDHbits;
 
-sfr at 0xf22 TXB2SIDL;
-volatile __TXB2SIDLbits_t at 0xf22 TXB2SIDLbits;
+__sfr __at (0xf22) TXB2SIDL;
+volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-sfr at 0xf23 TXB2EIDH;
-volatile __TXB2EIDHbits_t at 0xf23 TXB2EIDHbits;
+__sfr __at (0xf23) TXB2EIDH;
+volatile __TXB2EIDHbits_t __at (0xf23) TXB2EIDHbits;
 
-sfr at 0xf24 TXB2EIDL;
-volatile __TXB2EIDLbits_t at 0xf24 TXB2EIDLbits;
+__sfr __at (0xf24) TXB2EIDL;
+volatile __TXB2EIDLbits_t __at (0xf24) TXB2EIDLbits;
 
-sfr at 0xf25 TXB2DLC;
-volatile __TXB2DLCbits_t at 0xf25 TXB2DLCbits;
+__sfr __at (0xf25) TXB2DLC;
+volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-sfr at 0xf26 TXB2D0;
-volatile __TXB2D0bits_t at 0xf26 TXB2D0bits;
+__sfr __at (0xf26) TXB2D0;
+volatile __TXB2D0bits_t __at (0xf26) TXB2D0bits;
 
-sfr at 0xf27 TXB2D1;
-volatile __TXB2D1bits_t at 0xf27 TXB2D1bits;
+__sfr __at (0xf27) TXB2D1;
+volatile __TXB2D1bits_t __at (0xf27) TXB2D1bits;
 
-sfr at 0xf28 TXB2D2;
-volatile __TXB2D2bits_t at 0xf28 TXB2D2bits;
+__sfr __at (0xf28) TXB2D2;
+volatile __TXB2D2bits_t __at (0xf28) TXB2D2bits;
 
-sfr at 0xf29 TXB2D3;
-volatile __TXB2D3bits_t at 0xf29 TXB2D3bits;
+__sfr __at (0xf29) TXB2D3;
+volatile __TXB2D3bits_t __at (0xf29) TXB2D3bits;
 
-sfr at 0xf2a TXB2D4;
-volatile __TXB2D4bits_t at 0xf2a TXB2D4bits;
+__sfr __at (0xf2a) TXB2D4;
+volatile __TXB2D4bits_t __at (0xf2a) TXB2D4bits;
 
-sfr at 0xf2b TXB2D5;
-volatile __TXB2D5bits_t at 0xf2b TXB2D5bits;
+__sfr __at (0xf2b) TXB2D5;
+volatile __TXB2D5bits_t __at (0xf2b) TXB2D5bits;
 
-sfr at 0xf2c TXB2D6;
-volatile __TXB2D6bits_t at 0xf2c TXB2D6bits;
+__sfr __at (0xf2c) TXB2D6;
+volatile __TXB2D6bits_t __at (0xf2c) TXB2D6bits;
 
-sfr at 0xf2d TXB2D7;
-volatile __TXB2D7bits_t at 0xf2d TXB2D7bits;
+__sfr __at (0xf2d) TXB2D7;
+volatile __TXB2D7bits_t __at (0xf2d) TXB2D7bits;
 
-sfr at 0xf2e CANSTATRO4;
-volatile __CANSTATRO4bits_t at 0xf2e CANSTATRO4bits;
+__sfr __at (0xf2e) CANSTATRO4;
+volatile __CANSTATRO4bits_t __at (0xf2e) CANSTATRO4bits;
 
-sfr at 0xf30 TXB1CON;
-volatile __TXB1CONbits_t at 0xf30 TXB1CONbits;
+__sfr __at (0xf30) TXB1CON;
+volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-sfr at 0xf31 TXB1SIDH;
-volatile __TXB1SIDHbits_t at 0xf31 TXB1SIDHbits;
+__sfr __at (0xf31) TXB1SIDH;
+volatile __TXB1SIDHbits_t __at (0xf31) TXB1SIDHbits;
 
-sfr at 0xf32 TXB1SIDL;
-volatile __TXB1SIDLbits_t at 0xf32 TXB1SIDLbits;
+__sfr __at (0xf32) TXB1SIDL;
+volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-sfr at 0xf33 TXB1EIDH;
-volatile __TXB1EIDHbits_t at 0xf33 TXB1EIDHbits;
+__sfr __at (0xf33) TXB1EIDH;
+volatile __TXB1EIDHbits_t __at (0xf33) TXB1EIDHbits;
 
-sfr at 0xf34 TXB1EIDL;
-volatile __TXB1EIDLbits_t at 0xf34 TXB1EIDLbits;
+__sfr __at (0xf34) TXB1EIDL;
+volatile __TXB1EIDLbits_t __at (0xf34) TXB1EIDLbits;
 
-sfr at 0xf35 TXB1DLC;
-volatile __TXB1DLCbits_t at 0xf35 TXB1DLCbits;
+__sfr __at (0xf35) TXB1DLC;
+volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-sfr at 0xf36 TXB1D0;
-volatile __TXB1D0bits_t at 0xf36 TXB1D0bits;
+__sfr __at (0xf36) TXB1D0;
+volatile __TXB1D0bits_t __at (0xf36) TXB1D0bits;
 
-sfr at 0xf37 TXB1D1;
-volatile __TXB1D1bits_t at 0xf37 TXB1D1bits;
+__sfr __at (0xf37) TXB1D1;
+volatile __TXB1D1bits_t __at (0xf37) TXB1D1bits;
 
-sfr at 0xf38 TXB1D2;
-volatile __TXB1D2bits_t at 0xf38 TXB1D2bits;
+__sfr __at (0xf38) TXB1D2;
+volatile __TXB1D2bits_t __at (0xf38) TXB1D2bits;
 
-sfr at 0xf39 TXB1D3;
-volatile __TXB1D3bits_t at 0xf39 TXB1D3bits;
+__sfr __at (0xf39) TXB1D3;
+volatile __TXB1D3bits_t __at (0xf39) TXB1D3bits;
 
-sfr at 0xf3a TXB1D4;
-volatile __TXB1D4bits_t at 0xf3a TXB1D4bits;
+__sfr __at (0xf3a) TXB1D4;
+volatile __TXB1D4bits_t __at (0xf3a) TXB1D4bits;
 
-sfr at 0xf3b TXB1D5;
-volatile __TXB1D5bits_t at 0xf3b TXB1D5bits;
+__sfr __at (0xf3b) TXB1D5;
+volatile __TXB1D5bits_t __at (0xf3b) TXB1D5bits;
 
-sfr at 0xf3c TXB1D6;
-volatile __TXB1D6bits_t at 0xf3c TXB1D6bits;
+__sfr __at (0xf3c) TXB1D6;
+volatile __TXB1D6bits_t __at (0xf3c) TXB1D6bits;
 
-sfr at 0xf3d TXB1D7;
-volatile __TXB1D7bits_t at 0xf3d TXB1D7bits;
+__sfr __at (0xf3d) TXB1D7;
+volatile __TXB1D7bits_t __at (0xf3d) TXB1D7bits;
 
-sfr at 0xf3e CANSTATRO3;
-volatile __CANSTATRO3bits_t at 0xf3e CANSTATRO3bits;
+__sfr __at (0xf3e) CANSTATRO3;
+volatile __CANSTATRO3bits_t __at (0xf3e) CANSTATRO3bits;
 
-sfr at 0xf40 TXB0CON;
-volatile __TXB0CONbits_t at 0xf40 TXB0CONbits;
+__sfr __at (0xf40) TXB0CON;
+volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-sfr at 0xf41 TXB0SIDH;
-volatile __TXB0SIDHbits_t at 0xf41 TXB0SIDHbits;
+__sfr __at (0xf41) TXB0SIDH;
+volatile __TXB0SIDHbits_t __at (0xf41) TXB0SIDHbits;
 
-sfr at 0xf42 TXB0SIDL;
-volatile __TXB0SIDLbits_t at 0xf42 TXB0SIDLbits;
+__sfr __at (0xf42) TXB0SIDL;
+volatile __TXB0SIDLbits_t __at (0xf42) TXB0SIDLbits;
 
-sfr at 0xf43 TXB0EIDH;
-volatile __TXB0EIDHbits_t at 0xf43 TXB0EIDHbits;
+__sfr __at (0xf43) TXB0EIDH;
+volatile __TXB0EIDHbits_t __at (0xf43) TXB0EIDHbits;
 
-sfr at 0xf44 TXB0EIDL;
-volatile __TXB0EIDLbits_t at 0xf44 TXB0EIDLbits;
+__sfr __at (0xf44) TXB0EIDL;
+volatile __TXB0EIDLbits_t __at (0xf44) TXB0EIDLbits;
 
-sfr at 0xf45 TXB0DLC;
-volatile __TXB0DLCbits_t at 0xf45 TXB0DLCbits;
+__sfr __at (0xf45) TXB0DLC;
+volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-sfr at 0xf46 TXB0D0;
-volatile __TXB0D0bits_t at 0xf46 TXB0D0bits;
+__sfr __at (0xf46) TXB0D0;
+volatile __TXB0D0bits_t __at (0xf46) TXB0D0bits;
 
-sfr at 0xf47 TXB0D1;
-volatile __TXB0D1bits_t at 0xf47 TXB0D1bits;
+__sfr __at (0xf47) TXB0D1;
+volatile __TXB0D1bits_t __at (0xf47) TXB0D1bits;
 
-sfr at 0xf48 TXB0D2;
-volatile __TXB0D2bits_t at 0xf48 TXB0D2bits;
+__sfr __at (0xf48) TXB0D2;
+volatile __TXB0D2bits_t __at (0xf48) TXB0D2bits;
 
-sfr at 0xf49 TXB0D3;
-volatile __TXB0D3bits_t at 0xf49 TXB0D3bits;
+__sfr __at (0xf49) TXB0D3;
+volatile __TXB0D3bits_t __at (0xf49) TXB0D3bits;
 
-sfr at 0xf4a TXB0D4;
-volatile __TXB0D4bits_t at 0xf4a TXB0D4bits;
+__sfr __at (0xf4a) TXB0D4;
+volatile __TXB0D4bits_t __at (0xf4a) TXB0D4bits;
 
-sfr at 0xf4b TXB0D5;
-volatile __TXB0D5bits_t at 0xf4b TXB0D5bits;
+__sfr __at (0xf4b) TXB0D5;
+volatile __TXB0D5bits_t __at (0xf4b) TXB0D5bits;
 
-sfr at 0xf4c TXB0D6;
-volatile __TXB0D6bits_t at 0xf4c TXB0D6bits;
+__sfr __at (0xf4c) TXB0D6;
+volatile __TXB0D6bits_t __at (0xf4c) TXB0D6bits;
 
-sfr at 0xf4d TXB0D7;
-volatile __TXB0D7bits_t at 0xf4d TXB0D7bits;
+__sfr __at (0xf4d) TXB0D7;
+volatile __TXB0D7bits_t __at (0xf4d) TXB0D7bits;
 
-sfr at 0xf4e CANSTATRO2;
-volatile __CANSTATRO2bits_t at 0xf4e CANSTATRO2bits;
+__sfr __at (0xf4e) CANSTATRO2;
+volatile __CANSTATRO2bits_t __at (0xf4e) CANSTATRO2bits;
 
-sfr at 0xf50 RXB1CON;
-volatile __RXB1CONbits_t at 0xf50 RXB1CONbits;
+__sfr __at (0xf50) RXB1CON;
+volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-sfr at 0xf51 RXB1SIDH;
-volatile __RXB1SIDHbits_t at 0xf51 RXB1SIDHbits;
+__sfr __at (0xf51) RXB1SIDH;
+volatile __RXB1SIDHbits_t __at (0xf51) RXB1SIDHbits;
 
-sfr at 0xf52 RXB1SIDL;
-volatile __RXB1SIDLbits_t at 0xf52 RXB1SIDLbits;
+__sfr __at (0xf52) RXB1SIDL;
+volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-sfr at 0xf53 RXB1EIDH;
-volatile __RXB1EIDHbits_t at 0xf53 RXB1EIDHbits;
+__sfr __at (0xf53) RXB1EIDH;
+volatile __RXB1EIDHbits_t __at (0xf53) RXB1EIDHbits;
 
-sfr at 0xf54 RXB1EIDL;
-volatile __RXB1EIDLbits_t at 0xf54 RXB1EIDLbits;
+__sfr __at (0xf54) RXB1EIDL;
+volatile __RXB1EIDLbits_t __at (0xf54) RXB1EIDLbits;
 
-sfr at 0xf55 RXB1DLC;
-volatile __RXB1DLCbits_t at 0xf55 RXB1DLCbits;
+__sfr __at (0xf55) RXB1DLC;
+volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-sfr at 0xf56 RXB1D0;
-volatile __RXB1D0bits_t at 0xf56 RXB1D0bits;
+__sfr __at (0xf56) RXB1D0;
+volatile __RXB1D0bits_t __at (0xf56) RXB1D0bits;
 
-sfr at 0xf57 RXB1D1;
-volatile __RXB1D1bits_t at 0xf57 RXB1D1bits;
+__sfr __at (0xf57) RXB1D1;
+volatile __RXB1D1bits_t __at (0xf57) RXB1D1bits;
 
-sfr at 0xf58 RXB1D2;
-volatile __RXB1D2bits_t at 0xf58 RXB1D2bits;
+__sfr __at (0xf58) RXB1D2;
+volatile __RXB1D2bits_t __at (0xf58) RXB1D2bits;
 
-sfr at 0xf59 RXB1D3;
-volatile __RXB1D3bits_t at 0xf59 RXB1D3bits;
+__sfr __at (0xf59) RXB1D3;
+volatile __RXB1D3bits_t __at (0xf59) RXB1D3bits;
 
-sfr at 0xf5a RXB1D4;
-volatile __RXB1D4bits_t at 0xf5a RXB1D4bits;
+__sfr __at (0xf5a) RXB1D4;
+volatile __RXB1D4bits_t __at (0xf5a) RXB1D4bits;
 
-sfr at 0xf5b RXB1D5;
-volatile __RXB1D5bits_t at 0xf5b RXB1D5bits;
+__sfr __at (0xf5b) RXB1D5;
+volatile __RXB1D5bits_t __at (0xf5b) RXB1D5bits;
 
-sfr at 0xf5c RXB1D6;
-volatile __RXB1D6bits_t at 0xf5c RXB1D6bits;
+__sfr __at (0xf5c) RXB1D6;
+volatile __RXB1D6bits_t __at (0xf5c) RXB1D6bits;
 
-sfr at 0xf5d RXB1D7;
-volatile __RXB1D7bits_t at 0xf5d RXB1D7bits;
+__sfr __at (0xf5d) RXB1D7;
+volatile __RXB1D7bits_t __at (0xf5d) RXB1D7bits;
 
-sfr at 0xf5e CANSTATRO1;
-volatile __CANSTATRO1bits_t at 0xf5e CANSTATRO1bits;
+__sfr __at (0xf5e) CANSTATRO1;
+volatile __CANSTATRO1bits_t __at (0xf5e) CANSTATRO1bits;
 
-sfr at 0xf60 RXB0CON;
-volatile __RXB0CONbits_t at 0xf60 RXB0CONbits;
+__sfr __at (0xf60) RXB0CON;
+volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-sfr at 0xf61 RXB0SIDH;
-volatile __RXB0SIDHbits_t at 0xf61 RXB0SIDHbits;
+__sfr __at (0xf61) RXB0SIDH;
+volatile __RXB0SIDHbits_t __at (0xf61) RXB0SIDHbits;
 
-sfr at 0xf62 RXB0SIDL;
-volatile __RXB0SIDLbits_t at 0xf62 RXB0SIDLbits;
+__sfr __at (0xf62) RXB0SIDL;
+volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-sfr at 0xf63 RXB0EIDH;
-volatile __RXB0EIDHbits_t at 0xf63 RXB0EIDHbits;
+__sfr __at (0xf63) RXB0EIDH;
+volatile __RXB0EIDHbits_t __at (0xf63) RXB0EIDHbits;
 
-sfr at 0xf64 RXB0EIDL;
-volatile __RXB0EIDLbits_t at 0xf64 RXB0EIDLbits;
+__sfr __at (0xf64) RXB0EIDL;
+volatile __RXB0EIDLbits_t __at (0xf64) RXB0EIDLbits;
 
-sfr at 0xf65 RXB0DLC;
-volatile __RXB0DLCbits_t at 0xf65 RXB0DLCbits;
+__sfr __at (0xf65) RXB0DLC;
+volatile __RXB0DLCbits_t __at (0xf65) RXB0DLCbits;
 
-sfr at 0xf66 RXB0D0;
-sfr at 0xf67 RXB0D1;
-sfr at 0xf68 RXB0D2;
-sfr at 0xf69 RXB0D3;
-sfr at 0xf6a RXB0D4;
-sfr at 0xf6b RXB0D5;
-sfr at 0xf6c RXB0D6;
-sfr at 0xf6d RXB0D7;
-sfr at 0xf6e CANSTAT;
-volatile __CANSTATbits_t at 0xf6e CANSTATbits;
+__sfr __at (0xf66) RXB0D0;
+__sfr __at (0xf67) RXB0D1;
+__sfr __at (0xf68) RXB0D2;
+__sfr __at (0xf69) RXB0D3;
+__sfr __at (0xf6a) RXB0D4;
+__sfr __at (0xf6b) RXB0D5;
+__sfr __at (0xf6c) RXB0D6;
+__sfr __at (0xf6d) RXB0D7;
+__sfr __at (0xf6e) CANSTAT;
+volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-sfr at 0xf6f CANCON;
-volatile __CANCONbits_t at 0xf6f CANCONbits;
+__sfr __at (0xf6f) CANCON;
+volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-sfr at 0xf70 BRGCON1;
-volatile __BRGCON1bits_t at 0xf70 BRGCON1bits;
+__sfr __at (0xf70) BRGCON1;
+volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-sfr at 0xf71 BRGCON2;
-volatile __BRGCON2bits_t at 0xf71 BRGCON2bits;
+__sfr __at (0xf71) BRGCON2;
+volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-sfr at 0xf72 BRGCON3;
-volatile __BRGCON3bits_t at 0xf72 BRGCON3bits;
+__sfr __at (0xf72) BRGCON3;
+volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-sfr at 0xf73 CIOCON;
-volatile __CIOCONbits_t at 0xf73 CIOCONbits;
+__sfr __at (0xf73) CIOCON;
+volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-sfr at 0xf74 COMSTAT;
-volatile __COMSTATbits_t at 0xf74 COMSTATbits;
+__sfr __at (0xf74) COMSTAT;
+volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-sfr at 0xf75 RXERRCNT;
-volatile __RXERRCNTbits_t at 0xf75 RXERRCNTbits;
+__sfr __at (0xf75) RXERRCNT;
+volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-sfr at 0xf76 TXERRCNT;
-volatile __TXERRCNTbits_t at 0xf76 TXERRCNTbits;
+__sfr __at (0xf76) TXERRCNT;
+volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
 
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
 
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb6 ECCPAS;
-volatile __ECCPASbits_t at 0xfb6 ECCPASbits;
-
-sfr at 0xfb7 ECCP1DEL;
-volatile __ECCP1DELbits_t at 0xfb7 ECCP1DELbits;
-
-sfr at 0xfba ECCP1CON;
-volatile __ECCP1CONbits_t at 0xfba ECCP1CONbits;
-
-sfr at 0xfbb ECCPR1L;
-sfr at 0xfbc ECCPR1H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb6) ECCPAS;
+volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
+
+__sfr __at (0xfb7) ECCP1DEL;
+volatile __ECCP1DELbits_t __at (0xfb7) ECCP1DELbits;
+
+__sfr __at (0xfba) ECCP1CON;
+volatile __ECCP1CONbits_t __at (0xfba) ECCP1CONbits;
+
+__sfr __at (0xfbb) ECCPR1L;
+__sfr __at (0xfbc) ECCPR1H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f452.c b/device/lib/pic16/libdev/pic18f452.c
index 34d0dd0044d2329b7fabc3d67e2b219b3b4cd55f..980fa9b052c65d3376e8655ea3b4dd226fed0db1 100644 (file)
--- a/device/lib/pic16/libdev/pic18f452.c
+++ b/device/lib/pic16/libdev/pic18f452.c
@@ -14,194 +14,194 @@
 
 #include <pic18f452.h>
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
-
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
-
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
+
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
+
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
 
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
-
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-volatile __T0CONbits_t at 0xfd5 T0CONbits;
-
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
+
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+volatile __T0CONbits_t __at (0xfd5) T0CONbits;
+
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f4520.c b/device/lib/pic16/libdev/pic18f4520.c
index 0322bf4f7bb8380ff32c99033ff3168221e7a0c8..1db091aa98f73457b0c0706149132ead14206a75 100644 (file)
--- a/device/lib/pic16/libdev/pic18f4520.c
+++ b/device/lib/pic16/libdev/pic18f4520.c
@@ -16,280 +16,280 @@
 
 #include <pic18f4520.h>
 
-__sfr __at 0xF80 PORTA;
-volatile __PORTA_t __at 0xF80 PORTAbits;
+__sfr __at (0xF80) PORTA;
+volatile __PORTA_t __at (0xF80) PORTAbits;
 
-__sfr __at 0xF81 PORTB;
-volatile __PORTB_t __at 0xF81 PORTBbits;
+__sfr __at (0xF81) PORTB;
+volatile __PORTB_t __at (0xF81) PORTBbits;
 
-__sfr __at 0xF82 PORTC;
-volatile __PORTC_t __at 0xF82 PORTCbits;
+__sfr __at (0xF82) PORTC;
+volatile __PORTC_t __at (0xF82) PORTCbits;
 
-__sfr __at 0xF83 PORTD;
-volatile __PORTD_t __at 0xF83 PORTDbits;
+__sfr __at (0xF83) PORTD;
+volatile __PORTD_t __at (0xF83) PORTDbits;
 
-__sfr __at 0xF84 PORTE;
-volatile __PORTE_t __at 0xF84 PORTEbits;
+__sfr __at (0xF84) PORTE;
+volatile __PORTE_t __at (0xF84) PORTEbits;
 
-__sfr __at 0xF89 LATA;
-volatile __LATA_t __at 0xF89 LATAbits;
+__sfr __at (0xF89) LATA;
+volatile __LATA_t __at (0xF89) LATAbits;
 
-__sfr __at 0xF8A LATB;
-volatile __LATB_t __at 0xF8A LATBbits;
+__sfr __at (0xF8A) LATB;
+volatile __LATB_t __at (0xF8A) LATBbits;
 
-__sfr __at 0xF8B LATC;
-volatile __LATC_t __at 0xF8B LATCbits;
+__sfr __at (0xF8B) LATC;
+volatile __LATC_t __at (0xF8B) LATCbits;
 
-__sfr __at 0xF8C LATD;
-volatile __LATD_t __at 0xF8C LATDbits;
+__sfr __at (0xF8C) LATD;
+volatile __LATD_t __at (0xF8C) LATDbits;
 
-__sfr __at 0xF8D LATE;
-volatile __LATE_t __at 0xF8D LATEbits;
+__sfr __at (0xF8D) LATE;
+volatile __LATE_t __at (0xF8D) LATEbits;
 
-__sfr __at 0xF92 TRISA;
-volatile __TRISA_t __at 0xF92 TRISAbits;
+__sfr __at (0xF92) TRISA;
+volatile __TRISA_t __at (0xF92) TRISAbits;
 
-__sfr __at 0xF93 TRISB;
-volatile __TRISB_t __at 0xF93 TRISBbits;
+__sfr __at (0xF93) TRISB;
+volatile __TRISB_t __at (0xF93) TRISBbits;
 
-__sfr __at 0xF94 TRISC;
-volatile __TRISC_t __at 0xF94 TRISCbits;
+__sfr __at (0xF94) TRISC;
+volatile __TRISC_t __at (0xF94) TRISCbits;
 
-__sfr __at 0xF95 TRISD;
-volatile __TRISD_t __at 0xF95 TRISDbits;
+__sfr __at (0xF95) TRISD;
+volatile __TRISD_t __at (0xF95) TRISDbits;
 
-__sfr __at 0xF96 TRISE;
-volatile __TRISE_t __at 0xF96 TRISEbits;
+__sfr __at (0xF96) TRISE;
+volatile __TRISE_t __at (0xF96) TRISEbits;
 
-__sfr __at 0xF9B OSCTUNE;
-volatile __OSCTUNE_t __at 0xF9B OSCTUNEbits;
+__sfr __at (0xF9B) OSCTUNE;
+volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;
 
-__sfr __at 0xF9D PIE1;
-volatile __PIE1_t __at 0xF9D PIE1bits;
+__sfr __at (0xF9D) PIE1;
+volatile __PIE1_t __at (0xF9D) PIE1bits;
 
-__sfr __at 0xF9E PIR1;
-volatile __PIR1_t __at 0xF9E PIR1bits;
+__sfr __at (0xF9E) PIR1;
+volatile __PIR1_t __at (0xF9E) PIR1bits;
 
-__sfr __at 0xF9F IPR1;
-volatile __IPR1_t __at 0xF9F IPR1bits;
+__sfr __at (0xF9F) IPR1;
+volatile __IPR1_t __at (0xF9F) IPR1bits;
 
-__sfr __at 0xFA0 PIE2;
-volatile __PIE2_t __at 0xFA0 PIE2bits;
+__sfr __at (0xFA0) PIE2;
+volatile __PIE2_t __at (0xFA0) PIE2bits;
 
-__sfr __at 0xFA1 PIR2;
-volatile __PIR2_t __at 0xFA1 PIR2bits;
+__sfr __at (0xFA1) PIR2;
+volatile __PIR2_t __at (0xFA1) PIR2bits;
 
-__sfr __at 0xFA2 IPR2;
-volatile __IPR2_t __at 0xFA2 IPR2bits;
+__sfr __at (0xFA2) IPR2;
+volatile __IPR2_t __at (0xFA2) IPR2bits;
 
-__sfr __at 0xFA6 EECON1;
-volatile __EECON1_t __at 0xFA6 EECON1bits;
+__sfr __at (0xFA6) EECON1;
+volatile __EECON1_t __at (0xFA6) EECON1bits;
 
-__sfr __at 0xFA7 EECON2;
+__sfr __at (0xFA7) EECON2;
 
-__sfr __at 0xFA8 EEDATA;
+__sfr __at (0xFA8) EEDATA;
 
-__sfr __at 0xFA9 EEADR;
+__sfr __at (0xFA9) EEADR;
 
-__sfr __at 0xFAB RCSTA;
-volatile __RCSTA_t __at 0xFAB RCSTAbits;
+__sfr __at (0xFAB) RCSTA;
+volatile __RCSTA_t __at (0xFAB) RCSTAbits;
 
-__sfr __at 0xFAC TXSTA;
-volatile __TXSTA_t __at 0xFAC TXSTAbits;
+__sfr __at (0xFAC) TXSTA;
+volatile __TXSTA_t __at (0xFAC) TXSTAbits;
 
-__sfr __at 0xFAD TXREG;
+__sfr __at (0xFAD) TXREG;
 
-__sfr __at 0xFAE RCREG;
+__sfr __at (0xFAE) RCREG;
 
-__sfr __at 0xFAF SPBRG;
+__sfr __at (0xFAF) SPBRG;
 
-__sfr __at 0xFB0 SPBRGH;
+__sfr __at (0xFB0) SPBRGH;
 
-__sfr __at 0xFB1 T3CON;
-volatile __T3CON_t __at 0xFB1 T3CONbits;
+__sfr __at (0xFB1) T3CON;
+volatile __T3CON_t __at (0xFB1) T3CONbits;
 
-__sfr __at 0xFB2 TMR3L;
+__sfr __at (0xFB2) TMR3L;
 
-__sfr __at 0xFB3 TMR3H;
+__sfr __at (0xFB3) TMR3H;
 
-__sfr __at 0xFB4 CMCON;
-volatile __CMCON_t __at 0xFB4 CMCONbits;
+__sfr __at (0xFB4) CMCON;
+volatile __CMCON_t __at (0xFB4) CMCONbits;
 
-__sfr __at 0xFB5 CVRCON;
-volatile __CVRCON_t __at 0xFB5 CVRCONbits;
+__sfr __at (0xFB5) CVRCON;
+volatile __CVRCON_t __at (0xFB5) CVRCONbits;
 
-__sfr __at 0xFB6 ECCPAS1;
-volatile __ECCPAS1_t __at 0xFB6 ECCPAS1bits;
+__sfr __at (0xFB6) ECCPAS1;
+volatile __ECCPAS1_t __at (0xFB6) ECCPAS1bits;
 
-__sfr __at 0xFB7 PWM1CON;
-volatile __PWM1CON_t __at 0xFB7 PWM1CONbits;
+__sfr __at (0xFB7) PWM1CON;
+volatile __PWM1CON_t __at (0xFB7) PWM1CONbits;
 
-__sfr __at 0xFB8 BAUDCON;
-volatile __BAUDCON_t __at 0xFB8 BAUDCONbits;
+__sfr __at (0xFB8) BAUDCON;
+volatile __BAUDCON_t __at (0xFB8) BAUDCONbits;
 
-__sfr __at 0xFBA CCP2CON;
-volatile __CCP2CON_t __at 0xFBA CCP2CONbits;
+__sfr __at (0xFBA) CCP2CON;
+volatile __CCP2CON_t __at (0xFBA) CCP2CONbits;
 
-__sfr __at 0xFBB CCPR2L;
+__sfr __at (0xFBB) CCPR2L;
 
-__sfr __at 0xFBC CCPR2H;
+__sfr __at (0xFBC) CCPR2H;
 
-__sfr __at 0xFBD ECCP1CON;
-volatile __ECCP1CON_t __at 0xFBD ECCP1CONbits;
+__sfr __at (0xFBD) ECCP1CON;
+volatile __ECCP1CON_t __at (0xFBD) ECCP1CONbits;
 
-__sfr __at 0xFBE CCPR1L;
+__sfr __at (0xFBE) CCPR1L;
 
-__sfr __at 0xFBF CCPR1H;
+__sfr __at (0xFBF) CCPR1H;
 
-__sfr __at 0xFC0 ADCON2;
-volatile __ADCON2_t __at 0xFC0 ADCON2bits;
+__sfr __at (0xFC0) ADCON2;
+volatile __ADCON2_t __at (0xFC0) ADCON2bits;
 
-__sfr __at 0xFC1 ADCON1;
-volatile __ADCON1_t __at 0xFC1 ADCON1bits;
+__sfr __at (0xFC1) ADCON1;
+volatile __ADCON1_t __at (0xFC1) ADCON1bits;
 
-__sfr __at 0xFC2 ADCON0;
-volatile __ADCON0_t __at 0xFC2 ADCON0bits;
+__sfr __at (0xFC2) ADCON0;
+volatile __ADCON0_t __at (0xFC2) ADCON0bits;
 
-__sfr __at 0xFC3 ADRESL;
+__sfr __at (0xFC3) ADRESL;
 
-__sfr __at 0xFC4 ADRESH;
+__sfr __at (0xFC4) ADRESH;
 
-__sfr __at 0xFC5 SSPCON2;
-volatile __SSPCON2_t __at 0xFC5 SSPCON2bits;
+__sfr __at (0xFC5) SSPCON2;
+volatile __SSPCON2_t __at (0xFC5) SSPCON2bits;
 
-__sfr __at 0xFC6 SSPCON1;
-volatile __SSPCON1_t __at 0xFC6 SSPCON1bits;
+__sfr __at (0xFC6) SSPCON1;
+volatile __SSPCON1_t __at (0xFC6) SSPCON1bits;
 
-__sfr __at 0xFC7 SSPSTAT;
-volatile __SSPSTAT_t __at 0xFC7 SSPSTATbits;
+__sfr __at (0xFC7) SSPSTAT;
+volatile __SSPSTAT_t __at (0xFC7) SSPSTATbits;
 
-__sfr __at 0xFC8 SSPADD;
+__sfr __at (0xFC8) SSPADD;
 
-__sfr __at 0xFC9 SSPBUF;
+__sfr __at (0xFC9) SSPBUF;
 
-__sfr __at 0xFCA T2CON;
-volatile __T2CON_t __at 0xFCA T2CONbits;
+__sfr __at (0xFCA) T2CON;
+volatile __T2CON_t __at (0xFCA) T2CONbits;
 
-__sfr __at 0xFCB PR2;
+__sfr __at (0xFCB) PR2;
 
-__sfr __at 0xFCC TMR2;
+__sfr __at (0xFCC) TMR2;
 
-__sfr __at 0xFCD T1CON;
-volatile __T1CON_t __at 0xFCD T1CONbits;
+__sfr __at (0xFCD) T1CON;
+volatile __T1CON_t __at (0xFCD) T1CONbits;
 
-__sfr __at 0xFCE TMR1L;
+__sfr __at (0xFCE) TMR1L;
 
-__sfr __at 0xFCF TMR1H;
+__sfr __at (0xFCF) TMR1H;
 
-__sfr __at 0xFD0 RCON;
-volatile __RCON_t __at 0xFD0 RCONbits;
+__sfr __at (0xFD0) RCON;
+volatile __RCON_t __at (0xFD0) RCONbits;
 
-__sfr __at 0xFD1 WDTCON;
-volatile __WDTCON_t __at 0xFD1 WDTCONbits;
+__sfr __at (0xFD1) WDTCON;
+volatile __WDTCON_t __at (0xFD1) WDTCONbits;
 
-__sfr __at 0xFD2 LVDCON;
-volatile __LVDCON_t __at 0xFD2 LVDCONbits;
+__sfr __at (0xFD2) LVDCON;
+volatile __LVDCON_t __at (0xFD2) LVDCONbits;
 
-__sfr __at 0xFD3 OSCCON;
-volatile __OSCCON_t __at 0xFD3 OSCCONbits;
+__sfr __at (0xFD3) OSCCON;
+volatile __OSCCON_t __at (0xFD3) OSCCONbits;
 
-__sfr __at 0xFD5 T0CON;
-volatile __T0CON_t __at 0xFD5 T0CONbits;
+__sfr __at (0xFD5) T0CON;
+volatile __T0CON_t __at (0xFD5) T0CONbits;
 
-__sfr __at 0xFD6 TMR0L;
+__sfr __at (0xFD6) TMR0L;
 
-__sfr __at 0xFD7 TMR0H;
+__sfr __at (0xFD7) TMR0H;
 
-__sfr __at 0xFD8 STATUS;
-volatile __STATUS_t __at 0xFD8 STATUSbits;
+__sfr __at (0xFD8) STATUS;
+volatile __STATUS_t __at (0xFD8) STATUSbits;
 
-__sfr __at 0xFD9 FSR2L;
+__sfr __at (0xFD9) FSR2L;
 
-__sfr __at 0xFDA FSR2H;
-volatile __FSR2H_t __at 0xFDA FSR2Hbits;
+__sfr __at (0xFDA) FSR2H;
+volatile __FSR2H_t __at (0xFDA) FSR2Hbits;
 
-__sfr __at 0xFDB PLUSW2;
+__sfr __at (0xFDB) PLUSW2;
 
-__sfr __at 0xFDC PREINC2;
+__sfr __at (0xFDC) PREINC2;
 
-__sfr __at 0xFDD POSTDEC2;
+__sfr __at (0xFDD) POSTDEC2;
 
-__sfr __at 0xFDE POSTINC2;
+__sfr __at (0xFDE) POSTINC2;
 
-__sfr __at 0xFDF INDF2;
+__sfr __at (0xFDF) INDF2;
 
-__sfr __at 0xFE0 BSR;
-volatile __BSR_t __at 0xFE0 BSRbits;
+__sfr __at (0xFE0) BSR;
+volatile __BSR_t __at (0xFE0) BSRbits;
 
-__sfr __at 0xFE1 FSR1L;
+__sfr __at (0xFE1) FSR1L;
 
-__sfr __at 0xFE2 FSR1H;
-volatile __FSR1H_t __at 0xFE2 FSR1Hbits;
+__sfr __at (0xFE2) FSR1H;
+volatile __FSR1H_t __at (0xFE2) FSR1Hbits;
 
-__sfr __at 0xFE3 PLUSW1;
+__sfr __at (0xFE3) PLUSW1;
 
-__sfr __at 0xFE4 PREINC1;
+__sfr __at (0xFE4) PREINC1;
 
-__sfr __at 0xFE5 POSTDEC1;
+__sfr __at (0xFE5) POSTDEC1;
 
-__sfr __at 0xFE6 POSTINC1;
+__sfr __at (0xFE6) POSTINC1;
 
-__sfr __at 0xFE7 INDF1;
+__sfr __at (0xFE7) INDF1;
 
-__sfr __at 0xFE8 WREG;
+__sfr __at (0xFE8) WREG;
 
-__sfr __at 0xFE9 FSR0L;
+__sfr __at (0xFE9) FSR0L;
 
-__sfr __at 0xFEA FSR0H;
-volatile __FSR0H_t __at 0xFEA FSR0Hbits;
+__sfr __at (0xFEA) FSR0H;
+volatile __FSR0H_t __at (0xFEA) FSR0Hbits;
 
-__sfr __at 0xFEB PLUSW0;
+__sfr __at (0xFEB) PLUSW0;
 
-__sfr __at 0xFEC PREINC0;
+__sfr __at (0xFEC) PREINC0;
 
-__sfr __at 0xFED POSTDEC0;
+__sfr __at (0xFED) POSTDEC0;
 
-__sfr __at 0xFEE POSTINC0;
+__sfr __at (0xFEE) POSTINC0;
 
-__sfr __at 0xFEF INDF0;
+__sfr __at (0xFEF) INDF0;
 
-__sfr __at 0xFF0 INTCON3;
-volatile __INTCON3_t __at 0xFF0 INTCON3bits;
+__sfr __at (0xFF0) INTCON3;
+volatile __INTCON3_t __at (0xFF0) INTCON3bits;
 
-__sfr __at 0xFF1 INTCON2;
-volatile __INTCON2_t __at 0xFF1 INTCON2bits;
+__sfr __at (0xFF1) INTCON2;
+volatile __INTCON2_t __at (0xFF1) INTCON2bits;
 
-__sfr __at 0xFF2 INTCON;
-volatile __INTCON_t __at 0xFF2 INTCONbits;
+__sfr __at (0xFF2) INTCON;
+volatile __INTCON_t __at (0xFF2) INTCONbits;
 
-__sfr __at 0xFF3 PRODL;
+__sfr __at (0xFF3) PRODL;
 
-__sfr __at 0xFF4 PRODH;
+__sfr __at (0xFF4) PRODH;
 
-__sfr __at 0xFF5 TABLAT;
+__sfr __at (0xFF5) TABLAT;
 
-__sfr __at 0xFF6 TBLPTRL;
+__sfr __at (0xFF6) TBLPTRL;
 
-__sfr __at 0xFF7 TBLPTRH;
+__sfr __at (0xFF7) TBLPTRH;
 
-__sfr __at 0xFF8 TBLPTRU;
-volatile __TBLPTRU_t __at 0xFF8 TBLPTRUbits;
+__sfr __at (0xFF8) TBLPTRU;
+volatile __TBLPTRU_t __at (0xFF8) TBLPTRUbits;
 
-__sfr __at 0xFF9 PCL;
+__sfr __at (0xFF9) PCL;
 
-__sfr __at 0xFFA PCLATH;
-volatile __PCLATH_t __at 0xFFA PCLATHbits;
+__sfr __at (0xFFA) PCLATH;
+volatile __PCLATH_t __at (0xFFA) PCLATHbits;
 
-__sfr __at 0xFFB PCLATU;
-volatile __PCLATU_t __at 0xFFB PCLATUbits;
+__sfr __at (0xFFB) PCLATU;
+volatile __PCLATU_t __at (0xFFB) PCLATUbits;
 
-__sfr __at 0xFFC STKPTR;
-volatile __STKPTR_t __at 0xFFC STKPTRbits;
+__sfr __at (0xFFC) STKPTR;
+volatile __STKPTR_t __at (0xFFC) STKPTRbits;
 
-__sfr __at 0xFFD TOSL;
+__sfr __at (0xFFD) TOSL;
 
-__sfr __at 0xFFE TOSH;
+__sfr __at (0xFFE) TOSH;
 
-__sfr __at 0xFFF TOSU;
-volatile __TOSU_t __at 0xFFF TOSUbits;
+__sfr __at (0xFFF) TOSU;
+volatile __TOSU_t __at (0xFFF) TOSUbits;
 

diff --git a/device/lib/pic16/libdev/pic18f458.c b/device/lib/pic16/libdev/pic18f458.c
index 38f65805ed96230330e928c965b4f0e4efdaf675..f5b346a24763e2a94697c8804a849bf8dfcee6af 100644 (file)
--- a/device/lib/pic16/libdev/pic18f458.c
+++ b/device/lib/pic16/libdev/pic18f458.c
@@ -14,545 +14,545 @@
 
 #include <pic18f458.h>
 
-sfr at 0xf00 RXF0SIDH;
-volatile __RXF0SIDHbits_t at 0xf00 RXF0SIDHbits;
+__sfr __at (0xf00) RXF0SIDH;
+volatile __RXF0SIDHbits_t __at (0xf00) RXF0SIDHbits;
 
-sfr at 0xf01 RXF0SIDL;
-volatile __RXF0SIDLbits_t at 0xf01 RXF0SIDLbits;
+__sfr __at (0xf01) RXF0SIDL;
+volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
 
-sfr at 0xf02 RXF0EIDH;
-volatile __RXF0EIDHbits_t at 0xf02 RXF0EIDHbits;
+__sfr __at (0xf02) RXF0EIDH;
+volatile __RXF0EIDHbits_t __at (0xf02) RXF0EIDHbits;
 
-sfr at 0xf03 RXF0EIDL;
-volatile __RXF0EIDLbits_t at 0xf03 RXF0EIDLbits;
+__sfr __at (0xf03) RXF0EIDL;
+volatile __RXF0EIDLbits_t __at (0xf03) RXF0EIDLbits;
 
-sfr at 0xf04 RXF1SIDH;
-volatile __RXF1SIDHbits_t at 0xf04 RXF1SIDHbits;
+__sfr __at (0xf04) RXF1SIDH;
+volatile __RXF1SIDHbits_t __at (0xf04) RXF1SIDHbits;
 
-sfr at 0xf05 RXF1SIDL;
-volatile __RXF1SIDLbits_t at 0xf05 RXF1SIDLbits;
+__sfr __at (0xf05) RXF1SIDL;
+volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
 
-sfr at 0xf06 RXF1EIDH;
-volatile __RXF1EIDHbits_t at 0xf06 RXF1EIDHbits;
+__sfr __at (0xf06) RXF1EIDH;
+volatile __RXF1EIDHbits_t __at (0xf06) RXF1EIDHbits;
 
-sfr at 0xf07 RXF1EIDL;
-volatile __RXF1EIDLbits_t at 0xf07 RXF1EIDLbits;
+__sfr __at (0xf07) RXF1EIDL;
+volatile __RXF1EIDLbits_t __at (0xf07) RXF1EIDLbits;
 
-sfr at 0xf08 RXF2SIDH;
-volatile __RXF2SIDHbits_t at 0xf08 RXF2SIDHbits;
+__sfr __at (0xf08) RXF2SIDH;
+volatile __RXF2SIDHbits_t __at (0xf08) RXF2SIDHbits;
 
-sfr at 0xf09 RXF2SIDL;
-volatile __RXF2SIDLbits_t at 0xf09 RXF2SIDLbits;
+__sfr __at (0xf09) RXF2SIDL;
+volatile __RXF2SIDLbits_t __at (0xf09) RXF2SIDLbits;
 
-sfr at 0xf0a RXF2EIDH;
-volatile __RXF2EIDHbits_t at 0xf0a RXF2EIDHbits;
+__sfr __at (0xf0a) RXF2EIDH;
+volatile __RXF2EIDHbits_t __at (0xf0a) RXF2EIDHbits;
 
-sfr at 0xf0b RXF2EIDL;
-volatile __RXF2EIDLbits_t at 0xf0b RXF2EIDLbits;
+__sfr __at (0xf0b) RXF2EIDL;
+volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
 
-sfr at 0xf0c RXF3SIDH;
-volatile __RXF3SIDHbits_t at 0xf0c RXF3SIDHbits;
+__sfr __at (0xf0c) RXF3SIDH;
+volatile __RXF3SIDHbits_t __at (0xf0c) RXF3SIDHbits;
 
-sfr at 0xf0d RXF3SIDL;
-volatile __RXF3SIDLbits_t at 0xf0d RXF3SIDLbits;
+__sfr __at (0xf0d) RXF3SIDL;
+volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
 
-sfr at 0xf0e RXF3EIDH;
-volatile __RXF3EIDHbits_t at 0xf0e RXF3EIDHbits;
+__sfr __at (0xf0e) RXF3EIDH;
+volatile __RXF3EIDHbits_t __at (0xf0e) RXF3EIDHbits;
 
-sfr at 0xf0f RXF3EIDL;
-volatile __RXF3EIDLbits_t at 0xf0f RXF3EIDLbits;
+__sfr __at (0xf0f) RXF3EIDL;
+volatile __RXF3EIDLbits_t __at (0xf0f) RXF3EIDLbits;
 
-sfr at 0xf10 RXF4SIDH;
-volatile __RXF4SIDHbits_t at 0xf10 RXF4SIDHbits;
+__sfr __at (0xf10) RXF4SIDH;
+volatile __RXF4SIDHbits_t __at (0xf10) RXF4SIDHbits;
 
-sfr at 0xf11 RXF4SIDL;
-volatile __RXF4SIDLbits_t at 0xf11 RXF4SIDLbits;
+__sfr __at (0xf11) RXF4SIDL;
+volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
 
-sfr at 0xf12 RXF4EIDH;
-volatile __RXF4EIDHbits_t at 0xf12 RXF4EIDHbits;
+__sfr __at (0xf12) RXF4EIDH;
+volatile __RXF4EIDHbits_t __at (0xf12) RXF4EIDHbits;
 
-sfr at 0xf13 RXF4EIDL;
-volatile __RXF4EIDLbits_t at 0xf13 RXF4EIDLbits;
+__sfr __at (0xf13) RXF4EIDL;
+volatile __RXF4EIDLbits_t __at (0xf13) RXF4EIDLbits;
 
-sfr at 0xf14 RXF5SIDH;
-volatile __RXF5SIDHbits_t at 0xf14 RXF5SIDHbits;
+__sfr __at (0xf14) RXF5SIDH;
+volatile __RXF5SIDHbits_t __at (0xf14) RXF5SIDHbits;
 
-sfr at 0xf15 RXF5SIDL;
-volatile __RXF5SIDLbits_t at 0xf15 RXF5SIDLbits;
+__sfr __at (0xf15) RXF5SIDL;
+volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
 
-sfr at 0xf16 RXF5EIDH;
-volatile __RXF5EIDHbits_t at 0xf16 RXF5EIDHbits;
+__sfr __at (0xf16) RXF5EIDH;
+volatile __RXF5EIDHbits_t __at (0xf16) RXF5EIDHbits;
 
-sfr at 0xf17 RXF5EIDL;
-volatile __RXF5EIDLbits_t at 0xf17 RXF5EIDLbits;
+__sfr __at (0xf17) RXF5EIDL;
+volatile __RXF5EIDLbits_t __at (0xf17) RXF5EIDLbits;
 
-sfr at 0xf18 RXM0SIDH;
-volatile __RXM0SIDHbits_t at 0xf18 RXM0SIDHbits;
+__sfr __at (0xf18) RXM0SIDH;
+volatile __RXM0SIDHbits_t __at (0xf18) RXM0SIDHbits;
 
-sfr at 0xf19 RXM0SIDL;
-volatile __RXM0SIDLbits_t at 0xf19 RXM0SIDLbits;
+__sfr __at (0xf19) RXM0SIDL;
+volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
 
-sfr at 0xf1a RXM0EIDH;
-volatile __RXM0EIDHbits_t at 0xf1a RXM0EIDHbits;
+__sfr __at (0xf1a) RXM0EIDH;
+volatile __RXM0EIDHbits_t __at (0xf1a) RXM0EIDHbits;
 
-sfr at 0xf1b RXM0EIDL;
-volatile __RXM0EIDLbits_t at 0xf1b RXM0EIDLbits;
+__sfr __at (0xf1b) RXM0EIDL;
+volatile __RXM0EIDLbits_t __at (0xf1b) RXM0EIDLbits;
 
-sfr at 0xf1c RXM1SIDH;
-volatile __RXM1SIDHbits_t at 0xf1c RXM1SIDHbits;
+__sfr __at (0xf1c) RXM1SIDH;
+volatile __RXM1SIDHbits_t __at (0xf1c) RXM1SIDHbits;
 
-sfr at 0xf1d RXM1SIDL;
-volatile __RXM1SIDLbits_t at 0xf1d RXM1SIDLbits;
+__sfr __at (0xf1d) RXM1SIDL;
+volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
 
-sfr at 0xf1e RXM1EIDH;
-volatile __RXM1EIDHbits_t at 0xf1e RXM1EIDHbits;
+__sfr __at (0xf1e) RXM1EIDH;
+volatile __RXM1EIDHbits_t __at (0xf1e) RXM1EIDHbits;
 
-sfr at 0xf1f RXM1EIDL;
-volatile __RXM1EIDLbits_t at 0xf1f RXM1EIDLbits;
+__sfr __at (0xf1f) RXM1EIDL;
+volatile __RXM1EIDLbits_t __at (0xf1f) RXM1EIDLbits;
 
-sfr at 0xf20 TXB2CON;
-volatile __TXB2CONbits_t at 0xf20 TXB2CONbits;
+__sfr __at (0xf20) TXB2CON;
+volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
 
-sfr at 0xf21 TXB2SIDH;
-volatile __TXB2SIDHbits_t at 0xf21 TXB2SIDHbits;
+__sfr __at (0xf21) TXB2SIDH;
+volatile __TXB2SIDHbits_t __at (0xf21) TXB2SIDHbits;
 
-sfr at 0xf22 TXB2SIDL;
-volatile __TXB2SIDLbits_t at 0xf22 TXB2SIDLbits;
+__sfr __at (0xf22) TXB2SIDL;
+volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
 
-sfr at 0xf23 TXB2EIDH;
-volatile __TXB2EIDHbits_t at 0xf23 TXB2EIDHbits;
+__sfr __at (0xf23) TXB2EIDH;
+volatile __TXB2EIDHbits_t __at (0xf23) TXB2EIDHbits;
 
-sfr at 0xf24 TXB2EIDL;
-volatile __TXB2EIDLbits_t at 0xf24 TXB2EIDLbits;
+__sfr __at (0xf24) TXB2EIDL;
+volatile __TXB2EIDLbits_t __at (0xf24) TXB2EIDLbits;
 
-sfr at 0xf25 TXB2DLC;
-volatile __TXB2DLCbits_t at 0xf25 TXB2DLCbits;
+__sfr __at (0xf25) TXB2DLC;
+volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
 
-sfr at 0xf26 TXB2D0;
-volatile __TXB2D0bits_t at 0xf26 TXB2D0bits;
+__sfr __at (0xf26) TXB2D0;
+volatile __TXB2D0bits_t __at (0xf26) TXB2D0bits;
 
-sfr at 0xf27 TXB2D1;
-volatile __TXB2D1bits_t at 0xf27 TXB2D1bits;
+__sfr __at (0xf27) TXB2D1;
+volatile __TXB2D1bits_t __at (0xf27) TXB2D1bits;
 
-sfr at 0xf28 TXB2D2;
-volatile __TXB2D2bits_t at 0xf28 TXB2D2bits;
+__sfr __at (0xf28) TXB2D2;
+volatile __TXB2D2bits_t __at (0xf28) TXB2D2bits;
 
-sfr at 0xf29 TXB2D3;
-volatile __TXB2D3bits_t at 0xf29 TXB2D3bits;
+__sfr __at (0xf29) TXB2D3;
+volatile __TXB2D3bits_t __at (0xf29) TXB2D3bits;
 
-sfr at 0xf2a TXB2D4;
-volatile __TXB2D4bits_t at 0xf2a TXB2D4bits;
+__sfr __at (0xf2a) TXB2D4;
+volatile __TXB2D4bits_t __at (0xf2a) TXB2D4bits;
 
-sfr at 0xf2b TXB2D5;
-volatile __TXB2D5bits_t at 0xf2b TXB2D5bits;
+__sfr __at (0xf2b) TXB2D5;
+volatile __TXB2D5bits_t __at (0xf2b) TXB2D5bits;
 
-sfr at 0xf2c TXB2D6;
-volatile __TXB2D6bits_t at 0xf2c TXB2D6bits;
+__sfr __at (0xf2c) TXB2D6;
+volatile __TXB2D6bits_t __at (0xf2c) TXB2D6bits;
 
-sfr at 0xf2d TXB2D7;
-volatile __TXB2D7bits_t at 0xf2d TXB2D7bits;
+__sfr __at (0xf2d) TXB2D7;
+volatile __TXB2D7bits_t __at (0xf2d) TXB2D7bits;
 
-sfr at 0xf2e CANSTATRO4;
-volatile __CANSTATRO4bits_t at 0xf2e CANSTATRO4bits;
+__sfr __at (0xf2e) CANSTATRO4;
+volatile __CANSTATRO4bits_t __at (0xf2e) CANSTATRO4bits;
 
-sfr at 0xf30 TXB1CON;
-volatile __TXB1CONbits_t at 0xf30 TXB1CONbits;
+__sfr __at (0xf30) TXB1CON;
+volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
 
-sfr at 0xf31 TXB1SIDH;
-volatile __TXB1SIDHbits_t at 0xf31 TXB1SIDHbits;
+__sfr __at (0xf31) TXB1SIDH;
+volatile __TXB1SIDHbits_t __at (0xf31) TXB1SIDHbits;
 
-sfr at 0xf32 TXB1SIDL;
-volatile __TXB1SIDLbits_t at 0xf32 TXB1SIDLbits;
+__sfr __at (0xf32) TXB1SIDL;
+volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
 
-sfr at 0xf33 TXB1EIDH;
-volatile __TXB1EIDHbits_t at 0xf33 TXB1EIDHbits;
+__sfr __at (0xf33) TXB1EIDH;
+volatile __TXB1EIDHbits_t __at (0xf33) TXB1EIDHbits;
 
-sfr at 0xf34 TXB1EIDL;
-volatile __TXB1EIDLbits_t at 0xf34 TXB1EIDLbits;
+__sfr __at (0xf34) TXB1EIDL;
+volatile __TXB1EIDLbits_t __at (0xf34) TXB1EIDLbits;
 
-sfr at 0xf35 TXB1DLC;
-volatile __TXB1DLCbits_t at 0xf35 TXB1DLCbits;
+__sfr __at (0xf35) TXB1DLC;
+volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
 
-sfr at 0xf36 TXB1D0;
-volatile __TXB1D0bits_t at 0xf36 TXB1D0bits;
+__sfr __at (0xf36) TXB1D0;
+volatile __TXB1D0bits_t __at (0xf36) TXB1D0bits;
 
-sfr at 0xf37 TXB1D1;
-volatile __TXB1D1bits_t at 0xf37 TXB1D1bits;
+__sfr __at (0xf37) TXB1D1;
+volatile __TXB1D1bits_t __at (0xf37) TXB1D1bits;
 
-sfr at 0xf38 TXB1D2;
-volatile __TXB1D2bits_t at 0xf38 TXB1D2bits;
+__sfr __at (0xf38) TXB1D2;
+volatile __TXB1D2bits_t __at (0xf38) TXB1D2bits;
 
-sfr at 0xf39 TXB1D3;
-volatile __TXB1D3bits_t at 0xf39 TXB1D3bits;
+__sfr __at (0xf39) TXB1D3;
+volatile __TXB1D3bits_t __at (0xf39) TXB1D3bits;
 
-sfr at 0xf3a TXB1D4;
-volatile __TXB1D4bits_t at 0xf3a TXB1D4bits;
+__sfr __at (0xf3a) TXB1D4;
+volatile __TXB1D4bits_t __at (0xf3a) TXB1D4bits;
 
-sfr at 0xf3b TXB1D5;
-volatile __TXB1D5bits_t at 0xf3b TXB1D5bits;
+__sfr __at (0xf3b) TXB1D5;
+volatile __TXB1D5bits_t __at (0xf3b) TXB1D5bits;
 
-sfr at 0xf3c TXB1D6;
-volatile __TXB1D6bits_t at 0xf3c TXB1D6bits;
+__sfr __at (0xf3c) TXB1D6;
+volatile __TXB1D6bits_t __at (0xf3c) TXB1D6bits;
 
-sfr at 0xf3d TXB1D7;
-volatile __TXB1D7bits_t at 0xf3d TXB1D7bits;
+__sfr __at (0xf3d) TXB1D7;
+volatile __TXB1D7bits_t __at (0xf3d) TXB1D7bits;
 
-sfr at 0xf3e CANSTATRO3;
-volatile __CANSTATRO3bits_t at 0xf3e CANSTATRO3bits;
+__sfr __at (0xf3e) CANSTATRO3;
+volatile __CANSTATRO3bits_t __at (0xf3e) CANSTATRO3bits;
 
-sfr at 0xf40 TXB0CON;
-volatile __TXB0CONbits_t at 0xf40 TXB0CONbits;
+__sfr __at (0xf40) TXB0CON;
+volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
 
-sfr at 0xf41 TXB0SIDH;
-volatile __TXB0SIDHbits_t at 0xf41 TXB0SIDHbits;
+__sfr __at (0xf41) TXB0SIDH;
+volatile __TXB0SIDHbits_t __at (0xf41) TXB0SIDHbits;
 
-sfr at 0xf42 TXB0SIDL;
-volatile __TXB0SIDLbits_t at 0xf42 TXB0SIDLbits;
+__sfr __at (0xf42) TXB0SIDL;
+volatile __TXB0SIDLbits_t __at (0xf42) TXB0SIDLbits;
 
-sfr at 0xf43 TXB0EIDH;
-volatile __TXB0EIDHbits_t at 0xf43 TXB0EIDHbits;
+__sfr __at (0xf43) TXB0EIDH;
+volatile __TXB0EIDHbits_t __at (0xf43) TXB0EIDHbits;
 
-sfr at 0xf44 TXB0EIDL;
-volatile __TXB0EIDLbits_t at 0xf44 TXB0EIDLbits;
+__sfr __at (0xf44) TXB0EIDL;
+volatile __TXB0EIDLbits_t __at (0xf44) TXB0EIDLbits;
 
-sfr at 0xf45 TXB0DLC;
-volatile __TXB0DLCbits_t at 0xf45 TXB0DLCbits;
+__sfr __at (0xf45) TXB0DLC;
+volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
 
-sfr at 0xf46 TXB0D0;
-volatile __TXB0D0bits_t at 0xf46 TXB0D0bits;
+__sfr __at (0xf46) TXB0D0;
+volatile __TXB0D0bits_t __at (0xf46) TXB0D0bits;
 
-sfr at 0xf47 TXB0D1;
-volatile __TXB0D1bits_t at 0xf47 TXB0D1bits;
+__sfr __at (0xf47) TXB0D1;
+volatile __TXB0D1bits_t __at (0xf47) TXB0D1bits;
 
-sfr at 0xf48 TXB0D2;
-volatile __TXB0D2bits_t at 0xf48 TXB0D2bits;
+__sfr __at (0xf48) TXB0D2;
+volatile __TXB0D2bits_t __at (0xf48) TXB0D2bits;
 
-sfr at 0xf49 TXB0D3;
-volatile __TXB0D3bits_t at 0xf49 TXB0D3bits;
+__sfr __at (0xf49) TXB0D3;
+volatile __TXB0D3bits_t __at (0xf49) TXB0D3bits;
 
-sfr at 0xf4a TXB0D4;
-volatile __TXB0D4bits_t at 0xf4a TXB0D4bits;
+__sfr __at (0xf4a) TXB0D4;
+volatile __TXB0D4bits_t __at (0xf4a) TXB0D4bits;
 
-sfr at 0xf4b TXB0D5;
-volatile __TXB0D5bits_t at 0xf4b TXB0D5bits;
+__sfr __at (0xf4b) TXB0D5;
+volatile __TXB0D5bits_t __at (0xf4b) TXB0D5bits;
 
-sfr at 0xf4c TXB0D6;
-volatile __TXB0D6bits_t at 0xf4c TXB0D6bits;
+__sfr __at (0xf4c) TXB0D6;
+volatile __TXB0D6bits_t __at (0xf4c) TXB0D6bits;
 
-sfr at 0xf4d TXB0D7;
-volatile __TXB0D7bits_t at 0xf4d TXB0D7bits;
+__sfr __at (0xf4d) TXB0D7;
+volatile __TXB0D7bits_t __at (0xf4d) TXB0D7bits;
 
-sfr at 0xf4e CANSTATRO2;
-volatile __CANSTATRO2bits_t at 0xf4e CANSTATRO2bits;
+__sfr __at (0xf4e) CANSTATRO2;
+volatile __CANSTATRO2bits_t __at (0xf4e) CANSTATRO2bits;
 
-sfr at 0xf50 RXB1CON;
-volatile __RXB1CONbits_t at 0xf50 RXB1CONbits;
+__sfr __at (0xf50) RXB1CON;
+volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
 
-sfr at 0xf51 RXB1SIDH;
-volatile __RXB1SIDHbits_t at 0xf51 RXB1SIDHbits;
+__sfr __at (0xf51) RXB1SIDH;
+volatile __RXB1SIDHbits_t __at (0xf51) RXB1SIDHbits;
 
-sfr at 0xf52 RXB1SIDL;
-volatile __RXB1SIDLbits_t at 0xf52 RXB1SIDLbits;
+__sfr __at (0xf52) RXB1SIDL;
+volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
 
-sfr at 0xf53 RXB1EIDH;
-volatile __RXB1EIDHbits_t at 0xf53 RXB1EIDHbits;
+__sfr __at (0xf53) RXB1EIDH;
+volatile __RXB1EIDHbits_t __at (0xf53) RXB1EIDHbits;
 
-sfr at 0xf54 RXB1EIDL;
-volatile __RXB1EIDLbits_t at 0xf54 RXB1EIDLbits;
+__sfr __at (0xf54) RXB1EIDL;
+volatile __RXB1EIDLbits_t __at (0xf54) RXB1EIDLbits;
 
-sfr at 0xf55 RXB1DLC;
-volatile __RXB1DLCbits_t at 0xf55 RXB1DLCbits;
+__sfr __at (0xf55) RXB1DLC;
+volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
 
-sfr at 0xf56 RXB1D0;
-volatile __RXB1D0bits_t at 0xf56 RXB1D0bits;
+__sfr __at (0xf56) RXB1D0;
+volatile __RXB1D0bits_t __at (0xf56) RXB1D0bits;
 
-sfr at 0xf57 RXB1D1;
-volatile __RXB1D1bits_t at 0xf57 RXB1D1bits;
+__sfr __at (0xf57) RXB1D1;
+volatile __RXB1D1bits_t __at (0xf57) RXB1D1bits;
 
-sfr at 0xf58 RXB1D2;
-volatile __RXB1D2bits_t at 0xf58 RXB1D2bits;
+__sfr __at (0xf58) RXB1D2;
+volatile __RXB1D2bits_t __at (0xf58) RXB1D2bits;
 
-sfr at 0xf59 RXB1D3;
-volatile __RXB1D3bits_t at 0xf59 RXB1D3bits;
+__sfr __at (0xf59) RXB1D3;
+volatile __RXB1D3bits_t __at (0xf59) RXB1D3bits;
 
-sfr at 0xf5a RXB1D4;
-volatile __RXB1D4bits_t at 0xf5a RXB1D4bits;
+__sfr __at (0xf5a) RXB1D4;
+volatile __RXB1D4bits_t __at (0xf5a) RXB1D4bits;
 
-sfr at 0xf5b RXB1D5;
-volatile __RXB1D5bits_t at 0xf5b RXB1D5bits;
+__sfr __at (0xf5b) RXB1D5;
+volatile __RXB1D5bits_t __at (0xf5b) RXB1D5bits;
 
-sfr at 0xf5c RXB1D6;
-volatile __RXB1D6bits_t at 0xf5c RXB1D6bits;
+__sfr __at (0xf5c) RXB1D6;
+volatile __RXB1D6bits_t __at (0xf5c) RXB1D6bits;
 
-sfr at 0xf5d RXB1D7;
-volatile __RXB1D7bits_t at 0xf5d RXB1D7bits;
+__sfr __at (0xf5d) RXB1D7;
+volatile __RXB1D7bits_t __at (0xf5d) RXB1D7bits;
 
-sfr at 0xf5e CANSTATRO1;
-volatile __CANSTATRO1bits_t at 0xf5e CANSTATRO1bits;
+__sfr __at (0xf5e) CANSTATRO1;
+volatile __CANSTATRO1bits_t __at (0xf5e) CANSTATRO1bits;
 
-sfr at 0xf60 RXB0CON;
-volatile __RXB0CONbits_t at 0xf60 RXB0CONbits;
+__sfr __at (0xf60) RXB0CON;
+volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
 
-sfr at 0xf61 RXB0SIDH;
-volatile __RXB0SIDHbits_t at 0xf61 RXB0SIDHbits;
+__sfr __at (0xf61) RXB0SIDH;
+volatile __RXB0SIDHbits_t __at (0xf61) RXB0SIDHbits;
 
-sfr at 0xf62 RXB0SIDL;
-volatile __RXB0SIDLbits_t at 0xf62 RXB0SIDLbits;
+__sfr __at (0xf62) RXB0SIDL;
+volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
 
-sfr at 0xf63 RXB0EIDH;
-volatile __RXB0EIDHbits_t at 0xf63 RXB0EIDHbits;
+__sfr __at (0xf63) RXB0EIDH;
+volatile __RXB0EIDHbits_t __at (0xf63) RXB0EIDHbits;
 
-sfr at 0xf64 RXB0EIDL;
-volatile __RXB0EIDLbits_t at 0xf64 RXB0EIDLbits;
+__sfr __at (0xf64) RXB0EIDL;
+volatile __RXB0EIDLbits_t __at (0xf64) RXB0EIDLbits;
 
-sfr at 0xf65 RXB0DLC;
-volatile __RXB0DLCbits_t at 0xf65 RXB0DLCbits;
+__sfr __at (0xf65) RXB0DLC;
+volatile __RXB0DLCbits_t __at (0xf65) RXB0DLCbits;
 
-sfr at 0xf66 RXB0D0;
-sfr at 0xf67 RXB0D1;
-sfr at 0xf68 RXB0D2;
-sfr at 0xf69 RXB0D3;
-sfr at 0xf6a RXB0D4;
-sfr at 0xf6b RXB0D5;
-sfr at 0xf6c RXB0D6;
-sfr at 0xf6d RXB0D7;
-sfr at 0xf6e CANSTAT;
-volatile __CANSTATbits_t at 0xf6e CANSTATbits;
+__sfr __at (0xf66) RXB0D0;
+__sfr __at (0xf67) RXB0D1;
+__sfr __at (0xf68) RXB0D2;
+__sfr __at (0xf69) RXB0D3;
+__sfr __at (0xf6a) RXB0D4;
+__sfr __at (0xf6b) RXB0D5;
+__sfr __at (0xf6c) RXB0D6;
+__sfr __at (0xf6d) RXB0D7;
+__sfr __at (0xf6e) CANSTAT;
+volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
 
-sfr at 0xf6f CANCON;
-volatile __CANCONbits_t at 0xf6f CANCONbits;
+__sfr __at (0xf6f) CANCON;
+volatile __CANCONbits_t __at (0xf6f) CANCONbits;
 
-sfr at 0xf70 BRGCON1;
-volatile __BRGCON1bits_t at 0xf70 BRGCON1bits;
+__sfr __at (0xf70) BRGCON1;
+volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
 
-sfr at 0xf71 BRGCON2;
-volatile __BRGCON2bits_t at 0xf71 BRGCON2bits;
+__sfr __at (0xf71) BRGCON2;
+volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
 
-sfr at 0xf72 BRGCON3;
-volatile __BRGCON3bits_t at 0xf72 BRGCON3bits;
+__sfr __at (0xf72) BRGCON3;
+volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
 
-sfr at 0xf73 CIOCON;
-volatile __CIOCONbits_t at 0xf73 CIOCONbits;
+__sfr __at (0xf73) CIOCON;
+volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
 
-sfr at 0xf74 COMSTAT;
-volatile __COMSTATbits_t at 0xf74 COMSTATbits;
+__sfr __at (0xf74) COMSTAT;
+volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-sfr at 0xf75 RXERRCNT;
-volatile __RXERRCNTbits_t at 0xf75 RXERRCNTbits;
+__sfr __at (0xf75) RXERRCNT;
+volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-sfr at 0xf76 TXERRCNT;
-volatile __TXERRCNTbits_t at 0xf76 TXERRCNTbits;
+__sfr __at (0xf76) TXERRCNT;
+volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
 
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
 
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb6 ECCPAS;
-volatile __ECCPASbits_t at 0xfb6 ECCPASbits;
-
-sfr at 0xfb7 ECCP1DEL;
-volatile __ECCP1DELbits_t at 0xfb7 ECCP1DELbits;
-
-sfr at 0xfba ECCP1CON;
-volatile __ECCP1CONbits_t at 0xfba ECCP1CONbits;
-
-sfr at 0xfbb ECCPR1L;
-sfr at 0xfbc ECCPR1H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb6) ECCPAS;
+volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
+
+__sfr __at (0xfb7) ECCP1DEL;
+volatile __ECCP1DELbits_t __at (0xfb7) ECCP1DELbits;
+
+__sfr __at (0xfba) ECCP1CON;
+volatile __ECCP1CONbits_t __at (0xfba) ECCP1CONbits;
+
+__sfr __at (0xfbb) ECCPR1L;
+__sfr __at (0xfbc) ECCPR1H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f6520.c b/device/lib/pic16/libdev/pic18f6520.c
index 4d23130c07872f67f6cad3d9b87d635b0e4e74f4..30f5ee9f94808ae9d554f03caf14f4734a512f79 100644 (file)
--- a/device/lib/pic16/libdev/pic18f6520.c
+++ b/device/lib/pic16/libdev/pic18f6520.c
@@ -14,264 +14,264 @@
 
 #include <pic18f6520.h>
 
-sfr at 0xf6b RCSTA2;
-volatile __RCSTA2bits_t at 0xf6b RCSTA2bits;
+__sfr __at (0xf6b) RCSTA2;
+volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-sfr at 0xf6c TXSTA2;
-volatile __TXSTA2bits_t at 0xf6c TXSTA2bits;
+__sfr __at (0xf6c) TXSTA2;
+volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-sfr at 0xf6d TXREG2;
-sfr at 0xf6e RCREG2;
-sfr at 0xf6f SPBRG2;
-sfr at 0xf70 CCP5CON;
-volatile __CCP5CONbits_t at 0xf70 CCP5CONbits;
+__sfr __at (0xf6d) TXREG2;
+__sfr __at (0xf6e) RCREG2;
+__sfr __at (0xf6f) SPBRG2;
+__sfr __at (0xf70) CCP5CON;
+volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-sfr at 0xf71 CCPR5L;
-sfr at 0xf72 CCPR5H;
-sfr at 0xf73 CCP4CON;
-volatile __CCP4CONbits_t at 0xf73 CCP4CONbits;
+__sfr __at (0xf71) CCPR5L;
+__sfr __at (0xf72) CCPR5H;
+__sfr __at (0xf73) CCP4CON;
+volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-sfr at 0xf74 CCPR4L;
-sfr at 0xf75 CCPR4H;
-sfr at 0xf76 T4CON;
-volatile __T4CONbits_t at 0xf76 T4CONbits;
+__sfr __at (0xf74) CCPR4L;
+__sfr __at (0xf75) CCPR4H;
+__sfr __at (0xf76) T4CON;
+volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-sfr at 0xf77 PR4;
-sfr at 0xf78 TMR4;
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf77) PR4;
+__sfr __at (0xf78) TMR4;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf85 PORTF;
-volatile __PORTFbits_t at 0xf85 PORTFbits;
+__sfr __at (0xf85) PORTF;
+volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-sfr at 0xf86 PORTG;
-volatile __PORTGbits_t at 0xf86 PORTGbits;
+__sfr __at (0xf86) PORTG;
+volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf8e LATF;
-volatile __LATFbits_t at 0xf8e LATFbits;
+__sfr __at (0xf8e) LATF;
+volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-sfr at 0xf8f LATG;
-volatile __LATGbits_t at 0xf8f LATGbits;
+__sfr __at (0xf8f) LATG;
+volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf97 TRISF;
-volatile __TRISFbits_t at 0xf97 TRISFbits;
+__sfr __at (0xf97) TRISF;
+volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-sfr at 0xf98 TRISG;
-volatile __TRISGbits_t at 0xf98 TRISGbits;
+__sfr __at (0xf98) TRISG;
+volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-sfr at 0xf9c MEMCON;
-volatile __MEMCONbits_t at 0xf9c MEMCONbits;
+__sfr __at (0xf9c) MEMCON;
+volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa EEADRH;
-sfr at 0xfab RCSTA1;
-volatile __RCSTA1bits_t at 0xfab RCSTA1bits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) EEADRH;
+__sfr __at (0xfab) RCSTA1;
+volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-sfr at 0xfac TXSTA1;
-volatile __TXSTA1bits_t at 0xfac TXSTA1bits;
+__sfr __at (0xfac) TXSTA1;
+volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-sfr at 0xfad TXREG1;
-sfr at 0xfae RCREG1;
-sfr at 0xfaf SPBRG1;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG1;
+__sfr __at (0xfae) RCREG1;
+__sfr __at (0xfaf) SPBRG1;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb7 CCP3CON;
-volatile __CCP3CONbits_t at 0xfb7 CCP3CONbits;
-
-sfr at 0xfb8 CCPR3L;
-sfr at 0xfb9 CCPR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb7) CCP3CON;
+volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
+
+__sfr __at (0xfb8) CCPR3L;
+__sfr __at (0xfb9) CCPR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f6620.c b/device/lib/pic16/libdev/pic18f6620.c
index 55fd34362c5784f810bed7735f563519e0dfe5ec..587488113eafdf27e1c00df3d0961768fd70ce40 100644 (file)
--- a/device/lib/pic16/libdev/pic18f6620.c
+++ b/device/lib/pic16/libdev/pic18f6620.c
@@ -14,261 +14,261 @@
 
 #include <pic18f6620.h>
 
-sfr at 0xf6b RCSTA2;
-volatile __RCSTA2bits_t at 0xf6b RCSTA2bits;
+__sfr __at (0xf6b) RCSTA2;
+volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-sfr at 0xf6c TXSTA2;
-volatile __TXSTA2bits_t at 0xf6c TXSTA2bits;
+__sfr __at (0xf6c) TXSTA2;
+volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-sfr at 0xf6d TXREG2;
-sfr at 0xf6e RCREG2;
-sfr at 0xf6f SPBRG2;
-sfr at 0xf70 CCP5CON;
-volatile __CCP5CONbits_t at 0xf70 CCP5CONbits;
+__sfr __at (0xf6d) TXREG2;
+__sfr __at (0xf6e) RCREG2;
+__sfr __at (0xf6f) SPBRG2;
+__sfr __at (0xf70) CCP5CON;
+volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-sfr at 0xf71 CCPR5L;
-sfr at 0xf72 CCPR5H;
-sfr at 0xf73 CCP4CON;
-volatile __CCP4CONbits_t at 0xf73 CCP4CONbits;
+__sfr __at (0xf71) CCPR5L;
+__sfr __at (0xf72) CCPR5H;
+__sfr __at (0xf73) CCP4CON;
+volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-sfr at 0xf74 CCPR4L;
-sfr at 0xf75 CCPR4H;
-sfr at 0xf76 T4CON;
-volatile __T4CONbits_t at 0xf76 T4CONbits;
+__sfr __at (0xf74) CCPR4L;
+__sfr __at (0xf75) CCPR4H;
+__sfr __at (0xf76) T4CON;
+volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-sfr at 0xf77 PR4;
-sfr at 0xf78 TMR4;
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf77) PR4;
+__sfr __at (0xf78) TMR4;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf85 PORTF;
-volatile __PORTFbits_t at 0xf85 PORTFbits;
+__sfr __at (0xf85) PORTF;
+volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-sfr at 0xf86 PORTG;
-volatile __PORTGbits_t at 0xf86 PORTGbits;
+__sfr __at (0xf86) PORTG;
+volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf8e LATF;
-volatile __LATFbits_t at 0xf8e LATFbits;
+__sfr __at (0xf8e) LATF;
+volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-sfr at 0xf8f LATG;
-volatile __LATGbits_t at 0xf8f LATGbits;
+__sfr __at (0xf8f) LATG;
+volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf97 TRISF;
-volatile __TRISFbits_t at 0xf97 TRISFbits;
+__sfr __at (0xf97) TRISF;
+volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-sfr at 0xf98 TRISG;
-volatile __TRISGbits_t at 0xf98 TRISGbits;
+__sfr __at (0xf98) TRISG;
+volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa EEADRH;
-sfr at 0xfab RCSTA1;
-volatile __RCSTA1bits_t at 0xfab RCSTA1bits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) EEADRH;
+__sfr __at (0xfab) RCSTA1;
+volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-sfr at 0xfac TXSTA1;
-volatile __TXSTA1bits_t at 0xfac TXSTA1bits;
+__sfr __at (0xfac) TXSTA1;
+volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-sfr at 0xfad TXREG1;
-sfr at 0xfae RCREG1;
-sfr at 0xfaf SPBRG1;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG1;
+__sfr __at (0xfae) RCREG1;
+__sfr __at (0xfaf) SPBRG1;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb7 CCP3CON;
-volatile __CCP3CONbits_t at 0xfb7 CCP3CONbits;
-
-sfr at 0xfb8 CCPR3L;
-sfr at 0xfb9 CCPR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb7) CCP3CON;
+volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
+
+__sfr __at (0xfb8) CCPR3L;
+__sfr __at (0xfb9) CCPR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f6680.c b/device/lib/pic16/libdev/pic18f6680.c
index a5493b158e31a3e31c1ee24452f13d18c66411d0..ec19525dfb5d858c78c70c24c2d8e6d067611dc5 100644 (file)
--- a/device/lib/pic16/libdev/pic18f6680.c
+++ b/device/lib/pic16/libdev/pic18f6680.c
@@ -14,413 +14,413 @@
 
 #include <pic18f6680.h>
 
-sfr at 0xf00 RXF0SIDH;
-sfr at 0xf01 RXF0SIDL;
-volatile __RXF0SIDLbits_t at 0xf01 RXF0SIDLbits;
-
-sfr at 0xf02 RXF0EIDH;
-sfr at 0xf03 RXF0EIDL;
-sfr at 0xf04 RXF1SIDH;
-sfr at 0xf05 RXF1SIDL;
-volatile __RXF1SIDLbits_t at 0xf05 RXF1SIDLbits;
-
-sfr at 0xf06 RXF1EIDH;
-sfr at 0xf07 RXF1EIDL;
-sfr at 0xf08 RXF2SIDH;
-sfr at 0xf09 RXF2SIDL;
-sfr at 0xf0a RXF2EIDH;
-sfr at 0xf0b RXF2EIDL;
-volatile __RXF2EIDLbits_t at 0xf0b RXF2EIDLbits;
-
-sfr at 0xf0c RXF3SIDH;
-sfr at 0xf0d RXF3SIDL;
-volatile __RXF3SIDLbits_t at 0xf0d RXF3SIDLbits;
-
-sfr at 0xf0e RXF3EIDH;
-sfr at 0xf0f RXF3EIDL;
-sfr at 0xf10 RXF4SIDH;
-sfr at 0xf11 RXF4SIDL;
-volatile __RXF4SIDLbits_t at 0xf11 RXF4SIDLbits;
-
-sfr at 0xf12 RXF4EIDH;
-sfr at 0xf13 RXF4EIDL;
-sfr at 0xf14 RXF5SIDH;
-sfr at 0xf15 RXF5SIDL;
-volatile __RXF5SIDLbits_t at 0xf15 RXF5SIDLbits;
-
-sfr at 0xf16 RXF5EIDH;
-sfr at 0xf17 RXF5EIDL;
-sfr at 0xf18 RXM0SIDH;
-sfr at 0xf19 RXM0SIDL;
-volatile __RXM0SIDLbits_t at 0xf19 RXM0SIDLbits;
-
-sfr at 0xf1a RXM0EIDH;
-sfr at 0xf1b RXM0EIDL;
-sfr at 0xf1c RXM1SIDH;
-sfr at 0xf1d RXM1SIDL;
-volatile __RXM1SIDLbits_t at 0xf1d RXM1SIDLbits;
-
-sfr at 0xf1e RXM1EIDH;
-sfr at 0xf1f RXM1EIDL;
-sfr at 0xf20 TXB2CON;
-volatile __TXB2CONbits_t at 0xf20 TXB2CONbits;
-
-sfr at 0xf21 TXB2SIDH;
-sfr at 0xf22 TXB2SIDL;
-volatile __TXB2SIDLbits_t at 0xf22 TXB2SIDLbits;
-
-sfr at 0xf23 TXB2EIDH;
-sfr at 0xf24 TXB2EIDL;
-sfr at 0xf25 TXB2DLC;
-volatile __TXB2DLCbits_t at 0xf25 TXB2DLCbits;
-
-sfr at 0xf26 TXB2D0;
-sfr at 0xf27 TXB2D1;
-sfr at 0xf28 TXB2D2;
-sfr at 0xf29 TXB2D3;
-sfr at 0xf2a TXB2D4;
-sfr at 0xf2b TXB2D5;
-sfr at 0xf2c TXB2D6;
-sfr at 0xf2d TXB2D7;
-sfr at 0xf2e CANSTATRO3;
-sfr at 0xf30 TXB1CON;
-volatile __TXB1CONbits_t at 0xf30 TXB1CONbits;
-
-sfr at 0xf31 TXB1SIDH;
-sfr at 0xf32 TXB1SIDL;
-volatile __TXB1SIDLbits_t at 0xf32 TXB1SIDLbits;
-
-sfr at 0xf33 TXB1EIDH;
-sfr at 0xf34 TXB1EIDL;
-sfr at 0xf35 TXB1DLC;
-volatile __TXB1DLCbits_t at 0xf35 TXB1DLCbits;
-
-sfr at 0xf36 TXB1D0;
-sfr at 0xf37 TXB1D1;
-sfr at 0xf38 TXB1D2;
-sfr at 0xf39 TXB1D3;
-sfr at 0xf3a TXB1D4;
-sfr at 0xf3b TXB1D5;
-sfr at 0xf3c TXB1D6;
-sfr at 0xf3d TXB1D7;
-sfr at 0xf3e CANSTATRO2;
-sfr at 0xf40 TXB0CON;
-volatile __TXB0CONbits_t at 0xf40 TXB0CONbits;
-
-sfr at 0xf41 TXB0SIDH;
-sfr at 0xf42 TXB0SIDL;
-sfr at 0xf43 TXB0EIDH;
-sfr at 0xf44 TXB0EIDL;
-sfr at 0xf45 TXB0DLC;
-volatile __TXB0DLCbits_t at 0xf45 TXB0DLCbits;
-
-sfr at 0xf46 TXB0D0;
-sfr at 0xf47 TXB0D1;
-sfr at 0xf48 TXB0D2;
-sfr at 0xf49 TXB0D3;
-sfr at 0xf4a TXB0D4;
-sfr at 0xf4b TXB0D5;
-sfr at 0xf4c TXB0D6;
-sfr at 0xf4d TXB0D7;
-sfr at 0xf4e CANSTATRO1;
-sfr at 0xf50 RXB1CON;
-volatile __RXB1CONbits_t at 0xf50 RXB1CONbits;
-
-sfr at 0xf51 RXB1SIDH;
-sfr at 0xf52 RXB1SIDL;
-volatile __RXB1SIDLbits_t at 0xf52 RXB1SIDLbits;
-
-sfr at 0xf53 RXB1EIDH;
-sfr at 0xf54 RXB1EIDL;
-sfr at 0xf55 RXB1DLC;
-volatile __RXB1DLCbits_t at 0xf55 RXB1DLCbits;
-
-sfr at 0xf56 RXB1D0;
-sfr at 0xf57 RXB1D1;
-sfr at 0xf58 RXB1D2;
-sfr at 0xf59 RXB1D3;
-sfr at 0xf5a RXB1D4;
-sfr at 0xf5b RXB1D5;
-sfr at 0xf5c RXB1D6;
-sfr at 0xf5d RXB1D7;
-sfr at 0xf5e CANSTATRO0;
-sfr at 0xf60 RXB0CON;
-volatile __RXB0CONbits_t at 0xf60 RXB0CONbits;
-
-sfr at 0xf61 RXB0SIDH;
-sfr at 0xf62 RXB0SIDL;
-volatile __RXB0SIDLbits_t at 0xf62 RXB0SIDLbits;
-
-sfr at 0xf63 RXB0EIDH;
-sfr at 0xf64 RXB0EIDL;
-sfr at 0xf65 RXB0DLC;
-sfr at 0xf66 RXB0D0;
-sfr at 0xf67 RXB0D1;
-sfr at 0xf68 RXB0D2;
-sfr at 0xf69 RXB0D3;
-sfr at 0xf6a RXB0D4;
-sfr at 0xf6b RXB0D5;
-sfr at 0xf6c RXB0D6;
-sfr at 0xf6d RXB0D7;
-sfr at 0xf6e CANSTAT;
-volatile __CANSTATbits_t at 0xf6e CANSTATbits;
-
-sfr at 0xf6f CANCON;
-volatile __CANCONbits_t at 0xf6f CANCONbits;
-
-sfr at 0xf70 BRGCON1;
-volatile __BRGCON1bits_t at 0xf70 BRGCON1bits;
-
-sfr at 0xf71 BRGCON2;
-volatile __BRGCON2bits_t at 0xf71 BRGCON2bits;
-
-sfr at 0xf72 BRGCON3;
-volatile __BRGCON3bits_t at 0xf72 BRGCON3bits;
-
-sfr at 0xf73 CIOCON;
-volatile __CIOCONbits_t at 0xf73 CIOCONbits;
-
-sfr at 0xf74 COMSTAT;
-volatile __COMSTATbits_t at 0xf74 COMSTATbits;
+__sfr __at (0xf00) RXF0SIDH;
+__sfr __at (0xf01) RXF0SIDL;
+volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
+
+__sfr __at (0xf02) RXF0EIDH;
+__sfr __at (0xf03) RXF0EIDL;
+__sfr __at (0xf04) RXF1SIDH;
+__sfr __at (0xf05) RXF1SIDL;
+volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
+
+__sfr __at (0xf06) RXF1EIDH;
+__sfr __at (0xf07) RXF1EIDL;
+__sfr __at (0xf08) RXF2SIDH;
+__sfr __at (0xf09) RXF2SIDL;
+__sfr __at (0xf0a) RXF2EIDH;
+__sfr __at (0xf0b) RXF2EIDL;
+volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
+
+__sfr __at (0xf0c) RXF3SIDH;
+__sfr __at (0xf0d) RXF3SIDL;
+volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
+
+__sfr __at (0xf0e) RXF3EIDH;
+__sfr __at (0xf0f) RXF3EIDL;
+__sfr __at (0xf10) RXF4SIDH;
+__sfr __at (0xf11) RXF4SIDL;
+volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
+
+__sfr __at (0xf12) RXF4EIDH;
+__sfr __at (0xf13) RXF4EIDL;
+__sfr __at (0xf14) RXF5SIDH;
+__sfr __at (0xf15) RXF5SIDL;
+volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
+
+__sfr __at (0xf16) RXF5EIDH;
+__sfr __at (0xf17) RXF5EIDL;
+__sfr __at (0xf18) RXM0SIDH;
+__sfr __at (0xf19) RXM0SIDL;
+volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
+
+__sfr __at (0xf1a) RXM0EIDH;
+__sfr __at (0xf1b) RXM0EIDL;
+__sfr __at (0xf1c) RXM1SIDH;
+__sfr __at (0xf1d) RXM1SIDL;
+volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
+
+__sfr __at (0xf1e) RXM1EIDH;
+__sfr __at (0xf1f) RXM1EIDL;
+__sfr __at (0xf20) TXB2CON;
+volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
+
+__sfr __at (0xf21) TXB2SIDH;
+__sfr __at (0xf22) TXB2SIDL;
+volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
+
+__sfr __at (0xf23) TXB2EIDH;
+__sfr __at (0xf24) TXB2EIDL;
+__sfr __at (0xf25) TXB2DLC;
+volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
+
+__sfr __at (0xf26) TXB2D0;
+__sfr __at (0xf27) TXB2D1;
+__sfr __at (0xf28) TXB2D2;
+__sfr __at (0xf29) TXB2D3;
+__sfr __at (0xf2a) TXB2D4;
+__sfr __at (0xf2b) TXB2D5;
+__sfr __at (0xf2c) TXB2D6;
+__sfr __at (0xf2d) TXB2D7;
+__sfr __at (0xf2e) CANSTATRO3;
+__sfr __at (0xf30) TXB1CON;
+volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
+
+__sfr __at (0xf31) TXB1SIDH;
+__sfr __at (0xf32) TXB1SIDL;
+volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
+
+__sfr __at (0xf33) TXB1EIDH;
+__sfr __at (0xf34) TXB1EIDL;
+__sfr __at (0xf35) TXB1DLC;
+volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
+
+__sfr __at (0xf36) TXB1D0;
+__sfr __at (0xf37) TXB1D1;
+__sfr __at (0xf38) TXB1D2;
+__sfr __at (0xf39) TXB1D3;
+__sfr __at (0xf3a) TXB1D4;
+__sfr __at (0xf3b) TXB1D5;
+__sfr __at (0xf3c) TXB1D6;
+__sfr __at (0xf3d) TXB1D7;
+__sfr __at (0xf3e) CANSTATRO2;
+__sfr __at (0xf40) TXB0CON;
+volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
+
+__sfr __at (0xf41) TXB0SIDH;
+__sfr __at (0xf42) TXB0SIDL;
+__sfr __at (0xf43) TXB0EIDH;
+__sfr __at (0xf44) TXB0EIDL;
+__sfr __at (0xf45) TXB0DLC;
+volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
+
+__sfr __at (0xf46) TXB0D0;
+__sfr __at (0xf47) TXB0D1;
+__sfr __at (0xf48) TXB0D2;
+__sfr __at (0xf49) TXB0D3;
+__sfr __at (0xf4a) TXB0D4;
+__sfr __at (0xf4b) TXB0D5;
+__sfr __at (0xf4c) TXB0D6;
+__sfr __at (0xf4d) TXB0D7;
+__sfr __at (0xf4e) CANSTATRO1;
+__sfr __at (0xf50) RXB1CON;
+volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
+
+__sfr __at (0xf51) RXB1SIDH;
+__sfr __at (0xf52) RXB1SIDL;
+volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
+
+__sfr __at (0xf53) RXB1EIDH;
+__sfr __at (0xf54) RXB1EIDL;
+__sfr __at (0xf55) RXB1DLC;
+volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
+
+__sfr __at (0xf56) RXB1D0;
+__sfr __at (0xf57) RXB1D1;
+__sfr __at (0xf58) RXB1D2;
+__sfr __at (0xf59) RXB1D3;
+__sfr __at (0xf5a) RXB1D4;
+__sfr __at (0xf5b) RXB1D5;
+__sfr __at (0xf5c) RXB1D6;
+__sfr __at (0xf5d) RXB1D7;
+__sfr __at (0xf5e) CANSTATRO0;
+__sfr __at (0xf60) RXB0CON;
+volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
+
+__sfr __at (0xf61) RXB0SIDH;
+__sfr __at (0xf62) RXB0SIDL;
+volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
+
+__sfr __at (0xf63) RXB0EIDH;
+__sfr __at (0xf64) RXB0EIDL;
+__sfr __at (0xf65) RXB0DLC;
+__sfr __at (0xf66) RXB0D0;
+__sfr __at (0xf67) RXB0D1;
+__sfr __at (0xf68) RXB0D2;
+__sfr __at (0xf69) RXB0D3;
+__sfr __at (0xf6a) RXB0D4;
+__sfr __at (0xf6b) RXB0D5;
+__sfr __at (0xf6c) RXB0D6;
+__sfr __at (0xf6d) RXB0D7;
+__sfr __at (0xf6e) CANSTAT;
+volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
+
+__sfr __at (0xf6f) CANCON;
+volatile __CANCONbits_t __at (0xf6f) CANCONbits;
+
+__sfr __at (0xf70) BRGCON1;
+volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
+
+__sfr __at (0xf71) BRGCON2;
+volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
+
+__sfr __at (0xf72) BRGCON3;
+volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
+
+__sfr __at (0xf73) CIOCON;
+volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
+
+__sfr __at (0xf74) COMSTAT;
+volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-sfr at 0xf75 RXERRCNT;
-volatile __RXERRCNTbits_t at 0xf75 RXERRCNTbits;
+__sfr __at (0xf75) RXERRCNT;
+volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-sfr at 0xf76 TXERRCNT;
-volatile __TXERRCNTbits_t at 0xf76 TXERRCNTbits;
+__sfr __at (0xf76) TXERRCNT;
+volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf85 PORTF;
-volatile __PORTFbits_t at 0xf85 PORTFbits;
+__sfr __at (0xf85) PORTF;
+volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-sfr at 0xf86 PORTG;
-volatile __PORTGbits_t at 0xf86 PORTGbits;
+__sfr __at (0xf86) PORTG;
+volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf8e LATF;
-volatile __LATFbits_t at 0xf8e LATFbits;
+__sfr __at (0xf8e) LATF;
+volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-sfr at 0xf8f LATG;
-volatile __LATGbits_t at 0xf8f LATGbits;
+__sfr __at (0xf8f) LATG;
+volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf97 TRISF;
-volatile __TRISFbits_t at 0xf97 TRISFbits;
+__sfr __at (0xf97) TRISF;
+volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-sfr at 0xf98 TRISG;
-volatile __TRISGbits_t at 0xf98 TRISGbits;
+__sfr __at (0xf98) TRISG;
+volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa EEADRH;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) EEADRH;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
 
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
 
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb6 ECCPAS;
-volatile __ECCPASbits_t at 0xfb6 ECCPASbits;
+__sfr __at (0xfb6) ECCPAS;
+volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
 
-sfr at 0xfb7 ECCP1DEL;
-volatile __ECCP1DELbits_t at 0xfb7 ECCP1DELbits;
-
-sfr at 0xfba ECCP1CON;
-volatile __ECCP1CONbits_t at 0xfba ECCP1CONbits;
-
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb ECCPR1L;
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc ECCPR1H;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb7) ECCP1DEL;
+volatile __ECCP1DELbits_t __at (0xfb7) ECCP1DELbits;
+
+__sfr __at (0xfba) ECCP1CON;
+volatile __ECCP1CONbits_t __at (0xfba) ECCP1CONbits;
+
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) ECCPR1L;
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) ECCPR1H;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f6720.c b/device/lib/pic16/libdev/pic18f6720.c
index 6425f48fd89669c214dbbdc56c4d2a9140985667..f2192baaa3efeb7d94b08f06a76364696848fb05 100644 (file)
--- a/device/lib/pic16/libdev/pic18f6720.c
+++ b/device/lib/pic16/libdev/pic18f6720.c
@@ -14,261 +14,261 @@
 
 #include <pic18f6720.h>
 
-sfr at 0xf6b RCSTA2;
-volatile __RCSTA2bits_t at 0xf6b RCSTA2bits;
+__sfr __at (0xf6b) RCSTA2;
+volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-sfr at 0xf6c TXSTA2;
-volatile __TXSTA2bits_t at 0xf6c TXSTA2bits;
+__sfr __at (0xf6c) TXSTA2;
+volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-sfr at 0xf6d TXREG2;
-sfr at 0xf6e RCREG2;
-sfr at 0xf6f SPBRG2;
-sfr at 0xf70 CCP5CON;
-volatile __CCP5CONbits_t at 0xf70 CCP5CONbits;
+__sfr __at (0xf6d) TXREG2;
+__sfr __at (0xf6e) RCREG2;
+__sfr __at (0xf6f) SPBRG2;
+__sfr __at (0xf70) CCP5CON;
+volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-sfr at 0xf71 CCPR5L;
-sfr at 0xf72 CCPR5H;
-sfr at 0xf73 CCP4CON;
-volatile __CCP4CONbits_t at 0xf73 CCP4CONbits;
+__sfr __at (0xf71) CCPR5L;
+__sfr __at (0xf72) CCPR5H;
+__sfr __at (0xf73) CCP4CON;
+volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-sfr at 0xf74 CCPR4L;
-sfr at 0xf75 CCPR4H;
-sfr at 0xf76 T4CON;
-volatile __T4CONbits_t at 0xf76 T4CONbits;
+__sfr __at (0xf74) CCPR4L;
+__sfr __at (0xf75) CCPR4H;
+__sfr __at (0xf76) T4CON;
+volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-sfr at 0xf77 PR4;
-sfr at 0xf78 TMR4;
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf77) PR4;
+__sfr __at (0xf78) TMR4;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf85 PORTF;
-volatile __PORTFbits_t at 0xf85 PORTFbits;
+__sfr __at (0xf85) PORTF;
+volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-sfr at 0xf86 PORTG;
-volatile __PORTGbits_t at 0xf86 PORTGbits;
+__sfr __at (0xf86) PORTG;
+volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf8e LATF;
-volatile __LATFbits_t at 0xf8e LATFbits;
+__sfr __at (0xf8e) LATF;
+volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-sfr at 0xf8f LATG;
-volatile __LATGbits_t at 0xf8f LATGbits;
+__sfr __at (0xf8f) LATG;
+volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf97 TRISF;
-volatile __TRISFbits_t at 0xf97 TRISFbits;
+__sfr __at (0xf97) TRISF;
+volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-sfr at 0xf98 TRISG;
-volatile __TRISGbits_t at 0xf98 TRISGbits;
+__sfr __at (0xf98) TRISG;
+volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa EEADRH;
-sfr at 0xfab RCSTA1;
-volatile __RCSTA1bits_t at 0xfab RCSTA1bits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) EEADRH;
+__sfr __at (0xfab) RCSTA1;
+volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-sfr at 0xfac TXSTA1;
-volatile __TXSTA1bits_t at 0xfac TXSTA1bits;
+__sfr __at (0xfac) TXSTA1;
+volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-sfr at 0xfad TXREG1;
-sfr at 0xfae RCREG1;
-sfr at 0xfaf SPBRG1;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG1;
+__sfr __at (0xfae) RCREG1;
+__sfr __at (0xfaf) SPBRG1;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb7 CCP3CON;
-volatile __CCP3CONbits_t at 0xfb7 CCP3CONbits;
-
-sfr at 0xfb8 CCPR3L;
-sfr at 0xfb9 CCPR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb7) CCP3CON;
+volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
+
+__sfr __at (0xfb8) CCPR3L;
+__sfr __at (0xfb9) CCPR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f8520.c b/device/lib/pic16/libdev/pic18f8520.c
index ef3b66abb4f9b469e06194559c9ea1f272ce8ea5..1806e8cfce53c4cc7364bcf3fa4af620c042712e 100644 (file)
--- a/device/lib/pic16/libdev/pic18f8520.c
+++ b/device/lib/pic16/libdev/pic18f8520.c
@@ -14,282 +14,282 @@
 
 #include <pic18f8520.h>
 
-sfr at 0xf6b RCSTA2;
-volatile __RCSTA2bits_t at 0xf6b RCSTA2bits;
+__sfr __at (0xf6b) RCSTA2;
+volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-sfr at 0xf6c TXSTA2;
-volatile __TXSTA2bits_t at 0xf6c TXSTA2bits;
+__sfr __at (0xf6c) TXSTA2;
+volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-sfr at 0xf6d TXREG2;
-sfr at 0xf6e RCREG2;
-sfr at 0xf6f SPBRG2;
-sfr at 0xf70 CCP5CON;
-volatile __CCP5CONbits_t at 0xf70 CCP5CONbits;
+__sfr __at (0xf6d) TXREG2;
+__sfr __at (0xf6e) RCREG2;
+__sfr __at (0xf6f) SPBRG2;
+__sfr __at (0xf70) CCP5CON;
+volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-sfr at 0xf71 CCPR5L;
-sfr at 0xf72 CCPR5H;
-sfr at 0xf73 CCP4CON;
-volatile __CCP4CONbits_t at 0xf73 CCP4CONbits;
+__sfr __at (0xf71) CCPR5L;
+__sfr __at (0xf72) CCPR5H;
+__sfr __at (0xf73) CCP4CON;
+volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-sfr at 0xf74 CCPR4L;
-sfr at 0xf75 CCPR4H;
-sfr at 0xf76 T4CON;
-volatile __T4CONbits_t at 0xf76 T4CONbits;
+__sfr __at (0xf74) CCPR4L;
+__sfr __at (0xf75) CCPR4H;
+__sfr __at (0xf76) T4CON;
+volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-sfr at 0xf77 PR4;
-sfr at 0xf78 TMR4;
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf77) PR4;
+__sfr __at (0xf78) TMR4;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf85 PORTF;
-volatile __PORTFbits_t at 0xf85 PORTFbits;
+__sfr __at (0xf85) PORTF;
+volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-sfr at 0xf86 PORTG;
-volatile __PORTGbits_t at 0xf86 PORTGbits;
+__sfr __at (0xf86) PORTG;
+volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-sfr at 0xf87 PORTH;
-volatile __PORTHbits_t at 0xf87 PORTHbits;
+__sfr __at (0xf87) PORTH;
+volatile __PORTHbits_t __at (0xf87) PORTHbits;
 
-sfr at 0xf88 PORTJ;
-volatile __PORTJbits_t at 0xf88 PORTJbits;
+__sfr __at (0xf88) PORTJ;
+volatile __PORTJbits_t __at (0xf88) PORTJbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf8e LATF;
-volatile __LATFbits_t at 0xf8e LATFbits;
+__sfr __at (0xf8e) LATF;
+volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-sfr at 0xf8f LATG;
-volatile __LATGbits_t at 0xf8f LATGbits;
+__sfr __at (0xf8f) LATG;
+volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-sfr at 0xf90 LATH;
-volatile __LATHbits_t at 0xf90 LATHbits;
+__sfr __at (0xf90) LATH;
+volatile __LATHbits_t __at (0xf90) LATHbits;
 
-sfr at 0xf91 LATJ;
-volatile __LATJbits_t at 0xf91 LATJbits;
+__sfr __at (0xf91) LATJ;
+volatile __LATJbits_t __at (0xf91) LATJbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf97 TRISF;
-volatile __TRISFbits_t at 0xf97 TRISFbits;
+__sfr __at (0xf97) TRISF;
+volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-sfr at 0xf98 TRISG;
-volatile __TRISGbits_t at 0xf98 TRISGbits;
+__sfr __at (0xf98) TRISG;
+volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-sfr at 0xf99 TRISH;
-volatile __TRISHbits_t at 0xf99 TRISHbits;
+__sfr __at (0xf99) TRISH;
+volatile __TRISHbits_t __at (0xf99) TRISHbits;
 
-sfr at 0xf9a TRISJ;
-volatile __TRISJbits_t at 0xf9a TRISJbits;
+__sfr __at (0xf9a) TRISJ;
+volatile __TRISJbits_t __at (0xf9a) TRISJbits;
 
-sfr at 0xf9c MEMCON;
-volatile __MEMCONbits_t at 0xf9c MEMCONbits;
+__sfr __at (0xf9c) MEMCON;
+volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa EEADRH;
-sfr at 0xfab RCSTA1;
-volatile __RCSTA1bits_t at 0xfab RCSTA1bits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) EEADRH;
+__sfr __at (0xfab) RCSTA1;
+volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-sfr at 0xfac TXSTA1;
-volatile __TXSTA1bits_t at 0xfac TXSTA1bits;
+__sfr __at (0xfac) TXSTA1;
+volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-sfr at 0xfad TXREG1;
-sfr at 0xfae RCREG1;
-sfr at 0xfaf SPBRG1;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG1;
+__sfr __at (0xfae) RCREG1;
+__sfr __at (0xfaf) SPBRG1;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb7 CCP3CON;
-volatile __CCP3CONbits_t at 0xfb7 CCP3CONbits;
-
-sfr at 0xfb8 CCPR3L;
-sfr at 0xfb9 CCPR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb7) CCP3CON;
+volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
+
+__sfr __at (0xfb8) CCPR3L;
+__sfr __at (0xfb9) CCPR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f8620.c b/device/lib/pic16/libdev/pic18f8620.c
index 5bbc97ee126668369848c0820788a37b3efbd735..1801dff421efffde587efa588c8f634d08687a11 100644 (file)
--- a/device/lib/pic16/libdev/pic18f8620.c
+++ b/device/lib/pic16/libdev/pic18f8620.c
@@ -14,282 +14,282 @@
 
 #include <pic18f8620.h>
 
-sfr at 0xf6b RCSTA2;
-volatile __RCSTA2bits_t at 0xf6b RCSTA2bits;
+__sfr __at (0xf6b) RCSTA2;
+volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-sfr at 0xf6c TXSTA2;
-volatile __TXSTA2bits_t at 0xf6c TXSTA2bits;
+__sfr __at (0xf6c) TXSTA2;
+volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-sfr at 0xf6d TXREG2;
-sfr at 0xf6e RCREG2;
-sfr at 0xf6f SPBRG2;
-sfr at 0xf70 CCP5CON;
-volatile __CCP5CONbits_t at 0xf70 CCP5CONbits;
+__sfr __at (0xf6d) TXREG2;
+__sfr __at (0xf6e) RCREG2;
+__sfr __at (0xf6f) SPBRG2;
+__sfr __at (0xf70) CCP5CON;
+volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-sfr at 0xf71 CCPR5L;
-sfr at 0xf72 CCPR5H;
-sfr at 0xf73 CCP4CON;
-volatile __CCP4CONbits_t at 0xf73 CCP4CONbits;
+__sfr __at (0xf71) CCPR5L;
+__sfr __at (0xf72) CCPR5H;
+__sfr __at (0xf73) CCP4CON;
+volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-sfr at 0xf74 CCPR4L;
-sfr at 0xf75 CCPR4H;
-sfr at 0xf76 T4CON;
-volatile __T4CONbits_t at 0xf76 T4CONbits;
+__sfr __at (0xf74) CCPR4L;
+__sfr __at (0xf75) CCPR4H;
+__sfr __at (0xf76) T4CON;
+volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-sfr at 0xf77 PR4;
-sfr at 0xf78 TMR4;
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf77) PR4;
+__sfr __at (0xf78) TMR4;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf85 PORTF;
-volatile __PORTFbits_t at 0xf85 PORTFbits;
+__sfr __at (0xf85) PORTF;
+volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-sfr at 0xf86 PORTG;
-volatile __PORTGbits_t at 0xf86 PORTGbits;
+__sfr __at (0xf86) PORTG;
+volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-sfr at 0xf87 PORTH;
-volatile __PORTHbits_t at 0xf87 PORTHbits;
+__sfr __at (0xf87) PORTH;
+volatile __PORTHbits_t __at (0xf87) PORTHbits;
 
-sfr at 0xf88 PORTJ;
-volatile __PORTJbits_t at 0xf88 PORTJbits;
+__sfr __at (0xf88) PORTJ;
+volatile __PORTJbits_t __at (0xf88) PORTJbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf8e LATF;
-volatile __LATFbits_t at 0xf8e LATFbits;
+__sfr __at (0xf8e) LATF;
+volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-sfr at 0xf8f LATG;
-volatile __LATGbits_t at 0xf8f LATGbits;
+__sfr __at (0xf8f) LATG;
+volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-sfr at 0xf90 LATH;
-volatile __LATHbits_t at 0xf90 LATHbits;
+__sfr __at (0xf90) LATH;
+volatile __LATHbits_t __at (0xf90) LATHbits;
 
-sfr at 0xf91 LATJ;
-volatile __LATJbits_t at 0xf91 LATJbits;
+__sfr __at (0xf91) LATJ;
+volatile __LATJbits_t __at (0xf91) LATJbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf97 TRISF;
-volatile __TRISFbits_t at 0xf97 TRISFbits;
+__sfr __at (0xf97) TRISF;
+volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-sfr at 0xf98 TRISG;
-volatile __TRISGbits_t at 0xf98 TRISGbits;
+__sfr __at (0xf98) TRISG;
+volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-sfr at 0xf99 TRISH;
-volatile __TRISHbits_t at 0xf99 TRISHbits;
+__sfr __at (0xf99) TRISH;
+volatile __TRISHbits_t __at (0xf99) TRISHbits;
 
-sfr at 0xf9a TRISJ;
-volatile __TRISJbits_t at 0xf9a TRISJbits;
+__sfr __at (0xf9a) TRISJ;
+volatile __TRISJbits_t __at (0xf9a) TRISJbits;
 
-sfr at 0xf9c MEMCON;
-volatile __MEMCONbits_t at 0xf9c MEMCONbits;
+__sfr __at (0xf9c) MEMCON;
+volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa EEADRH;
-sfr at 0xfab RCSTA1;
-volatile __RCSTA1bits_t at 0xfab RCSTA1bits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) EEADRH;
+__sfr __at (0xfab) RCSTA1;
+volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-sfr at 0xfac TXSTA1;
-volatile __TXSTA1bits_t at 0xfac TXSTA1bits;
+__sfr __at (0xfac) TXSTA1;
+volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-sfr at 0xfad TXREG1;
-sfr at 0xfae RCREG1;
-sfr at 0xfaf SPBRG1;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG1;
+__sfr __at (0xfae) RCREG1;
+__sfr __at (0xfaf) SPBRG1;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb7 CCP3CON;
-volatile __CCP3CONbits_t at 0xfb7 CCP3CONbits;
-
-sfr at 0xfb8 CCPR3L;
-sfr at 0xfb9 CCPR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb7) CCP3CON;
+volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
+
+__sfr __at (0xfb8) CCPR3L;
+__sfr __at (0xfb9) CCPR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f8680.c b/device/lib/pic16/libdev/pic18f8680.c
index 50802941f8f80919da1faba9e283f00640ebdab6..fc342d541049e0a46a9345750a4e9a0a7125ba69 100644 (file)
--- a/device/lib/pic16/libdev/pic18f8680.c
+++ b/device/lib/pic16/libdev/pic18f8680.c
@@ -14,434 +14,434 @@
 
 #include <pic18f8680.h>
 
-sfr at 0xf00 RXF0SIDH;
-sfr at 0xf01 RXF0SIDL;
-volatile __RXF0SIDLbits_t at 0xf01 RXF0SIDLbits;
-
-sfr at 0xf02 RXF0EIDH;
-sfr at 0xf03 RXF0EIDL;
-sfr at 0xf04 RXF1SIDH;
-sfr at 0xf05 RXF1SIDL;
-volatile __RXF1SIDLbits_t at 0xf05 RXF1SIDLbits;
-
-sfr at 0xf06 RXF1EIDH;
-sfr at 0xf07 RXF1EIDL;
-sfr at 0xf08 RXF2SIDH;
-sfr at 0xf09 RXF2SIDL;
-sfr at 0xf0a RXF2EIDH;
-sfr at 0xf0b RXF2EIDL;
-volatile __RXF2EIDLbits_t at 0xf0b RXF2EIDLbits;
-
-sfr at 0xf0c RXF3SIDH;
-sfr at 0xf0d RXF3SIDL;
-volatile __RXF3SIDLbits_t at 0xf0d RXF3SIDLbits;
-
-sfr at 0xf0e RXF3EIDH;
-sfr at 0xf0f RXF3EIDL;
-sfr at 0xf10 RXF4SIDH;
-sfr at 0xf11 RXF4SIDL;
-volatile __RXF4SIDLbits_t at 0xf11 RXF4SIDLbits;
-
-sfr at 0xf12 RXF4EIDH;
-sfr at 0xf13 RXF4EIDL;
-sfr at 0xf14 RXF5SIDH;
-sfr at 0xf15 RXF5SIDL;
-volatile __RXF5SIDLbits_t at 0xf15 RXF5SIDLbits;
-
-sfr at 0xf16 RXF5EIDH;
-sfr at 0xf17 RXF5EIDL;
-sfr at 0xf18 RXM0SIDH;
-sfr at 0xf19 RXM0SIDL;
-volatile __RXM0SIDLbits_t at 0xf19 RXM0SIDLbits;
-
-sfr at 0xf1a RXM0EIDH;
-sfr at 0xf1b RXM0EIDL;
-sfr at 0xf1c RXM1SIDH;
-sfr at 0xf1d RXM1SIDL;
-volatile __RXM1SIDLbits_t at 0xf1d RXM1SIDLbits;
-
-sfr at 0xf1e RXM1EIDH;
-sfr at 0xf1f RXM1EIDL;
-sfr at 0xf20 TXB2CON;
-volatile __TXB2CONbits_t at 0xf20 TXB2CONbits;
-
-sfr at 0xf21 TXB2SIDH;
-sfr at 0xf22 TXB2SIDL;
-volatile __TXB2SIDLbits_t at 0xf22 TXB2SIDLbits;
-
-sfr at 0xf23 TXB2EIDH;
-sfr at 0xf24 TXB2EIDL;
-sfr at 0xf25 TXB2DLC;
-volatile __TXB2DLCbits_t at 0xf25 TXB2DLCbits;
-
-sfr at 0xf26 TXB2D0;
-sfr at 0xf27 TXB2D1;
-sfr at 0xf28 TXB2D2;
-sfr at 0xf29 TXB2D3;
-sfr at 0xf2a TXB2D4;
-sfr at 0xf2b TXB2D5;
-sfr at 0xf2c TXB2D6;
-sfr at 0xf2d TXB2D7;
-sfr at 0xf2e CANSTATRO3;
-sfr at 0xf30 TXB1CON;
-volatile __TXB1CONbits_t at 0xf30 TXB1CONbits;
-
-sfr at 0xf31 TXB1SIDH;
-sfr at 0xf32 TXB1SIDL;
-volatile __TXB1SIDLbits_t at 0xf32 TXB1SIDLbits;
-
-sfr at 0xf33 TXB1EIDH;
-sfr at 0xf34 TXB1EIDL;
-sfr at 0xf35 TXB1DLC;
-volatile __TXB1DLCbits_t at 0xf35 TXB1DLCbits;
-
-sfr at 0xf36 TXB1D0;
-sfr at 0xf37 TXB1D1;
-sfr at 0xf38 TXB1D2;
-sfr at 0xf39 TXB1D3;
-sfr at 0xf3a TXB1D4;
-sfr at 0xf3b TXB1D5;
-sfr at 0xf3c TXB1D6;
-sfr at 0xf3d TXB1D7;
-sfr at 0xf3e CANSTATRO2;
-sfr at 0xf40 TXB0CON;
-volatile __TXB0CONbits_t at 0xf40 TXB0CONbits;
-
-sfr at 0xf41 TXB0SIDH;
-sfr at 0xf42 TXB0SIDL;
-sfr at 0xf43 TXB0EIDH;
-sfr at 0xf44 TXB0EIDL;
-sfr at 0xf45 TXB0DLC;
-volatile __TXB0DLCbits_t at 0xf45 TXB0DLCbits;
-
-sfr at 0xf46 TXB0D0;
-sfr at 0xf47 TXB0D1;
-sfr at 0xf48 TXB0D2;
-sfr at 0xf49 TXB0D3;
-sfr at 0xf4a TXB0D4;
-sfr at 0xf4b TXB0D5;
-sfr at 0xf4c TXB0D6;
-sfr at 0xf4d TXB0D7;
-sfr at 0xf4e CANSTATRO1;
-sfr at 0xf50 RXB1CON;
-volatile __RXB1CONbits_t at 0xf50 RXB1CONbits;
-
-sfr at 0xf51 RXB1SIDH;
-sfr at 0xf52 RXB1SIDL;
-volatile __RXB1SIDLbits_t at 0xf52 RXB1SIDLbits;
-
-sfr at 0xf53 RXB1EIDH;
-sfr at 0xf54 RXB1EIDL;
-sfr at 0xf55 RXB1DLC;
-volatile __RXB1DLCbits_t at 0xf55 RXB1DLCbits;
-
-sfr at 0xf56 RXB1D0;
-sfr at 0xf57 RXB1D1;
-sfr at 0xf58 RXB1D2;
-sfr at 0xf59 RXB1D3;
-sfr at 0xf5a RXB1D4;
-sfr at 0xf5b RXB1D5;
-sfr at 0xf5c RXB1D6;
-sfr at 0xf5d RXB1D7;
-sfr at 0xf5e CANSTATRO0;
-sfr at 0xf60 RXB0CON;
-volatile __RXB0CONbits_t at 0xf60 RXB0CONbits;
-
-sfr at 0xf61 RXB0SIDH;
-sfr at 0xf62 RXB0SIDL;
-volatile __RXB0SIDLbits_t at 0xf62 RXB0SIDLbits;
-
-sfr at 0xf63 RXB0EIDH;
-sfr at 0xf64 RXB0EIDL;
-sfr at 0xf65 RXB0DLC;
-sfr at 0xf66 RXB0D0;
-sfr at 0xf67 RXB0D1;
-sfr at 0xf68 RXB0D2;
-sfr at 0xf69 RXB0D3;
-sfr at 0xf6a RXB0D4;
-sfr at 0xf6b RXB0D5;
-sfr at 0xf6c RXB0D6;
-sfr at 0xf6d RXB0D7;
-sfr at 0xf6e CANSTAT;
-volatile __CANSTATbits_t at 0xf6e CANSTATbits;
-
-sfr at 0xf6f CANCON;
-volatile __CANCONbits_t at 0xf6f CANCONbits;
-
-sfr at 0xf70 BRGCON1;
-volatile __BRGCON1bits_t at 0xf70 BRGCON1bits;
-
-sfr at 0xf71 BRGCON2;
-volatile __BRGCON2bits_t at 0xf71 BRGCON2bits;
-
-sfr at 0xf72 BRGCON3;
-volatile __BRGCON3bits_t at 0xf72 BRGCON3bits;
-
-sfr at 0xf73 CIOCON;
-volatile __CIOCONbits_t at 0xf73 CIOCONbits;
-
-sfr at 0xf74 COMSTAT;
-volatile __COMSTATbits_t at 0xf74 COMSTATbits;
+__sfr __at (0xf00) RXF0SIDH;
+__sfr __at (0xf01) RXF0SIDL;
+volatile __RXF0SIDLbits_t __at (0xf01) RXF0SIDLbits;
+
+__sfr __at (0xf02) RXF0EIDH;
+__sfr __at (0xf03) RXF0EIDL;
+__sfr __at (0xf04) RXF1SIDH;
+__sfr __at (0xf05) RXF1SIDL;
+volatile __RXF1SIDLbits_t __at (0xf05) RXF1SIDLbits;
+
+__sfr __at (0xf06) RXF1EIDH;
+__sfr __at (0xf07) RXF1EIDL;
+__sfr __at (0xf08) RXF2SIDH;
+__sfr __at (0xf09) RXF2SIDL;
+__sfr __at (0xf0a) RXF2EIDH;
+__sfr __at (0xf0b) RXF2EIDL;
+volatile __RXF2EIDLbits_t __at (0xf0b) RXF2EIDLbits;
+
+__sfr __at (0xf0c) RXF3SIDH;
+__sfr __at (0xf0d) RXF3SIDL;
+volatile __RXF3SIDLbits_t __at (0xf0d) RXF3SIDLbits;
+
+__sfr __at (0xf0e) RXF3EIDH;
+__sfr __at (0xf0f) RXF3EIDL;
+__sfr __at (0xf10) RXF4SIDH;
+__sfr __at (0xf11) RXF4SIDL;
+volatile __RXF4SIDLbits_t __at (0xf11) RXF4SIDLbits;
+
+__sfr __at (0xf12) RXF4EIDH;
+__sfr __at (0xf13) RXF4EIDL;
+__sfr __at (0xf14) RXF5SIDH;
+__sfr __at (0xf15) RXF5SIDL;
+volatile __RXF5SIDLbits_t __at (0xf15) RXF5SIDLbits;
+
+__sfr __at (0xf16) RXF5EIDH;
+__sfr __at (0xf17) RXF5EIDL;
+__sfr __at (0xf18) RXM0SIDH;
+__sfr __at (0xf19) RXM0SIDL;
+volatile __RXM0SIDLbits_t __at (0xf19) RXM0SIDLbits;
+
+__sfr __at (0xf1a) RXM0EIDH;
+__sfr __at (0xf1b) RXM0EIDL;
+__sfr __at (0xf1c) RXM1SIDH;
+__sfr __at (0xf1d) RXM1SIDL;
+volatile __RXM1SIDLbits_t __at (0xf1d) RXM1SIDLbits;
+
+__sfr __at (0xf1e) RXM1EIDH;
+__sfr __at (0xf1f) RXM1EIDL;
+__sfr __at (0xf20) TXB2CON;
+volatile __TXB2CONbits_t __at (0xf20) TXB2CONbits;
+
+__sfr __at (0xf21) TXB2SIDH;
+__sfr __at (0xf22) TXB2SIDL;
+volatile __TXB2SIDLbits_t __at (0xf22) TXB2SIDLbits;
+
+__sfr __at (0xf23) TXB2EIDH;
+__sfr __at (0xf24) TXB2EIDL;
+__sfr __at (0xf25) TXB2DLC;
+volatile __TXB2DLCbits_t __at (0xf25) TXB2DLCbits;
+
+__sfr __at (0xf26) TXB2D0;
+__sfr __at (0xf27) TXB2D1;
+__sfr __at (0xf28) TXB2D2;
+__sfr __at (0xf29) TXB2D3;
+__sfr __at (0xf2a) TXB2D4;
+__sfr __at (0xf2b) TXB2D5;
+__sfr __at (0xf2c) TXB2D6;
+__sfr __at (0xf2d) TXB2D7;
+__sfr __at (0xf2e) CANSTATRO3;
+__sfr __at (0xf30) TXB1CON;
+volatile __TXB1CONbits_t __at (0xf30) TXB1CONbits;
+
+__sfr __at (0xf31) TXB1SIDH;
+__sfr __at (0xf32) TXB1SIDL;
+volatile __TXB1SIDLbits_t __at (0xf32) TXB1SIDLbits;
+
+__sfr __at (0xf33) TXB1EIDH;
+__sfr __at (0xf34) TXB1EIDL;
+__sfr __at (0xf35) TXB1DLC;
+volatile __TXB1DLCbits_t __at (0xf35) TXB1DLCbits;
+
+__sfr __at (0xf36) TXB1D0;
+__sfr __at (0xf37) TXB1D1;
+__sfr __at (0xf38) TXB1D2;
+__sfr __at (0xf39) TXB1D3;
+__sfr __at (0xf3a) TXB1D4;
+__sfr __at (0xf3b) TXB1D5;
+__sfr __at (0xf3c) TXB1D6;
+__sfr __at (0xf3d) TXB1D7;
+__sfr __at (0xf3e) CANSTATRO2;
+__sfr __at (0xf40) TXB0CON;
+volatile __TXB0CONbits_t __at (0xf40) TXB0CONbits;
+
+__sfr __at (0xf41) TXB0SIDH;
+__sfr __at (0xf42) TXB0SIDL;
+__sfr __at (0xf43) TXB0EIDH;
+__sfr __at (0xf44) TXB0EIDL;
+__sfr __at (0xf45) TXB0DLC;
+volatile __TXB0DLCbits_t __at (0xf45) TXB0DLCbits;
+
+__sfr __at (0xf46) TXB0D0;
+__sfr __at (0xf47) TXB0D1;
+__sfr __at (0xf48) TXB0D2;
+__sfr __at (0xf49) TXB0D3;
+__sfr __at (0xf4a) TXB0D4;
+__sfr __at (0xf4b) TXB0D5;
+__sfr __at (0xf4c) TXB0D6;
+__sfr __at (0xf4d) TXB0D7;
+__sfr __at (0xf4e) CANSTATRO1;
+__sfr __at (0xf50) RXB1CON;
+volatile __RXB1CONbits_t __at (0xf50) RXB1CONbits;
+
+__sfr __at (0xf51) RXB1SIDH;
+__sfr __at (0xf52) RXB1SIDL;
+volatile __RXB1SIDLbits_t __at (0xf52) RXB1SIDLbits;
+
+__sfr __at (0xf53) RXB1EIDH;
+__sfr __at (0xf54) RXB1EIDL;
+__sfr __at (0xf55) RXB1DLC;
+volatile __RXB1DLCbits_t __at (0xf55) RXB1DLCbits;
+
+__sfr __at (0xf56) RXB1D0;
+__sfr __at (0xf57) RXB1D1;
+__sfr __at (0xf58) RXB1D2;
+__sfr __at (0xf59) RXB1D3;
+__sfr __at (0xf5a) RXB1D4;
+__sfr __at (0xf5b) RXB1D5;
+__sfr __at (0xf5c) RXB1D6;
+__sfr __at (0xf5d) RXB1D7;
+__sfr __at (0xf5e) CANSTATRO0;
+__sfr __at (0xf60) RXB0CON;
+volatile __RXB0CONbits_t __at (0xf60) RXB0CONbits;
+
+__sfr __at (0xf61) RXB0SIDH;
+__sfr __at (0xf62) RXB0SIDL;
+volatile __RXB0SIDLbits_t __at (0xf62) RXB0SIDLbits;
+
+__sfr __at (0xf63) RXB0EIDH;
+__sfr __at (0xf64) RXB0EIDL;
+__sfr __at (0xf65) RXB0DLC;
+__sfr __at (0xf66) RXB0D0;
+__sfr __at (0xf67) RXB0D1;
+__sfr __at (0xf68) RXB0D2;
+__sfr __at (0xf69) RXB0D3;
+__sfr __at (0xf6a) RXB0D4;
+__sfr __at (0xf6b) RXB0D5;
+__sfr __at (0xf6c) RXB0D6;
+__sfr __at (0xf6d) RXB0D7;
+__sfr __at (0xf6e) CANSTAT;
+volatile __CANSTATbits_t __at (0xf6e) CANSTATbits;
+
+__sfr __at (0xf6f) CANCON;
+volatile __CANCONbits_t __at (0xf6f) CANCONbits;
+
+__sfr __at (0xf70) BRGCON1;
+volatile __BRGCON1bits_t __at (0xf70) BRGCON1bits;
+
+__sfr __at (0xf71) BRGCON2;
+volatile __BRGCON2bits_t __at (0xf71) BRGCON2bits;
+
+__sfr __at (0xf72) BRGCON3;
+volatile __BRGCON3bits_t __at (0xf72) BRGCON3bits;
+
+__sfr __at (0xf73) CIOCON;
+volatile __CIOCONbits_t __at (0xf73) CIOCONbits;
+
+__sfr __at (0xf74) COMSTAT;
+volatile __COMSTATbits_t __at (0xf74) COMSTATbits;
 
-sfr at 0xf75 RXERRCNT;
-volatile __RXERRCNTbits_t at 0xf75 RXERRCNTbits;
+__sfr __at (0xf75) RXERRCNT;
+volatile __RXERRCNTbits_t __at (0xf75) RXERRCNTbits;
 
-sfr at 0xf76 TXERRCNT;
-volatile __TXERRCNTbits_t at 0xf76 TXERRCNTbits;
+__sfr __at (0xf76) TXERRCNT;
+volatile __TXERRCNTbits_t __at (0xf76) TXERRCNTbits;
 
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf85 PORTF;
-volatile __PORTFbits_t at 0xf85 PORTFbits;
+__sfr __at (0xf85) PORTF;
+volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-sfr at 0xf86 PORTG;
-volatile __PORTGbits_t at 0xf86 PORTGbits;
+__sfr __at (0xf86) PORTG;
+volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-sfr at 0xf87 PORTH;
-volatile __PORTHbits_t at 0xf87 PORTHbits;
+__sfr __at (0xf87) PORTH;
+volatile __PORTHbits_t __at (0xf87) PORTHbits;
 
-sfr at 0xf88 PORTJ;
-volatile __PORTJbits_t at 0xf88 PORTJbits;
+__sfr __at (0xf88) PORTJ;
+volatile __PORTJbits_t __at (0xf88) PORTJbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf8e LATF;
-volatile __LATFbits_t at 0xf8e LATFbits;
+__sfr __at (0xf8e) LATF;
+volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-sfr at 0xf8f LATG;
-volatile __LATGbits_t at 0xf8f LATGbits;
+__sfr __at (0xf8f) LATG;
+volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-sfr at 0xf90 LATH;
-volatile __LATHbits_t at 0xf90 LATHbits;
+__sfr __at (0xf90) LATH;
+volatile __LATHbits_t __at (0xf90) LATHbits;
 
-sfr at 0xf91 LATJ;
-volatile __LATJbits_t at 0xf91 LATJbits;
+__sfr __at (0xf91) LATJ;
+volatile __LATJbits_t __at (0xf91) LATJbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf97 TRISF;
-volatile __TRISFbits_t at 0xf97 TRISFbits;
+__sfr __at (0xf97) TRISF;
+volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-sfr at 0xf98 TRISG;
-volatile __TRISGbits_t at 0xf98 TRISGbits;
+__sfr __at (0xf98) TRISG;
+volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-sfr at 0xf99 TRISH;
-volatile __TRISHbits_t at 0xf99 TRISHbits;
+__sfr __at (0xf99) TRISH;
+volatile __TRISHbits_t __at (0xf99) TRISHbits;
 
-sfr at 0xf9a TRISJ;
-volatile __TRISJbits_t at 0xf9a TRISJbits;
+__sfr __at (0xf9a) TRISJ;
+volatile __TRISJbits_t __at (0xf9a) TRISJbits;
 
-sfr at 0xf9c MEMCON;
-volatile __MEMCONbits_t at 0xf9c MEMCONbits;
+__sfr __at (0xf9c) MEMCON;
+volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa EEADRH;
-sfr at 0xfab RCSTA;
-volatile __RCSTAbits_t at 0xfab RCSTAbits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) EEADRH;
+__sfr __at (0xfab) RCSTA;
+volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
 
-sfr at 0xfac TXSTA;
-volatile __TXSTAbits_t at 0xfac TXSTAbits;
+__sfr __at (0xfac) TXSTA;
+volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
 
-sfr at 0xfad TXREG;
-sfr at 0xfae RCREG;
-sfr at 0xfaf SPBRG;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG;
+__sfr __at (0xfae) RCREG;
+__sfr __at (0xfaf) SPBRG;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb6 ECCPAS;
-volatile __ECCPASbits_t at 0xfb6 ECCPASbits;
+__sfr __at (0xfb6) ECCPAS;
+volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
 
-sfr at 0xfb7 ECCP1DEL;
-volatile __ECCP1DELbits_t at 0xfb7 ECCP1DELbits;
-
-sfr at 0xfba ECCP1CON;
-volatile __ECCP1CONbits_t at 0xfba ECCP1CONbits;
-
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb ECCPR1L;
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc ECCPR1H;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb7) ECCP1DEL;
+volatile __ECCP1DELbits_t __at (0xfb7) ECCP1DELbits;
+
+__sfr __at (0xfba) ECCP1CON;
+volatile __ECCP1CONbits_t __at (0xfba) ECCP1CONbits;
+
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) ECCPR1L;
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) ECCPR1H;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/device/lib/pic16/libdev/pic18f8720.c b/device/lib/pic16/libdev/pic18f8720.c
index 30b5e8871c7650ebaa3faf97fd6a9bf7c8880111..371bb5d459f07fc3011be5d5cc56db0d125759ae 100644 (file)
--- a/device/lib/pic16/libdev/pic18f8720.c
+++ b/device/lib/pic16/libdev/pic18f8720.c
@@ -14,282 +14,282 @@
 
 #include <pic18f8720.h>
 
-sfr at 0xf6b RCSTA2;
-volatile __RCSTA2bits_t at 0xf6b RCSTA2bits;
+__sfr __at (0xf6b) RCSTA2;
+volatile __RCSTA2bits_t __at (0xf6b) RCSTA2bits;
 
-sfr at 0xf6c TXSTA2;
-volatile __TXSTA2bits_t at 0xf6c TXSTA2bits;
+__sfr __at (0xf6c) TXSTA2;
+volatile __TXSTA2bits_t __at (0xf6c) TXSTA2bits;
 
-sfr at 0xf6d TXREG2;
-sfr at 0xf6e RCREG2;
-sfr at 0xf6f SPBRG2;
-sfr at 0xf70 CCP5CON;
-volatile __CCP5CONbits_t at 0xf70 CCP5CONbits;
+__sfr __at (0xf6d) TXREG2;
+__sfr __at (0xf6e) RCREG2;
+__sfr __at (0xf6f) SPBRG2;
+__sfr __at (0xf70) CCP5CON;
+volatile __CCP5CONbits_t __at (0xf70) CCP5CONbits;
 
-sfr at 0xf71 CCPR5L;
-sfr at 0xf72 CCPR5H;
-sfr at 0xf73 CCP4CON;
-volatile __CCP4CONbits_t at 0xf73 CCP4CONbits;
+__sfr __at (0xf71) CCPR5L;
+__sfr __at (0xf72) CCPR5H;
+__sfr __at (0xf73) CCP4CON;
+volatile __CCP4CONbits_t __at (0xf73) CCP4CONbits;
 
-sfr at 0xf74 CCPR4L;
-sfr at 0xf75 CCPR4H;
-sfr at 0xf76 T4CON;
-volatile __T4CONbits_t at 0xf76 T4CONbits;
+__sfr __at (0xf74) CCPR4L;
+__sfr __at (0xf75) CCPR4H;
+__sfr __at (0xf76) T4CON;
+volatile __T4CONbits_t __at (0xf76) T4CONbits;
 
-sfr at 0xf77 PR4;
-sfr at 0xf78 TMR4;
-sfr at 0xf80 PORTA;
-volatile __PORTAbits_t at 0xf80 PORTAbits;
+__sfr __at (0xf77) PR4;
+__sfr __at (0xf78) TMR4;
+__sfr __at (0xf80) PORTA;
+volatile __PORTAbits_t __at (0xf80) PORTAbits;
 
-sfr at 0xf81 PORTB;
-volatile __PORTBbits_t at 0xf81 PORTBbits;
+__sfr __at (0xf81) PORTB;
+volatile __PORTBbits_t __at (0xf81) PORTBbits;
 
-sfr at 0xf82 PORTC;
-volatile __PORTCbits_t at 0xf82 PORTCbits;
+__sfr __at (0xf82) PORTC;
+volatile __PORTCbits_t __at (0xf82) PORTCbits;
 
-sfr at 0xf83 PORTD;
-volatile __PORTDbits_t at 0xf83 PORTDbits;
+__sfr __at (0xf83) PORTD;
+volatile __PORTDbits_t __at (0xf83) PORTDbits;
 
-sfr at 0xf84 PORTE;
-volatile __PORTEbits_t at 0xf84 PORTEbits;
+__sfr __at (0xf84) PORTE;
+volatile __PORTEbits_t __at (0xf84) PORTEbits;
 
-sfr at 0xf85 PORTF;
-volatile __PORTFbits_t at 0xf85 PORTFbits;
+__sfr __at (0xf85) PORTF;
+volatile __PORTFbits_t __at (0xf85) PORTFbits;
 
-sfr at 0xf86 PORTG;
-volatile __PORTGbits_t at 0xf86 PORTGbits;
+__sfr __at (0xf86) PORTG;
+volatile __PORTGbits_t __at (0xf86) PORTGbits;
 
-sfr at 0xf87 PORTH;
-volatile __PORTHbits_t at 0xf87 PORTHbits;
+__sfr __at (0xf87) PORTH;
+volatile __PORTHbits_t __at (0xf87) PORTHbits;
 
-sfr at 0xf88 PORTJ;
-volatile __PORTJbits_t at 0xf88 PORTJbits;
+__sfr __at (0xf88) PORTJ;
+volatile __PORTJbits_t __at (0xf88) PORTJbits;
 
-sfr at 0xf89 LATA;
-volatile __LATAbits_t at 0xf89 LATAbits;
+__sfr __at (0xf89) LATA;
+volatile __LATAbits_t __at (0xf89) LATAbits;
 
-sfr at 0xf8a LATB;
-volatile __LATBbits_t at 0xf8a LATBbits;
+__sfr __at (0xf8a) LATB;
+volatile __LATBbits_t __at (0xf8a) LATBbits;
 
-sfr at 0xf8b LATC;
-volatile __LATCbits_t at 0xf8b LATCbits;
+__sfr __at (0xf8b) LATC;
+volatile __LATCbits_t __at (0xf8b) LATCbits;
 
-sfr at 0xf8c LATD;
-volatile __LATDbits_t at 0xf8c LATDbits;
+__sfr __at (0xf8c) LATD;
+volatile __LATDbits_t __at (0xf8c) LATDbits;
 
-sfr at 0xf8d LATE;
-volatile __LATEbits_t at 0xf8d LATEbits;
+__sfr __at (0xf8d) LATE;
+volatile __LATEbits_t __at (0xf8d) LATEbits;
 
-sfr at 0xf8e LATF;
-volatile __LATFbits_t at 0xf8e LATFbits;
+__sfr __at (0xf8e) LATF;
+volatile __LATFbits_t __at (0xf8e) LATFbits;
 
-sfr at 0xf8f LATG;
-volatile __LATGbits_t at 0xf8f LATGbits;
+__sfr __at (0xf8f) LATG;
+volatile __LATGbits_t __at (0xf8f) LATGbits;
 
-sfr at 0xf90 LATH;
-volatile __LATHbits_t at 0xf90 LATHbits;
+__sfr __at (0xf90) LATH;
+volatile __LATHbits_t __at (0xf90) LATHbits;
 
-sfr at 0xf91 LATJ;
-volatile __LATJbits_t at 0xf91 LATJbits;
+__sfr __at (0xf91) LATJ;
+volatile __LATJbits_t __at (0xf91) LATJbits;
 
-sfr at 0xf92 TRISA;
-volatile __TRISAbits_t at 0xf92 TRISAbits;
+__sfr __at (0xf92) TRISA;
+volatile __TRISAbits_t __at (0xf92) TRISAbits;
 
-sfr at 0xf93 TRISB;
-volatile __TRISBbits_t at 0xf93 TRISBbits;
+__sfr __at (0xf93) TRISB;
+volatile __TRISBbits_t __at (0xf93) TRISBbits;
 
-sfr at 0xf94 TRISC;
-volatile __TRISCbits_t at 0xf94 TRISCbits;
+__sfr __at (0xf94) TRISC;
+volatile __TRISCbits_t __at (0xf94) TRISCbits;
 
-sfr at 0xf95 TRISD;
-volatile __TRISDbits_t at 0xf95 TRISDbits;
+__sfr __at (0xf95) TRISD;
+volatile __TRISDbits_t __at (0xf95) TRISDbits;
 
-sfr at 0xf96 TRISE;
-volatile __TRISEbits_t at 0xf96 TRISEbits;
+__sfr __at (0xf96) TRISE;
+volatile __TRISEbits_t __at (0xf96) TRISEbits;
 
-sfr at 0xf97 TRISF;
-volatile __TRISFbits_t at 0xf97 TRISFbits;
+__sfr __at (0xf97) TRISF;
+volatile __TRISFbits_t __at (0xf97) TRISFbits;
 
-sfr at 0xf98 TRISG;
-volatile __TRISGbits_t at 0xf98 TRISGbits;
+__sfr __at (0xf98) TRISG;
+volatile __TRISGbits_t __at (0xf98) TRISGbits;
 
-sfr at 0xf99 TRISH;
-volatile __TRISHbits_t at 0xf99 TRISHbits;
+__sfr __at (0xf99) TRISH;
+volatile __TRISHbits_t __at (0xf99) TRISHbits;
 
-sfr at 0xf9a TRISJ;
-volatile __TRISJbits_t at 0xf9a TRISJbits;
+__sfr __at (0xf9a) TRISJ;
+volatile __TRISJbits_t __at (0xf9a) TRISJbits;
 
-sfr at 0xf9c MEMCON;
-volatile __MEMCONbits_t at 0xf9c MEMCONbits;
+__sfr __at (0xf9c) MEMCON;
+volatile __MEMCONbits_t __at (0xf9c) MEMCONbits;
 
-sfr at 0xf9d PIE1;
-volatile __PIE1bits_t at 0xf9d PIE1bits;
+__sfr __at (0xf9d) PIE1;
+volatile __PIE1bits_t __at (0xf9d) PIE1bits;
 
-sfr at 0xf9e PIR1;
-volatile __PIR1bits_t at 0xf9e PIR1bits;
+__sfr __at (0xf9e) PIR1;
+volatile __PIR1bits_t __at (0xf9e) PIR1bits;
 
-sfr at 0xf9f IPR1;
-volatile __IPR1bits_t at 0xf9f IPR1bits;
+__sfr __at (0xf9f) IPR1;
+volatile __IPR1bits_t __at (0xf9f) IPR1bits;
 
-sfr at 0xfa0 PIE2;
-volatile __PIE2bits_t at 0xfa0 PIE2bits;
+__sfr __at (0xfa0) PIE2;
+volatile __PIE2bits_t __at (0xfa0) PIE2bits;
 
-sfr at 0xfa1 PIR2;
-volatile __PIR2bits_t at 0xfa1 PIR2bits;
+__sfr __at (0xfa1) PIR2;
+volatile __PIR2bits_t __at (0xfa1) PIR2bits;
 
-sfr at 0xfa2 IPR2;
-volatile __IPR2bits_t at 0xfa2 IPR2bits;
+__sfr __at (0xfa2) IPR2;
+volatile __IPR2bits_t __at (0xfa2) IPR2bits;
 
-sfr at 0xfa3 PIE3;
-volatile __PIE3bits_t at 0xfa3 PIE3bits;
+__sfr __at (0xfa3) PIE3;
+volatile __PIE3bits_t __at (0xfa3) PIE3bits;
 
-sfr at 0xfa4 PIR3;
-volatile __PIR3bits_t at 0xfa4 PIR3bits;
+__sfr __at (0xfa4) PIR3;
+volatile __PIR3bits_t __at (0xfa4) PIR3bits;
 
-sfr at 0xfa5 IPR3;
-volatile __IPR3bits_t at 0xfa5 IPR3bits;
+__sfr __at (0xfa5) IPR3;
+volatile __IPR3bits_t __at (0xfa5) IPR3bits;
 
-sfr at 0xfa6 EECON1;
-volatile __EECON1bits_t at 0xfa6 EECON1bits;
+__sfr __at (0xfa6) EECON1;
+volatile __EECON1bits_t __at (0xfa6) EECON1bits;
 
-sfr at 0xfa7 EECON2;
-sfr at 0xfa8 EEDATA;
-sfr at 0xfa9 EEADR;
-sfr at 0xfaa EEADRH;
-sfr at 0xfab RCSTA1;
-volatile __RCSTA1bits_t at 0xfab RCSTA1bits;
+__sfr __at (0xfa7) EECON2;
+__sfr __at (0xfa8) EEDATA;
+__sfr __at (0xfa9) EEADR;
+__sfr __at (0xfaa) EEADRH;
+__sfr __at (0xfab) RCSTA1;
+volatile __RCSTA1bits_t __at (0xfab) RCSTA1bits;
 
-sfr at 0xfac TXSTA1;
-volatile __TXSTA1bits_t at 0xfac TXSTA1bits;
+__sfr __at (0xfac) TXSTA1;
+volatile __TXSTA1bits_t __at (0xfac) TXSTA1bits;
 
-sfr at 0xfad TXREG1;
-sfr at 0xfae RCREG1;
-sfr at 0xfaf SPBRG1;
-sfr at 0xfb0 PSPCON;
-volatile __PSPCONbits_t at 0xfb0 PSPCONbits;
+__sfr __at (0xfad) TXREG1;
+__sfr __at (0xfae) RCREG1;
+__sfr __at (0xfaf) SPBRG1;
+__sfr __at (0xfb0) PSPCON;
+volatile __PSPCONbits_t __at (0xfb0) PSPCONbits;
 
-sfr at 0xfb1 T3CON;
-volatile __T3CONbits_t at 0xfb1 T3CONbits;
+__sfr __at (0xfb1) T3CON;
+volatile __T3CONbits_t __at (0xfb1) T3CONbits;
 
-sfr at 0xfb2 TMR3L;
-sfr at 0xfb3 TMR3H;
-sfr at 0xfb4 CMCON;
-volatile __CMCONbits_t at 0xfb4 CMCONbits;
+__sfr __at (0xfb2) TMR3L;
+__sfr __at (0xfb3) TMR3H;
+__sfr __at (0xfb4) CMCON;
+volatile __CMCONbits_t __at (0xfb4) CMCONbits;
 
-sfr at 0xfb5 CVRCON;
-volatile __CVRCONbits_t at 0xfb5 CVRCONbits;
+__sfr __at (0xfb5) CVRCON;
+volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
 
-sfr at 0xfb7 CCP3CON;
-volatile __CCP3CONbits_t at 0xfb7 CCP3CONbits;
-
-sfr at 0xfb8 CCPR3L;
-sfr at 0xfb9 CCPR3H;
-sfr at 0xfba CCP2CON;
-volatile __CCP2CONbits_t at 0xfba CCP2CONbits;
-
-sfr at 0xfbb CCPR2L;
-sfr at 0xfbc CCPR2H;
-sfr at 0xfbd CCP1CON;
-volatile __CCP1CONbits_t at 0xfbd CCP1CONbits;
-
-sfr at 0xfbe CCPR1L;
-sfr at 0xfbf CCPR1H;
-sfr at 0xfc0 ADCON2;
-volatile __ADCON2bits_t at 0xfc0 ADCON2bits;
-
-sfr at 0xfc1 ADCON1;
-volatile __ADCON1bits_t at 0xfc1 ADCON1bits;
-
-sfr at 0xfc2 ADCON0;
-volatile __ADCON0bits_t at 0xfc2 ADCON0bits;
-
-sfr at 0xfc3 ADRESL;
-sfr at 0xfc4 ADRESH;
-sfr at 0xfc5 SSPCON2;
-volatile __SSPCON2bits_t at 0xfc5 SSPCON2bits;
-
-sfr at 0xfc6 SSPCON1;
-volatile __SSPCON1bits_t at 0xfc6 SSPCON1bits;
-
-sfr at 0xfc7 SSPSTAT;
-volatile __SSPSTATbits_t at 0xfc7 SSPSTATbits;
-
-sfr at 0xfc8 SSPADD;
-sfr at 0xfc9 SSPBUF;
-sfr at 0xfca T2CON;
-volatile __T2CONbits_t at 0xfca T2CONbits;
-
-sfr at 0xfcb PR2;
-sfr at 0xfcc TMR2;
-sfr at 0xfcd T1CON;
-volatile __T1CONbits_t at 0xfcd T1CONbits;
-
-sfr at 0xfce TMR1L;
-sfr at 0xfcf TMR1H;
-sfr at 0xfd0 RCON;
-volatile __RCONbits_t at 0xfd0 RCONbits;
-
-sfr at 0xfd1 WDTCON;
-volatile __WDTCONbits_t at 0xfd1 WDTCONbits;
-
-sfr at 0xfd2 LVDCON;
-volatile __LVDCONbits_t at 0xfd2 LVDCONbits;
-
-sfr at 0xfd3 OSCCON;
-volatile __OSCCONbits_t at 0xfd3 OSCCONbits;
-
-sfr at 0xfd5 T0CON;
-sfr at 0xfd6 TMR0L;
-sfr at 0xfd7 TMR0H;
-sfr at 0xfd8 STATUS;
-volatile __STATUSbits_t at 0xfd8 STATUSbits;
-
-sfr at 0xfd9 FSR2L;
-sfr at 0xfda FSR2H;
-sfr at 0xfdb PLUSW2;
-sfr at 0xfdc PREINC2;
-sfr at 0xfdd POSTDEC2;
-sfr at 0xfde POSTINC2;
-sfr at 0xfdf INDF2;
-sfr at 0xfe0 BSR;
-sfr at 0xfe1 FSR1L;
-sfr at 0xfe2 FSR1H;
-sfr at 0xfe3 PLUSW1;
-sfr at 0xfe4 PREINC1;
-sfr at 0xfe5 POSTDEC1;
-sfr at 0xfe6 POSTINC1;
-sfr at 0xfe7 INDF1;
-sfr at 0xfe8 WREG;
-sfr at 0xfe9 FSR0L;
-sfr at 0xfea FSR0H;
-sfr at 0xfeb PLUSW0;
-sfr at 0xfec PREINC0;
-sfr at 0xfed POSTDEC0;
-sfr at 0xfee POSTINC0;
-sfr at 0xfef INDF0;
-sfr at 0xff0 INTCON3;
-volatile __INTCON3bits_t at 0xff0 INTCON3bits;
-
-sfr at 0xff1 INTCON2;
-volatile __INTCON2bits_t at 0xff1 INTCON2bits;
-
-sfr at 0xff2 INTCON;
-volatile __INTCONbits_t at 0xff2 INTCONbits;
-
-sfr at 0xff3 PRODL;
-sfr at 0xff4 PRODH;
-sfr at 0xff5 TABLAT;
-sfr at 0xff6 TBLPTRL;
-sfr at 0xff7 TBLPTRH;
-sfr at 0xff8 TBLPTRU;
-sfr at 0xff9 PCL;
-sfr at 0xffa PCLATH;
-sfr at 0xffb PCLATU;
-sfr at 0xffc STKPTR;
-volatile __STKPTRbits_t at 0xffc STKPTRbits;
-
-sfr at 0xffd TOSL;
-sfr at 0xffe TOSH;
-sfr at 0xfff TOSU;
+__sfr __at (0xfb7) CCP3CON;
+volatile __CCP3CONbits_t __at (0xfb7) CCP3CONbits;
+
+__sfr __at (0xfb8) CCPR3L;
+__sfr __at (0xfb9) CCPR3H;
+__sfr __at (0xfba) CCP2CON;
+volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
+
+__sfr __at (0xfbb) CCPR2L;
+__sfr __at (0xfbc) CCPR2H;
+__sfr __at (0xfbd) CCP1CON;
+volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
+
+__sfr __at (0xfbe) CCPR1L;
+__sfr __at (0xfbf) CCPR1H;
+__sfr __at (0xfc0) ADCON2;
+volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
+
+__sfr __at (0xfc1) ADCON1;
+volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
+
+__sfr __at (0xfc2) ADCON0;
+volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
+
+__sfr __at (0xfc3) ADRESL;
+__sfr __at (0xfc4) ADRESH;
+__sfr __at (0xfc5) SSPCON2;
+volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
+
+__sfr __at (0xfc6) SSPCON1;
+volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
+
+__sfr __at (0xfc7) SSPSTAT;
+volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
+
+__sfr __at (0xfc8) SSPADD;
+__sfr __at (0xfc9) SSPBUF;
+__sfr __at (0xfca) T2CON;
+volatile __T2CONbits_t __at (0xfca) T2CONbits;
+
+__sfr __at (0xfcb) PR2;
+__sfr __at (0xfcc) TMR2;
+__sfr __at (0xfcd) T1CON;
+volatile __T1CONbits_t __at (0xfcd) T1CONbits;
+
+__sfr __at (0xfce) TMR1L;
+__sfr __at (0xfcf) TMR1H;
+__sfr __at (0xfd0) RCON;
+volatile __RCONbits_t __at (0xfd0) RCONbits;
+
+__sfr __at (0xfd1) WDTCON;
+volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
+
+__sfr __at (0xfd2) LVDCON;
+volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
+
+__sfr __at (0xfd3) OSCCON;
+volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
+
+__sfr __at (0xfd5) T0CON;
+__sfr __at (0xfd6) TMR0L;
+__sfr __at (0xfd7) TMR0H;
+__sfr __at (0xfd8) STATUS;
+volatile __STATUSbits_t __at (0xfd8) STATUSbits;
+
+__sfr __at (0xfd9) FSR2L;
+__sfr __at (0xfda) FSR2H;
+__sfr __at (0xfdb) PLUSW2;
+__sfr __at (0xfdc) PREINC2;
+__sfr __at (0xfdd) POSTDEC2;
+__sfr __at (0xfde) POSTINC2;
+__sfr __at (0xfdf) INDF2;
+__sfr __at (0xfe0) BSR;
+__sfr __at (0xfe1) FSR1L;
+__sfr __at (0xfe2) FSR1H;
+__sfr __at (0xfe3) PLUSW1;
+__sfr __at (0xfe4) PREINC1;
+__sfr __at (0xfe5) POSTDEC1;
+__sfr __at (0xfe6) POSTINC1;
+__sfr __at (0xfe7) INDF1;
+__sfr __at (0xfe8) WREG;
+__sfr __at (0xfe9) FSR0L;
+__sfr __at (0xfea) FSR0H;
+__sfr __at (0xfeb) PLUSW0;
+__sfr __at (0xfec) PREINC0;
+__sfr __at (0xfed) POSTDEC0;
+__sfr __at (0xfee) POSTINC0;
+__sfr __at (0xfef) INDF0;
+__sfr __at (0xff0) INTCON3;
+volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
+
+__sfr __at (0xff1) INTCON2;
+volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
+
+__sfr __at (0xff2) INTCON;
+volatile __INTCONbits_t __at (0xff2) INTCONbits;
+
+__sfr __at (0xff3) PRODL;
+__sfr __at (0xff4) PRODH;
+__sfr __at (0xff5) TABLAT;
+__sfr __at (0xff6) TBLPTRL;
+__sfr __at (0xff7) TBLPTRH;
+__sfr __at (0xff8) TBLPTRU;
+__sfr __at (0xff9) PCL;
+__sfr __at (0xffa) PCLATH;
+__sfr __at (0xffb) PCLATU;
+__sfr __at (0xffc) STKPTR;
+volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
+
+__sfr __at (0xffd) TOSL;
+__sfr __at (0xffe) TOSH;
+__sfr __at (0xfff) TOSU;
 
 

diff --git a/src/pic16/pcode.c b/src/pic16/pcode.c
index 9f77d9d683b73c2a78da9e1a0a68bfe9f191c24b..1ffd594317409e08e54bf5311e032fa30e82b8f5 100644 (file)
--- a/src/pic16/pcode.c
+++ b/src/pic16/pcode.c
@@ -5037,7 +5037,14 @@ char *pic16_pCode2str(char *str, size_t size, pCode *pc)
 //              fprintf(stderr, "%s:%d reg = %p\tname= %s, accessBank= %d\n",
 //                      __FUNCTION__, __LINE__, r, (r)?r->name:"<null>", (r)?r->accessBank:-1);
 
-          if(r && !r->accessBank)SAFE_snprintf(&s,&size,", %s", (!pic16_mplab_comp?"B":"BANKED"));
+          if(PCI(pc)->isAccess) {
+           static char *bank_spec[2][2] = {
+             { "", ", ACCESS" },  /* gpasm uses access bank by default */
+             { ", B", ", BANKED" }/* MPASM (should) use BANKED by default */
+           };
+            
+           SAFE_snprintf(&s,&size,"%s", bank_spec[(r && !r->accessBank) ? 1 : 0][pic16_mplab_comp ? 1 : 0]);
+         }
         }
 //