* device/include/pic16/pic18f248.h,

* device/include/pic16/pic18f258.h,
* device/include/pic16/pic18f448.h,
* device/lib/pic16/libdev/pic18f248.c,
* device/lib/pic16/libdev/pic18f258.c,
* device/lib/pic16/libdev/pic18f448.c: fixed TRISEbits,
  added T0CONbits, fixes #1786891

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

diff --git a/ChangeLog b/ChangeLog
index 227792e708f17b8fc710b5035c26d4128b7afbfa..97e9f7fdd2fb6e415ed279fa987cc93f03da6433 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-09-03 Raphael Neider <rneider AT web.de>
+
+       * device/include/pic16/pic18f248.h,
+       * device/include/pic16/pic18f258.h,
+       * device/include/pic16/pic18f448.h,
+       * device/lib/pic16/libdev/pic18f248.c,
+       * device/lib/pic16/libdev/pic18f258.c,
+       * device/lib/pic16/libdev/pic18f448.c: fixed TRISEbits,
+         added T0CONbits, fixes #1786891
+
 2007-08-29 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * src/ds390/gen.c (genFarPointerSet),

diff --git a/device/include/pic16/pic18f248.h b/device/include/pic16/pic18f248.h
index 64f082744ca07a4c811afd118a6aef6f8c1af671..24fc5ea38093773cca8083a56ee76040946465b7 100644 (file)
--- a/device/include/pic16/pic18f248.h
+++ b/device/include/pic16/pic18f248.h
@@ -2386,6 +2386,21 @@ typedef union {
 extern volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
 
 extern __sfr __at (0xfd5) T0CON;
+typedef union {
+       struct {
+               unsigned T0PS0:1;
+               unsigned T0PS1:1;
+               unsigned T0PS2:1;
+               unsigned PSA:1;
+               unsigned T0SE:1;
+               unsigned T0CS:1;
+               unsigned T08BIT:1;
+               unsigned TMR0ON:1;
+       };
+} __T0CONbits_t;
+
+extern volatile __T0CONbits_t __at (0xfd5) T0CONbits;
+
 extern __sfr __at (0xfd6) TMR0L;
 extern __sfr __at (0xfd7) TMR0H;
 extern __sfr __at (0xfd8) STATUS;

diff --git a/device/include/pic16/pic18f258.h b/device/include/pic16/pic18f258.h
index 4f6cbfd3aa465d742e7a69a7266aba77fd8a8623..da1a233b66b07c16b4e7a304db0d58e18e224783 100644 (file)
--- a/device/include/pic16/pic18f258.h
+++ b/device/include/pic16/pic18f258.h
@@ -2386,6 +2386,21 @@ typedef union {
 extern volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
 
 extern __sfr __at (0xfd5) T0CON;
+typedef union {
+       struct {
+               unsigned T0PS0:1;
+               unsigned T0PS1:1;
+               unsigned T0PS2:1;
+               unsigned PSA:1;
+               unsigned T0SE:1;
+               unsigned T0CS:1;
+               unsigned T08BIT:1;
+               unsigned TMR0ON:1;
+       };
+} __T0CONbits_t;
+
+extern volatile __T0CONbits_t __at (0xfd5) T0CONbits;
+
 extern __sfr __at (0xfd6) TMR0L;
 extern __sfr __at (0xfd7) TMR0H;
 extern __sfr __at (0xfd8) STATUS;

diff --git a/device/include/pic16/pic18f448.h b/device/include/pic16/pic18f448.h
index 50c6897c701db0707b52925c043a770988b95aa1..6678f69cd4d4759e42df7b5f3ba14dda1b897a23 100644 (file)
--- a/device/include/pic16/pic18f448.h
+++ b/device/include/pic16/pic18f448.h
@@ -2061,11 +2061,11 @@ extern volatile __TRISDbits_t __at (0xf95) TRISDbits;
 extern __sfr __at (0xf96) TRISE;
 typedef union {
        struct {
-               unsigned :1;
                unsigned TRISE0:1;
                unsigned TRISE1:1;
                unsigned TRISE2:1;
                unsigned :1;
+               unsigned PSPMODE:1;
                unsigned IBOV:1;
                unsigned OBF:1;
                unsigned IBF:1;
@@ -2613,6 +2613,21 @@ typedef union {
 extern volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
 
 extern __sfr __at (0xfd5) T0CON;
+typedef union {
+       struct {
+               unsigned T0PS0:1;
+               unsigned T0PS1:1;
+               unsigned T0PS2:1;
+               unsigned PSA:1;
+               unsigned T0SE:1;
+               unsigned T0CS:1;
+               unsigned T08BIT:1;
+               unsigned TMR0ON:1;
+       };
+} __T0CONbits_t;
+
+extern volatile __T0CONbits_t __at (0xfd5) T0CONbits;
+
 extern __sfr __at (0xfd6) TMR0L;
 extern __sfr __at (0xfd7) TMR0H;
 extern __sfr __at (0xfd8) STATUS;

diff --git a/device/lib/pic16/libdev/pic18f248.c b/device/lib/pic16/libdev/pic18f248.c
index 611bdee7c0cd218d5a6a6c11e34882578ce82cad..b3eadba23d1d0d2754ef086a35a8a1cbc7b782b7 100644 (file)
--- a/device/lib/pic16/libdev/pic18f248.c
+++ b/device/lib/pic16/libdev/pic18f248.c
@@ -464,6 +464,8 @@ __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;

diff --git a/device/lib/pic16/libdev/pic18f258.c b/device/lib/pic16/libdev/pic18f258.c
index 5f03ce1c57258ee61d4f6028be9a3f36143c1ad1..18871e7c20f6d5f7f7d139503c8872aa6e891cf7 100644 (file)
--- a/device/lib/pic16/libdev/pic18f258.c
+++ b/device/lib/pic16/libdev/pic18f258.c
@@ -464,6 +464,8 @@ __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;

diff --git a/device/lib/pic16/libdev/pic18f448.c b/device/lib/pic16/libdev/pic18f448.c
index c976dcf2ac701c0c54cf2d2b050776b27392d118..3a8bf8f936fb744cfe3b63569fb2818203bd5cbf 100644 (file)
--- a/device/lib/pic16/libdev/pic18f448.c
+++ b/device/lib/pic16/libdev/pic18f448.c
@@ -502,6 +502,8 @@ __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;