* device/include/pic16/pic18f1220.h,

* device/lib/pic16/libdev/pic18f1220.c: applied patch #1776191

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

diff --git a/ChangeLog b/ChangeLog
index 5174f53b4487e78f5440f88b6ce6c25596431cd6..e1be99ab91fe3431e8fe317ed6b233606718cc65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-22 Raphael Neider <rneider AT web.de>
+
+       * device/include/pic16/pic18f1220.h,
+       * device/lib/pic16/libdev/pic18f1220.c: applied patch #1776191
+
 2007-08-12 Borut Razem <borut.razem AT siol.net>
 
        * debugger/mcs51/Makefile.in: support/Util/SDCCerr.[ch] moved to src

diff --git a/device/include/pic16/pic18f1220.h b/device/include/pic16/pic18f1220.h
index 5ed97df200cda5009249e46be2c4bb062127a76b..5c86e32e4bfd22bfb8678b785a85f40f1dff7585 100644 (file)
--- a/device/include/pic16/pic18f1220.h
+++ b/device/include/pic16/pic18f1220.h
@@ -348,10 +348,10 @@ typedef union {
                unsigned CCP1M1:1;
                unsigned CCP1M2:1;
                unsigned CCP1M3:1;
-               unsigned DCCP1Y:1;
-               unsigned DCCP1X:1;
-               unsigned :1;
-               unsigned :1;
+               unsigned DC1B0:1;
+               unsigned DC1B1:1;
+               unsigned P1M0:1;
+               unsigned P1M1:1;
        };
 } __CCP1CONbits_t;
 
@@ -365,9 +365,9 @@ typedef union {
                unsigned ADCS0:1;
                unsigned ADCS1:1;
                unsigned ADCS2:1;
-               unsigned :1;
-               unsigned :1;
-               unsigned :1;
+               unsigned ACQT0:1;
+               unsigned ACQT1:1;
+               unsigned ACQT2:1;
                unsigned :1;
                unsigned ADFM:1;
        };
@@ -382,9 +382,9 @@ typedef union {
                unsigned PCFG1:1;
                unsigned PCFG2:1;
                unsigned PCFG3:1;
-               unsigned VCFG0:1;
-               unsigned VCFG1:1;
-               unsigned :1;
+               unsigned PCFG4:1;
+               unsigned PCFG5:1;
+               unsigned PCFG6:1;
                unsigned :1;
        };
 } __ADCON1bits_t;
@@ -532,6 +532,20 @@ 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/pic18f1220.c b/device/lib/pic16/libdev/pic18f1220.c
index 506573fb388049e37f5d2eab6235db710141aea9..4e7b5b24151f8c58c1119d8e1482cce460686b6a 100644 (file)
--- a/device/lib/pic16/libdev/pic18f1220.c
+++ b/device/lib/pic16/libdev/pic18f1220.c
@@ -114,6 +114,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;