* device/include/pic16/pic18f4550.h,

* device/include/pic16/pic18f4455.h,
* device/lib/pic16/libdev/pic18f4550.c,
* device/lib/pic16/libdev/pic18f4455.c: fixed #1578591 and #1595144
* configure.in: removed superfluous closing bracket

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

diff --git a/ChangeLog b/ChangeLog
index 70ecba19f75442b74a8abf68df941048fb8dce11..f65be90839345bd0af9e89cea6208c128b91bb74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-21 Raphael Neider <rneider AT web.de>
+
+       * device/include/pic16/pic18f4550.h,
+       * device/include/pic16/pic18f4455.h,
+       * device/lib/pic16/libdev/pic18f4550.c,
+       * device/lib/pic16/libdev/pic18f4455.c: fixed #1578591 and #1595144
+       * configure.in: removed superfluous closing bracket
+
 2006-11-21 Jesus Calvino-Fraga <jesusc at ece.ubc.ca>
 
        * device/lib/expf.c: Fixed bug 1599523: result of expf(x) is

diff --git a/configure.in b/configure.in
index 25ef046bef28c25b3910ebeb5b1c857b95c6a7dc..aa174afa024c00e8db918a6aa80a3bbc422108e9 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -641,7 +641,7 @@ fi
 
 if test $OPT_DISABLE_HC08 = 0; then
   AC_CONFIG_FILES([src/hc08/Makefile
-                   as/hc08/Makefile]
+                   as/hc08/Makefile
                    as/link/hc08/Makefile])
   test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/hc08/Makefile])
 fi

diff --git a/device/include/pic16/pic18f4455.h b/device/include/pic16/pic18f4455.h
index d356db649f6452aa21080742dcb763d564d86ec0..5f6fca8a9f061172934721612b4e9330d43f97db 100644 (file)
--- a/device/include/pic16/pic18f4455.h
+++ b/device/include/pic16/pic18f4455.h
@@ -1026,7 +1026,7 @@ extern __sfr __at (0xFBB) CCPR2L;
 
 extern __sfr __at (0xFBC) CCPR2H;
 
-extern __sfr __at (0xFBD) ECCP1CON;
+extern __sfr __at (0xFBD) CCP1CON;
 typedef union {
        struct {
                unsigned CCP1M0         : 1;
@@ -1038,8 +1038,8 @@ typedef union {
                unsigned P1M0           : 1;
                unsigned P1M1           : 1;
        };
-} __ECCP1CON_t;
-extern volatile __ECCP1CON_t __at (0xFBD) ECCP1CONbits;
+} __CCP1CON_t;
+extern volatile __CCP1CON_t __at (0xFBD) CCP1CONbits;
 
 extern __sfr __at (0xFBE) CCPR1L;
 
@@ -1397,16 +1397,6 @@ typedef union {
                unsigned RBIE           : 1;
                unsigned INT0IE         : 1;
                unsigned TMR0IE         : 1;
-               unsigned PEIE_GIEL      : 1;
-               unsigned GIE_GIEH       : 1;
-       };
-       struct {
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
                unsigned PEIE           : 1;
                unsigned GIE            : 1;
        };

