* 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

diff --git a/ChangeLog b/ChangeLog
index 4e17c38058ead156db9924e6138fdc7ff7bdd060..351357e3cc2dee488341d156f8089a34ca68e1f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-10 Raphael Neider <rneider AT web.de>
+
+       * device/include/pic16/pic18f*.h: add bit aliases in INTCONbits_t
+
 2008-02-09 Raphael Neider <rneider AT web.de>
 
        * 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 5c86e32e4bfd22bfb8678b785a85f40f1dff7585..d70cc1532c8d0bc698ace4d09a61e8f13414a5fc 100644 (file)
--- 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 60f16b9f381f42f8800c48125569fb73cd4ee1f0..ce644025a9664b904a2203c19d001a2bf80c180f 100644 (file)
--- 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 e848f4a3b766ed83ca62240368e8382f6d1e9e43..c2d63e2b04a5db8e48187a705a1233ad8a8bf5ea 100644 (file)
--- 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 cbd1abf58142645a0bd33d8780e3c57c03676bc3..9d11873cafc51b17f904f78dd490e38f18f56010 100644 (file)
--- 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 6c884fa82362d34421fef2a18dee6c1b3d1a4dc5..25ed06b0d341f93ab1fc7b54c6c7482e5f6ff57f 100644 (file)
--- 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 82fbe61890cc3c587164cdb11c04aac48aafd239..3e6b2f5940c5a7119fce9926da82a861df4440d5 100644 (file)
--- 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 24fc5ea38093773cca8083a56ee76040946465b7..1d6b74f9b653f6cffbbd1732d524447da18453aa 100644 (file)
--- 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 f913396263e76a4e8fb6e4dca00ac7f4699da865..6f542e37db517b9e5c4e464c93db7107a679c97d 100644 (file)
--- 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 da1a233b66b07c16b4e7a304db0d58e18e224783..e067c16fb1a24b7085610c6d9d257a7fbbedf330 100644 (file)
--- 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 b01b2176853034d3ea2d2accfb84df960378171f..b74283970b589e3e524bd4368030c6066373298c 100644 (file)
--- 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 d5b8d15048f77425e57b2be5b1aa914dfc589696..c5d1d4599021ecc450ef41a82e16746fe1964fc7 100644 (file)
--- 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 7be1c53243d6c54d7714a613d725d0fa791c95f1..931878e3e9e9bee5d098e9854c7f1fea95ba21b5 100644 (file)
--- 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 73e03e9533d9cfd0565e19da72faea2f8aa1d238..046c92dda17ea7634e771418c55a50f8265d708f 100644 (file)
--- 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 6678f69cd4d4759e42df7b5f3ba14dda1b897a23..c750fedd9528a5e4003201c5941b3b92a88552bc 100644 (file)
--- 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 56094ccb0bc690bf97167de281b0983deb0634ac..dd2b7ef8972c3d7225f247fe9703873cccaed55a 100644 (file)
--- 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 0034dd8463919310d14a5c18585b6818ac09b713..a513b6e6bd70d8d849669a2dcdecb3059dc92c8e 100644 (file)
--- 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 d62978521dd33c394210552d68e5c130623f6b27..0441d6117e0760cb241aff16ebb070e54f2312c3 100644 (file)
--- 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 91cd50b9d75b26b3552295c00f3859b4df23f8e5..eee64908b6ef86865502d4107d78e7338e528dde 100644 (file)
--- 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 2b23ff21fe19c0670e074bc2defab50885c78561..651867df893af82b84061f5da1c8f46e66181b68 100644 (file)
--- 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 853d8073d0b140b3a32542680aee38a8eb4d5747..7e849e9943348c86a92f236c4cf80da108f2cb04 100644 (file)
--- 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 ba6d09641475bfb931d58376e87def28f3db7ec0..a03659a9121715c51ec6ced01c6f72b37b195fa0 100644 (file)
--- 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 4dbe72b652b22d94262487a4815540363de35e5e..01fd380f3f8744f366046ac7afdd89a83289958b 100644 (file)
--- 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 e88a216dbd20aa624003e92634b95cdd2ea5b114..445fa75a8541e0c7392a344f22d30332d5a68007 100644 (file)
--- 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 2df4677c617210565e7d109ec3241561f36b209c..c3f46c070709d2ae47511190c58e7f01b25d2177 100644 (file)
--- 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;