* src/pic16/device.h: removed unused field PIC16_device.sfrRange,

[fw/sdcc] / src / pic16 / device.h

diff --git a/src/pic16/device.h b/src/pic16/device.h
index 64dffb10a627e94c2803d1dd6ac6e1c2495f04fd..5d7e87c576f89755b42f0f890e7b0f364c1a3bc3 100644 (file)
--- a/src/pic16/device.h
+++ b/src/pic16/device.h
@@ -33,12 +33,6 @@
 #define CONFIGURATION_WORDS    20
 #define IDLOCATION_BYTES       20
 
-typedef struct {
-       int sfrLoAddr;
-       int sfrHiAddr;
-} sfrRangeInfo_t;
-       
-
 typedef struct {
        unsigned int mask;
        int emit;
@@ -66,17 +60,18 @@ typedef struct {
 #define PROCESSOR_NAMES    4
 /* Processor unique attributes */
 typedef struct PIC16_device {
-  char *name[PROCESSOR_NAMES];/* aliases for the processor name */
-
-  int maxRAMaddress;           /* maximum value for a data address */
+  char *name[PROCESSOR_NAMES];  /* aliases for the processor name */
+  /* RAMsize *must* be the first item to copy for 'using' */
   int RAMsize;                 /* size of Data RAM - VR 031120 */
   int acsSplitOfs;             /* access bank split offset */
-  int extMIface;               /* device has external memory interface */
-  sfrRangeInfo_t sfrRange;     /* SFR range */
   configWordsInfo_t cwInfo;    /* configuration words info */
   idBytesInfo_t idInfo;                /* ID Locations info */
+  /* next *must* be the first field NOT being copied via 'using' */
+  struct PIC16_device *next;    /* linked list */
 } PIC16_device;
 
+extern PIC16_device *pic16;
+
 /* Given a pointer to a register, this macro returns the bank that it is in */
 #define REG_ADDR(r)        ((r)->isBitField ? (((r)->address)>>3) : (r)->address)
 
@@ -101,9 +96,10 @@ typedef struct {
   unsigned long opt_flags;
   int gstack;
   unsigned int debgen;
+  int xinst;
 } pic16_options_t;
 
-extern int xinst;
+extern pic16_options_t pic16_options;
 
 #define STACK_MODEL_SMALL      (pic16_options.stack_model == 0)
 #define STACK_MODEL_LARGE      (pic16_options.stack_model == 1)
@@ -127,15 +123,11 @@ typedef struct {
 
 extern stats_t statistics;
 
-extern pic16_options_t pic16_options;
-extern PIC16_device *pic16;
-
 /****************************************/
 void pic16_assignConfigWordValue(int address, unsigned int value);
 void pic16_assignIdByteValue(int address, char value);
 int pic16_isREGinBank(regs *reg, int bank);
 int pic16_REGallBanks(regs *reg);
-void pic16_setMaxRAM(int size);
 int PIC16_IS_CONFIG_ADDRESS(int address);
 int PIC16_IS_IDLOC_ADDRESS(int address);
 int PIC16_IS_HWREG_ADDRESS(int address);
@@ -145,3 +137,4 @@ int checkAddSym(set **set, symbol *reg);
 int checkSym(set *set, symbol *reg);
 
 #endif  /* __DEVICE_H__ */
+