diff --git a/device/include/pic16/pic18f4550.h b/device/include/pic16/pic18f4550.h
index 50df0509c941108e61390c89a2c22bb20c600ee7..dee3b34c01ff2cb6167083949eff06a13ca10406 100644 (file)
--- a/device/include/pic16/pic18f4550.h
+++ b/device/include/pic16/pic18f4550.h
@@ -52,8 +52,8 @@ extern __sfr __at (0xF65) SPPCON;
 typedef union {
        struct {
                unsigned SPPEN          : 1;
-               unsigned DMA0WN         : 1;
-               unsigned RDYO           : 1;
+               unsigned SPPOWN         : 1;
+               unsigned                : 1;
                unsigned                : 1;
                unsigned                : 1;
                unsigned                : 1;
@@ -490,11 +490,11 @@ typedef union {
        };
        /* aliases */
        struct {
-               unsigned                :1;
-               unsigned                :1;
+               unsigned AN12           :1;
+               unsigned AN10           :1;
                unsigned AN8            :1;
                unsigned AN9            :1;
-               unsigned                :1;
+               unsigned AN11           :1;
                unsigned                :1;
                unsigned                :1;
                unsigned                :1;
@@ -583,23 +583,23 @@ extern volatile __PORTD_t __at (0xF83) PORTDbits;
 extern __sfr __at (0xF84) PORTE;
 typedef union {
        struct {
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
+               unsigned RE0            : 1;
+               unsigned RE1            : 1;
+               unsigned RE2            : 1;
                unsigned RE3            : 1;
                unsigned                : 1;
                unsigned                : 1;
                unsigned                : 1;
-               unsigned                : 1;
+               unsigned RDPU           : 1;
        };
        struct {
                unsigned RE             : 8;
        };
        /* aliases */
        struct {
-               unsigned                :1;
-               unsigned                :1;
-               unsigned                :1;
+               unsigned AN5            :1;
+               unsigned AN6            :1;
+               unsigned AN7            :1;
                unsigned MCLR           :1;
                unsigned                :1;
                unsigned                :1;
@@ -654,6 +654,36 @@ typedef union {
 } __LATC_t;
 extern volatile __LATC_t __at (0xF8B) LATCbits;
 
+extern __sfr __at (0xF8C) LATD;
+typedef union {
+       struct {
+               unsigned LATD0          : 1;
+               unsigned LATD1          : 1;
+               unsigned LATD2          : 1;
+               unsigned LATD3          : 1;
+               unsigned LATD4          : 1;
+               unsigned LATD5          : 1;
+               unsigned LATD6          : 1;
+               unsigned LATD7          : 1;
+       };
+} __LATD_t;
+extern volatile __LATD_t __at (0xF8C) LATDbits;
+
+extern __sfr __at (0xF8D) LATE;
+typedef union {
+       struct {
+               unsigned LATE0          : 1;
+               unsigned LATE1          : 1;
+               unsigned LATE2          : 1;
+               unsigned                : 1;
+               unsigned                : 1;
+               unsigned                : 1;
+               unsigned                : 1;
+               unsigned                : 1;
+       };
+} __LATE_t;
+extern volatile __LATE_t __at (0xF8D) LATEbits;
+
 extern __sfr __at (0xF92) TRISA;
 typedef union {
        struct {
@@ -714,6 +744,21 @@ typedef union {
 } __TRISD_t;
 extern volatile __TRISD_t __at (0xF95) TRISDbits;
 
+extern __sfr __at (0xF96) TRISE;
+typedef union {
+       struct {
+               unsigned TRISE0         : 1;
+               unsigned TRISE1         : 1;
+               unsigned TRISE2         : 1;
+               unsigned                : 1;
+               unsigned                : 1;
+               unsigned                : 1;
+               unsigned                : 1;
+               unsigned                : 1;
+       };
+} __TRISE_t;
+extern volatile __TRISE_t __at (0xF96) TRISEbits;
+
 extern __sfr __at (0xF9B) OSCTUNE;
 typedef union {
        struct {
@@ -735,7 +780,7 @@ typedef union {
                unsigned TXIE           : 1;
                unsigned RCIE           : 1;
                unsigned ADIE           : 1;
-               unsigned                : 1;
+               unsigned SPPIE          : 1;
        };
 } __PIE1_t;
 extern volatile __PIE1_t __at (0xF9D) PIE1bits;
@@ -750,7 +795,7 @@ typedef union {
                unsigned TXIF           : 1;
                unsigned RCIF           : 1;
                unsigned ADIF           : 1;
-               unsigned                : 1;
+               unsigned SPPIF          : 1;
        };
 } __PIR1_t;
 extern volatile __PIR1_t __at (0xF9E) PIR1bits;
@@ -765,7 +810,7 @@ typedef union {
                unsigned TXIP           : 1;
                unsigned RCIP           : 1;
                unsigned ADIP           : 1;
-               unsigned                : 1;
+               unsigned SPPIP          : 1;
        };
 } __IPR1_t;
 extern volatile __IPR1_t __at (0xF9F) IPR1bits;
@@ -926,8 +971,8 @@ extern volatile __CVRCON_t __at (0xFB5) CVRCONbits;
 extern __sfr __at (0xFB6) ECCP1AS;
 typedef union {
        struct {
-               unsigned                : 1;
-               unsigned                : 1;
+               unsigned PSSBD0         : 1;
+               unsigned PSSBD1         : 1;
                unsigned PSSAC0         : 1;
                unsigned PSSAC1         : 1;
                unsigned ECCPAS0        : 1;
@@ -941,13 +986,7 @@ extern volatile __ECCP1AS_t __at (0xFB6) ECCP1ASbits;
 extern __sfr __at (0xFB7) ECCP1DEL;
 typedef union {
        struct {
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
-               unsigned                : 1;
+               unsigned PDC            : 7;
                unsigned PRSEN          : 1;
        };
 } __ECCP1DEL_t;
@@ -996,8 +1035,8 @@ typedef union {
                unsigned CCP1M3         : 1;
                unsigned DC1B0          : 1;
                unsigned DC1B1          : 1;
-               unsigned                : 1;
-               unsigned                : 1;
+               unsigned P1M0           : 1;
+               unsigned P1M1           : 1;
        };
 } __CCP1CON_t;
 extern volatile __CCP1CON_t __at (0xFBD) CCP1CONbits;
@@ -1040,7 +1079,7 @@ extern __sfr __at (0xFC2) ADCON0;
 typedef union {
        struct {
                unsigned ADON           : 1;
-               unsigned GO             : 1;
+               unsigned GO             : 1;
                unsigned CHS0           : 1;
                unsigned CHS1           : 1;
                unsigned CHS2           : 1;
@@ -1073,10 +1112,10 @@ extern volatile __SSPCON2_t __at (0xFC5) SSPCON2bits;
 extern __sfr __at (0xFC6) SSPCON1;
 typedef union {
        struct {
-               unsigned SSPM0          : 1;
-               unsigned SSPM1          : 1;
-               unsigned SSPM2          : 1;
-               unsigned SSPM3          : 1;
+               unsigned SSPM0          : 1;
+               unsigned SSPM1          : 1;
+               unsigned SSPM2          : 1;
+               unsigned SSPM3          : 1;
                unsigned CKP            : 1;
                unsigned SSPEN          : 1;
                unsigned SSPOV          : 1;
@@ -1571,6 +1610,7 @@ extern volatile __TOSU_t __at (0xFFF) TOSUbits;
 #define        _LVP_OFF_4L                                     0xFB    /* Disabled */
 
 /* Dedicated In-Circuit Port {ICD/ICSP} 4L options */
+#define        _ENICPORT_ON_4L                                 0xFF    /* Enabled */
 #define        _ENICPORT_OFF_4L                                0xDF    /* Disabled */
 
 /* Extended CPU Enable 4L options */

diff --git a/device/lib/pic16/libdev/pic18f4455.c b/device/lib/pic16/libdev/pic18f4455.c
index f4a87c799ce042cbd8c8a3bf32b5dabff8dd0235..78729cc0c675ef6eceab140abda10834a19cb832 100644 (file)
--- a/device/lib/pic16/libdev/pic18f4455.c
+++ b/device/lib/pic16/libdev/pic18f4455.c
@@ -224,8 +224,8 @@ __sfr __at (0xFBB) CCPR2L;
 
 __sfr __at (0xFBC) CCPR2H;
 
-__sfr __at (0xFBD) ECCP1CON;
-volatile __ECCP1CON_t __at (0xFBD) ECCP1CONbits;
+__sfr __at (0xFBD) CCP1CON;
+volatile __CCP1CON_t __at (0xFBD) CCP1CONbits;
 
 __sfr __at (0xFBE) CCPR1L;
 

diff --git a/device/lib/pic16/libdev/pic18f4550.c b/device/lib/pic16/libdev/pic18f4550.c
index ff3f1921f8fb04a86d11fcae76750cd517eab736..eb962e849719e7f00060bb958c1f33ffa424b5ba 100644 (file)
--- a/device/lib/pic16/libdev/pic18f4550.c
+++ b/device/lib/pic16/libdev/pic18f4550.c
@@ -130,6 +130,12 @@ volatile __LATB_t __at (0xF8A) LATBbits;
 __sfr __at (0xF8B) LATC;
 volatile __LATC_t __at (0xF8B) LATCbits;
 
+__sfr __at (0xF8C) LATD;
+volatile __LATD_t __at (0xF8C) LATDbits;
+
+__sfr __at (0xF8D) LATE;
+volatile __LATE_t __at (0xF8D) LATEbits;
+
 __sfr __at (0xF92) TRISA;
 volatile __TRISA_t __at (0xF92) TRISAbits;
 
@@ -142,6 +148,9 @@ volatile __TRISC_t __at (0xF94) TRISCbits;
 __sfr __at (0xF95) TRISD;
 volatile __TRISD_t __at (0xF95) TRISDbits;
 
+__sfr __at (0xF96) TRISE;
+volatile __TRISE_t __at (0xF96) TRISEbits;
+
 __sfr __at (0xF9B) OSCTUNE;
 volatile __OSCTUNE_t __at (0xF9B) OSCTUNEbits;