From 37e0c459657a38d5def73425d73f951227cae51c Mon Sep 17 00:00:00 2001
From: tecodev <tecodev@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 3 Sep 2007 09:17:13 +0000
Subject: [PATCH 1/1] * 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
---
 ChangeLog                           | 10 ++++++++++
 device/include/pic16/pic18f248.h    | 15 +++++++++++++++
 device/include/pic16/pic18f258.h    | 15 +++++++++++++++
 device/include/pic16/pic18f448.h    | 17 ++++++++++++++++-
 device/lib/pic16/libdev/pic18f248.c |  2 ++
 device/lib/pic16/libdev/pic18f258.c |  2 ++
 device/lib/pic16/libdev/pic18f448.c |  2 ++
 7 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 227792e7..97e9f7fd 100644
--- 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 64f08274..24fc5ea3 100644
--- 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 4f6cbfd3..da1a233b 100644
--- 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 50c6897c..6678f69c 100644
--- 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 611bdee7..b3eadba2 100644
--- 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 5f03ce1c..18871e7c 100644
--- 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 c976dcf2..3a8bf8f9 100644
--- 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;
-- 
2.30.2