From bb226788dab3832b0ec0cda70874ce3fce4eebc6 Mon Sep 17 00:00:00 2001 From: tecodev Date: Mon, 9 Feb 2009 23:45:54 +0000 Subject: [PATCH] * device/include/pic16/pic18f*.h: add bit aliases in INTCONbits_t git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5369 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 4 ++++ device/include/pic16/pic18f1220.h | 10 ++++++++++ device/include/pic16/pic18f2220.h | 10 ++++++++++ device/include/pic16/pic18f2221.h | 4 ++-- device/include/pic16/pic18f2321.h | 4 ++-- device/include/pic16/pic18f242.h | 10 ++++++++++ device/include/pic16/pic18f2455.h | 8 ++++---- device/include/pic16/pic18f248.h | 10 ++++++++++ device/include/pic16/pic18f252.h | 10 ++++++++++ device/include/pic16/pic18f258.h | 10 ++++++++++ device/include/pic16/pic18f4220.h | 10 ++++++++++ device/include/pic16/pic18f4221.h | 4 ++-- device/include/pic16/pic18f4321.h | 4 ++-- device/include/pic16/pic18f442.h | 10 ++++++++++ device/include/pic16/pic18f448.h | 10 ++++++++++ device/include/pic16/pic18f452.h | 10 ++++++++++ device/include/pic16/pic18f458.h | 10 ++++++++++ device/include/pic16/pic18f4620.h | 8 ++++---- device/include/pic16/pic18f6520.h | 10 ++++++++++ device/include/pic16/pic18f6620.h | 10 ++++++++++ device/include/pic16/pic18f6720.h | 10 ++++++++++ device/include/pic16/pic18f8520.h | 10 ++++++++++ device/include/pic16/pic18f8620.h | 10 ++++++++++ device/include/pic16/pic18f8680.h | 10 ++++++++++ device/include/pic16/pic18f8720.h | 10 ++++++++++ 25 files changed, 200 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e17c380..351357e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-02-10 Raphael Neider + + * device/include/pic16/pic18f*.h: add bit aliases in INTCONbits_t + 2008-02-09 Raphael Neider * src/pic16/pcode.c (assignToSameBank): add force argument to ignore diff --git a/device/include/pic16/pic18f1220.h b/device/include/pic16/pic18f1220.h index 5c86e32e..d70cc153 100644 --- a/device/include/pic16/pic18f1220.h +++ b/device/include/pic16/pic18f1220.h @@ -642,6 +642,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f2220.h b/device/include/pic16/pic18f2220.h index 60f16b9f..ce644025 100644 --- a/device/include/pic16/pic18f2220.h +++ b/device/include/pic16/pic18f2220.h @@ -842,6 +842,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f2221.h b/device/include/pic16/pic18f2221.h index e848f4a3..c2d63e2b 100644 --- a/device/include/pic16/pic18f2221.h +++ b/device/include/pic16/pic18f2221.h @@ -1304,10 +1304,10 @@ typedef union { }; struct { unsigned : 1; - unsigned : 1; + unsigned INT0F : 1; unsigned T0IF : 1; unsigned : 1; - unsigned : 1; + unsigned INT0E : 1; unsigned T0IE : 1; unsigned GIEL : 1; unsigned GIEH : 1; diff --git a/device/include/pic16/pic18f2321.h b/device/include/pic16/pic18f2321.h index cbd1abf5..9d11873c 100644 --- a/device/include/pic16/pic18f2321.h +++ b/device/include/pic16/pic18f2321.h @@ -1305,10 +1305,10 @@ typedef union { }; struct { unsigned : 1; - unsigned : 1; + unsigned INT0F : 1; unsigned T0IF : 1; unsigned : 1; - unsigned : 1; + unsigned INT0E : 1; unsigned T0IE : 1; unsigned GIEL : 1; unsigned GIEH : 1; diff --git a/device/include/pic16/pic18f242.h b/device/include/pic16/pic18f242.h index 6c884fa8..25ed06b0 100644 --- a/device/include/pic16/pic18f242.h +++ b/device/include/pic16/pic18f242.h @@ -747,6 +747,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f2455.h b/device/include/pic16/pic18f2455.h index 82fbe618..3e6b2f59 100644 --- a/device/include/pic16/pic18f2455.h +++ b/device/include/pic16/pic18f2455.h @@ -1395,11 +1395,11 @@ typedef union { }; struct { unsigned : 1; + unsigned INT0F : 1; + unsigned T0IF : 1; unsigned : 1; - unsigned : 1; - unsigned : 1; - unsigned : 1; - unsigned : 1; + unsigned INT0E : 1; + unsigned T0IE : 1; unsigned GIEL : 1; unsigned GIEH : 1; }; diff --git a/device/include/pic16/pic18f248.h b/device/include/pic16/pic18f248.h index 24fc5ea3..1d6b74f9 100644 --- a/device/include/pic16/pic18f248.h +++ b/device/include/pic16/pic18f248.h @@ -2497,6 +2497,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f252.h b/device/include/pic16/pic18f252.h index f9133962..6f542e37 100644 --- a/device/include/pic16/pic18f252.h +++ b/device/include/pic16/pic18f252.h @@ -747,6 +747,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f258.h b/device/include/pic16/pic18f258.h index da1a233b..e067c16f 100644 --- a/device/include/pic16/pic18f258.h +++ b/device/include/pic16/pic18f258.h @@ -2497,6 +2497,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f4220.h b/device/include/pic16/pic18f4220.h index b01b2176..b7428397 100644 --- a/device/include/pic16/pic18f4220.h +++ b/device/include/pic16/pic18f4220.h @@ -996,6 +996,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f4221.h b/device/include/pic16/pic18f4221.h index d5b8d150..c5d1d459 100644 --- a/device/include/pic16/pic18f4221.h +++ b/device/include/pic16/pic18f4221.h @@ -1471,10 +1471,10 @@ typedef union { }; struct { unsigned : 1; - unsigned : 1; + unsigned INT0F : 1; unsigned T0IF : 1; unsigned : 1; - unsigned : 1; + unsigned INT0E : 1; unsigned T0IE : 1; unsigned GIEL : 1; unsigned GIEH : 1; diff --git a/device/include/pic16/pic18f4321.h b/device/include/pic16/pic18f4321.h index 7be1c532..931878e3 100644 --- a/device/include/pic16/pic18f4321.h +++ b/device/include/pic16/pic18f4321.h @@ -1472,10 +1472,10 @@ typedef union { }; struct { unsigned : 1; - unsigned : 1; + unsigned INT0F : 1; unsigned T0IF : 1; unsigned : 1; - unsigned : 1; + unsigned INT0E : 1; unsigned T0IE : 1; unsigned GIEL : 1; unsigned GIEH : 1; diff --git a/device/include/pic16/pic18f442.h b/device/include/pic16/pic18f442.h index 73e03e95..046c92dd 100644 --- a/device/include/pic16/pic18f442.h +++ b/device/include/pic16/pic18f442.h @@ -876,6 +876,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f448.h b/device/include/pic16/pic18f448.h index 6678f69c..c750fedd 100644 --- a/device/include/pic16/pic18f448.h +++ b/device/include/pic16/pic18f448.h @@ -2724,6 +2724,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f452.h b/device/include/pic16/pic18f452.h index 56094ccb..dd2b7ef8 100644 --- a/device/include/pic16/pic18f452.h +++ b/device/include/pic16/pic18f452.h @@ -876,6 +876,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f458.h b/device/include/pic16/pic18f458.h index 0034dd84..a513b6e6 100644 --- a/device/include/pic16/pic18f458.h +++ b/device/include/pic16/pic18f458.h @@ -2724,6 +2724,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f4620.h b/device/include/pic16/pic18f4620.h index d6297852..0441d611 100644 --- a/device/include/pic16/pic18f4620.h +++ b/device/include/pic16/pic18f4620.h @@ -1069,11 +1069,11 @@ typedef union { }; struct { unsigned : 1; + unsigned INT0F : 1; + unsigned T0IF : 1; unsigned : 1; - unsigned : 1; - unsigned : 1; - unsigned : 1; - unsigned : 1; + unsigned INT0E : 1; + unsigned T0IE : 1; unsigned GIEL : 1; unsigned GIEH : 1; }; diff --git a/device/include/pic16/pic18f6520.h b/device/include/pic16/pic18f6520.h index 91cd50b9..eee64908 100644 --- a/device/include/pic16/pic18f6520.h +++ b/device/include/pic16/pic18f6520.h @@ -1203,6 +1203,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f6620.h b/device/include/pic16/pic18f6620.h index 2b23ff21..651867df 100644 --- a/device/include/pic16/pic18f6620.h +++ b/device/include/pic16/pic18f6620.h @@ -1187,6 +1187,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f6720.h b/device/include/pic16/pic18f6720.h index 853d8073..7e849e99 100644 --- a/device/include/pic16/pic18f6720.h +++ b/device/include/pic16/pic18f6720.h @@ -1187,6 +1187,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f8520.h b/device/include/pic16/pic18f8520.h index ba6d0964..a03659a9 100644 --- a/device/include/pic16/pic18f8520.h +++ b/device/include/pic16/pic18f8520.h @@ -1299,6 +1299,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f8620.h b/device/include/pic16/pic18f8620.h index 4dbe72b6..01fd380f 100644 --- a/device/include/pic16/pic18f8620.h +++ b/device/include/pic16/pic18f8620.h @@ -1299,6 +1299,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f8680.h b/device/include/pic16/pic18f8680.h index e88a216d..445fa75a 100644 --- a/device/include/pic16/pic18f8680.h +++ b/device/include/pic16/pic18f8680.h @@ -1779,6 +1779,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; diff --git a/device/include/pic16/pic18f8720.h b/device/include/pic16/pic18f8720.h index 2df4677c..c3f46c07 100644 --- a/device/include/pic16/pic18f8720.h +++ b/device/include/pic16/pic18f8720.h @@ -1299,6 +1299,16 @@ typedef union { unsigned PEIE:1; unsigned GIE:1; }; + struct { + unsigned :1; + unsigned INT0IF:1; + unsigned TMR0IF:1; + unsigned :1; + unsigned INT0IE:1; + unsigned TMR0IE:1; + unsigned GIEL:1; + unsigned GIEH:1; + }; } __INTCONbits_t; extern volatile __INTCONbits_t __at (0xff2) INTCONbits; -- 2.30.2