* device/include/pic16/pic18fregs.h, src/pic16/devices.inc,

  device/lib/pic16/pics.all: added pic18f1320
* src/pic16/pcode.c (mnem2key): fixed prototype's argument mismatch

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3902 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 46546a02f8f92d4e89c0279b340d649954968b78..8a794c8ae4b2848ac19203de8cc2add295e768fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-04 Raphael Neider <rneider AT web.de>
+
+       * device/include/pic16/pic18fregs.h, src/pic16/devices.inc,
+         device/lib/pic16/pics.all: added pic18f1320
+       * src/pic16/pcode.c (mnem2key): fixed prototype's argument mismatch
+
 2005-09-30 Raphael Neider <rneider AT web.de>
 
        * src/pic16/device.c (Pics16[]): moved device descriptions to devices.inc

diff --git a/device/include/pic16/pic18fregs.h b/device/include/pic16/pic18fregs.h
index 1365741cc31d44ad195b6b4d66a2a4de1f523dd4..4375b459489880d2c6c52fea4593e58cfdfa8f0b 100644 (file)
--- a/device/include/pic16/pic18fregs.h
+++ b/device/include/pic16/pic18fregs.h
@@ -43,6 +43,9 @@
 #elif defined(pic18f1220)
 #  include <pic18f1220.h>
 
+#elif defined(pic18f1320)
+# include <pic18f1220.h>       /* Yes, it's 1220.h */
+
 #elif defined(pic18f2220)
 #  include <pic18f2220.h>
 #elif defined(pic18f2320)

diff --git a/device/lib/pic16/pics.all b/device/lib/pic16/pics.all
index f8971ae5f6429f3273c46a77f17d95a20e9f4d5e..e1df109a048de18795d6b726f58fe4f8d65f4519 100644 (file)
--- a/device/lib/pic16/pics.all
+++ b/device/lib/pic16/pics.all
@@ -9,6 +9,7 @@
 458
 
 1220
+1320
 
 2220
 2320

diff --git a/src/pic16/devices.inc b/src/pic16/devices.inc
index 0532b56d5f944be9bc943b56f1b521c5d0f3c13d..b7eb44b2c9cb6bf32fe7e6a9137a447b60bf623f 100644 (file)
--- a/src/pic16/devices.inc
+++ b/src/pic16/devices.inc
@@ -249,6 +249,28 @@
         { 0, 0 }, { 0, 0 }, { 0, 0 } }
     }
   },
+  {
+    {"p18f1320", "18f1320", "pic18f1320", "f1320"},
+    0,
+    0x100,     /* 256 */
+    0x80,
+    0,
+    { 0xf80, 0xfff },  /* PIC18F1320 range of SFR's */
+    {
+    /* PIC18F1320 configuration words */
+      0x300001,
+      0x30000d,
+      { { 0xcf, 0, 0xff } /* 1 */ , { 0x0f, 0, 0xff } /* 2 */ , { 0x1f, 0, 0xff } /* 3 */ , 
+      { -1, 0, 0xff } /* 4 */  , { 0x80, 0, 0xff } /* 5 */ , { 0x85, 0, 0xff } /* 6 */ , 
+      { -1, 0, 0xff } /* 7 */  , { 0x03, 0, 0xff } /* 8 */ , { 0xc0, 0, 0xff } /* 9 */ , 
+      { 0x03, 0, 0xff } /* a */ , { 0xe0, 0, 0xff } /* b */ , { 0x03, 0, 0xff } /* c */ , 
+      { 0x40, 0, 0xff } /* d */  }
+    },
+    { 0x200000, 0x200007, 
+      { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, 
+        { 0, 0 }, { 0, 0 }, { 0, 0 } }
+    }
+  },
   {
     {"p18f2220", "18f2220", "pic18f2220", "f2220"},
     0,

diff --git a/src/pic16/pcode.c b/src/pic16/pcode.c
index a476a6cd91d732a42f23f84c65eaf29c6da5101a..9d4114f820430a22eac8a9afe345d460e9e8b846 100644 (file)
--- a/src/pic16/pcode.c
+++ b/src/pic16/pcode.c
@@ -161,7 +161,7 @@ extern void pic16_BuildFlowTree(pBlock *pb);
 extern void pic16_pCodeRegOptimizeRegUsage(int level);
 extern int pic16_picIsInitialized(void);
 extern void SAFE_snprintf(char **str, size_t *size, const char *format, ...);
-extern int mnem2key(char const *mnem);
+extern int mnem2key(unsigned char const *mnem);
 
 /****************************************************************/
 /*                      Forward declarations                    */