X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Finclude%2Fpic%2Fpic16c558.h;h=a9849a1110e318419819f09fbde071bffdc201aa;hb=eae1bd2f705a2c61e143c539f8c4d1e9c2b4efe6;hp=70d05c3b38dc6840842d5bad51937b174390ae89;hpb=d1509cf37c6ba9cc5aa238fcce11824efefc7941;p=fw%2Fsdcc

diff --git a/device/include/pic/pic16c558.h b/device/include/pic/pic16c558.h
index 70d05c3b..a9849a11 100644
--- a/device/include/pic/pic16c558.h
+++ b/device/include/pic/pic16c558.h
@@ -4,7 +4,7 @@
 //
 // This header file was automatically generated by:
 //
-//	inc2h.pl V4514
+//	inc2h.pl V4783
 //
 //	Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved
 //
@@ -93,9 +93,9 @@
 
 //----- Register Files------------------------------------------------------
 
-extern __data __at (INDF_ADDR) volatile char      INDF;
+extern __sfr  __at (INDF_ADDR)                    INDF;
 extern __sfr  __at (TMR0_ADDR)                    TMR0;
-extern __data __at (PCL_ADDR) volatile char       PCL;
+extern __sfr  __at (PCL_ADDR)                     PCL;
 extern __sfr  __at (STATUS_ADDR)                  STATUS;
 extern __sfr  __at (FSR_ADDR)                     FSR;
 extern __sfr  __at (PORTA_ADDR)                   PORTA;
@@ -166,6 +166,7 @@ typedef union {
 } __INTCON_bits_t;
 extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits;
 
+#ifndef NO_BIT_DEFINES
 #define RBIF                 INTCON_bits.RBIF
 #define INTF                 INTCON_bits.INTF
 #define T0IF                 INTCON_bits.T0IF
@@ -173,6 +174,7 @@ extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits;
 #define INTE                 INTCON_bits.INTE
 #define T0IE                 INTCON_bits.T0IE
 #define GIE                  INTCON_bits.GIE
+#endif /* NO_BIT_DEFINES */
 
 // ----- OPTION_REG bits --------------------
 typedef union {
@@ -189,6 +191,7 @@ typedef union {
 } __OPTION_REG_bits_t;
 extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits;
 
+#ifndef NO_BIT_DEFINES
 #define PS0                  OPTION_REG_bits.PS0
 #define PS1                  OPTION_REG_bits.PS1
 #define PS2                  OPTION_REG_bits.PS2
@@ -197,6 +200,7 @@ extern volatile __OPTION_REG_bits_t __at(OPTION_REG_ADDR) OPTION_REG_bits;
 #define T0CS                 OPTION_REG_bits.T0CS
 #define INTEDG               OPTION_REG_bits.INTEDG
 #define NOT_RBPU             OPTION_REG_bits.NOT_RBPU
+#endif /* NO_BIT_DEFINES */
 
 // ----- PCON bits --------------------
 typedef union {
@@ -213,7 +217,9 @@ typedef union {
 } __PCON_bits_t;
 extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits;
 
+#ifndef NO_BIT_DEFINES
 #define NOT_POR              PCON_bits.NOT_POR
+#endif /* NO_BIT_DEFINES */
 
 // ----- PORTA bits --------------------
 typedef union {
@@ -230,12 +236,14 @@ typedef union {
 } __PORTA_bits_t;
 extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits;
 
+#ifndef NO_BIT_DEFINES
 #define RA0                  PORTA_bits.RA0
 #define RA1                  PORTA_bits.RA1
 #define RA2                  PORTA_bits.RA2
 #define RA3                  PORTA_bits.RA3
 #define RA4                  PORTA_bits.RA4
 #define RA5                  PORTA_bits.RA5
+#endif /* NO_BIT_DEFINES */
 
 // ----- PORTB bits --------------------
 typedef union {
@@ -252,6 +260,7 @@ typedef union {
 } __PORTB_bits_t;
 extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits;
 
+#ifndef NO_BIT_DEFINES
 #define RB0                  PORTB_bits.RB0
 #define RB1                  PORTB_bits.RB1
 #define RB2                  PORTB_bits.RB2
@@ -260,6 +269,7 @@ extern volatile __PORTB_bits_t __at(PORTB_ADDR) PORTB_bits;
 #define RB5                  PORTB_bits.RB5
 #define RB6                  PORTB_bits.RB6
 #define RB7                  PORTB_bits.RB7
+#endif /* NO_BIT_DEFINES */
 
 // ----- STATUS bits --------------------
 typedef union {
@@ -276,6 +286,7 @@ typedef union {
 } __STATUS_bits_t;
 extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits;
 
+#ifndef NO_BIT_DEFINES
 #define C                    STATUS_bits.C
 #define DC                   STATUS_bits.DC
 #define Z                    STATUS_bits.Z
@@ -284,6 +295,7 @@ extern volatile __STATUS_bits_t __at(STATUS_ADDR) STATUS_bits;
 #define RP0                  STATUS_bits.RP0
 #define RP1                  STATUS_bits.RP1
 #define IRP                  STATUS_bits.IRP
+#endif /* NO_BIT_DEFINES */
 
 // ----- TRISA bits --------------------
 typedef union {
@@ -300,12 +312,14 @@ typedef union {
 } __TRISA_bits_t;
 extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits;
 
+#ifndef NO_BIT_DEFINES
 #define TRISA0               TRISA_bits.TRISA0
 #define TRISA1               TRISA_bits.TRISA1
 #define TRISA2               TRISA_bits.TRISA2
 #define TRISA3               TRISA_bits.TRISA3
 #define TRISA4               TRISA_bits.TRISA4
 #define TRISA5               TRISA_bits.TRISA5
+#endif /* NO_BIT_DEFINES */
 
 // ----- TRISB bits --------------------
 typedef union {
@@ -322,6 +336,7 @@ typedef union {
 } __TRISB_bits_t;
 extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits;
 
+#ifndef NO_BIT_DEFINES
 #define TRISB0               TRISB_bits.TRISB0
 #define TRISB1               TRISB_bits.TRISB1
 #define TRISB2               TRISB_bits.TRISB2
@@ -330,5 +345,6 @@ extern volatile __TRISB_bits_t __at(TRISB_ADDR) TRISB_bits;
 #define TRISB5               TRISB_bits.TRISB5
 #define TRISB6               TRISB_bits.TRISB6
 #define TRISB7               TRISB_bits.TRISB7
+#endif /* NO_BIT_DEFINES */
 
 #endif