From: tecodev <tecodev@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 16 Sep 2007 18:24:27 +0000 (+0000)
Subject: * device/include/pic16/pic18f2431.h,
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e753cb0a1027ab5bbf6ed026de7f5440b0e91815;p=fw%2Fsdcc

* device/include/pic16/pic18f2431.h,
* device/include/pic16/pic18f25j10.h,
* device/include/pic16/pic18f4431.h,
* device/include/pic16/pic18f45j10.h: adopted common include style
* device/include/pic16/pic18f1320.h,
* device/include/pic16/pic18f2320.h,
* device/include/pic16/pic18f2525.h,
* device/include/pic16/pic18f4320.h,
* device/include/pic16/pic18f4525.h: NEW, just include proper .h file
* device/include/pic16/pic18fregs.h: prepared for automatic include
  file selection by having DEVICE.h for every DEVICE
* device/lib/pic16/libdev/pic18f2320.c,
* device/lib/pic16/libdev/pic18f4320.c: just include proper .c file

* device/lib/pic16/configure.in,
* device/lib/pic16/configure: use rm -rf instead of rmdir
* device/lib/pic16/Makefile.in: use RMDIR to remove build directories
* device/lib/pic16/libc/stdlib/free.c: avoid warning on pointer cast


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

diff --git a/ChangeLog b/ChangeLog
index 40e1d51d..fd662e25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2007-09-16 Raphael Neider <rneider AT web.de>
+
+	* device/include/pic16/pic18f2431.h,
+	* device/include/pic16/pic18f25j10.h,
+	* device/include/pic16/pic18f4431.h,
+	* device/include/pic16/pic18f45j10.h: adopted common include style
+	* device/include/pic16/pic18f1320.h,
+	* device/include/pic16/pic18f2320.h,
+	* device/include/pic16/pic18f2525.h,
+	* device/include/pic16/pic18f4320.h,
+	* device/include/pic16/pic18f4525.h: NEW, just include proper .h file
+	* device/include/pic16/pic18fregs.h: prepared for automatic include
+	  file selection by having DEVICE.h for every DEVICE
+	* device/lib/pic16/libdev/pic18f2320.c,
+	* device/lib/pic16/libdev/pic18f4320.c: just include proper .c file
+
+	* device/lib/pic16/configure.in,
+	* device/lib/pic16/configure: use rm -rf instead of rmdir
+	* device/lib/pic16/Makefile.in: use RMDIR to remove build directories
+	* device/lib/pic16/libc/stdlib/free.c: avoid warning on pointer cast
+
 2007-09-09 Borut Razem <borut.razem AT siol.net>
 
 	* src/SDCCmain.c, src/SDCCutil.c: print newline after printVersionInfo(),
diff --git a/device/include/pic16/pic18f1320.h b/device/include/pic16/pic18f1320.h
new file mode 100644
index 00000000..0444656d
--- /dev/null
+++ b/device/include/pic16/pic18f1320.h
@@ -0,0 +1,6 @@
+/* 
+ * pic18f1320.h - PIC18F1320 Device Library Header
+ */
+
+#include "pic18f1220.h"
+
diff --git a/device/include/pic16/pic18f2320.h b/device/include/pic16/pic18f2320.h
new file mode 100644
index 00000000..cee67e1c
--- /dev/null
+++ b/device/include/pic16/pic18f2320.h
@@ -0,0 +1,6 @@
+/* 
+ * pic18f2320.h - PIC18F2320 Device Library Header
+ */
+
+#include "pic18f2220.h"
+
diff --git a/device/include/pic16/pic18f2431.h b/device/include/pic16/pic18f2431.h
index b1545913..1ca35d5e 100644
--- a/device/include/pic16/pic18f2431.h
+++ b/device/include/pic16/pic18f2431.h
@@ -8,5 +8,5 @@
  * (c) 2007 by Raphael Neider <rneider AT web.de>
  */
 
-#include <pic18f2331.h>
+#include "pic18f2331.h"
 
diff --git a/device/include/pic16/pic18f2525.h b/device/include/pic16/pic18f2525.h
new file mode 100644
index 00000000..e2d38a37
--- /dev/null
+++ b/device/include/pic16/pic18f2525.h
@@ -0,0 +1,6 @@
+/* 
+ * pic18f2525.h - PIC18F2525 Device Library Header
+ */
+
+#include "pic18f2620.h"
+
diff --git a/device/include/pic16/pic18f25j10.h b/device/include/pic16/pic18f25j10.h
index 9b5513ad..c3133807 100644
--- a/device/include/pic16/pic18f25j10.h
+++ b/device/include/pic16/pic18f25j10.h
@@ -8,4 +8,5 @@
  * (c) 2007 by Raphael Neider <rneider AT web.de>
  */
 
-#include <pic18f24j10.h>
+#include "pic18f24j10.h"
+
diff --git a/device/include/pic16/pic18f4320.h b/device/include/pic16/pic18f4320.h
new file mode 100644
index 00000000..bfa75f29
--- /dev/null
+++ b/device/include/pic16/pic18f4320.h
@@ -0,0 +1,6 @@
+/* 
+ * pic18f4320.h - PIC18F4320 Device Library Header
+ */
+
+#include "pic18f4220.h"
+
diff --git a/device/include/pic16/pic18f4431.h b/device/include/pic16/pic18f4431.h
index 78e22c3a..aa0d376c 100644
--- a/device/include/pic16/pic18f4431.h
+++ b/device/include/pic16/pic18f4431.h
@@ -8,5 +8,5 @@
  * (c) 2007 by Raphael Neider <rneider AT web.de>
  */
 
-#include <pic18f4331.h>
+#include "pic18f4331.h"
 
diff --git a/device/include/pic16/pic18f4525.h b/device/include/pic16/pic18f4525.h
new file mode 100644
index 00000000..b856792b
--- /dev/null
+++ b/device/include/pic16/pic18f4525.h
@@ -0,0 +1,6 @@
+/* 
+ * pic18f4525.h - PIC18F4525 Device Library Header
+ */
+
+#include "pic18f4620.h"
+
diff --git a/device/include/pic16/pic18f45j10.h b/device/include/pic16/pic18f45j10.h
index cb779cf2..80c89002 100644
--- a/device/include/pic16/pic18f45j10.h
+++ b/device/include/pic16/pic18f45j10.h
@@ -8,4 +8,5 @@
  * (c) 2007 by Raphael Neider <rneider AT web.de>
  */
 
-#include <pic18f44j10.h>
+#include "pic18f44j10.h"
+
diff --git a/device/include/pic16/pic18fregs.h b/device/include/pic16/pic18fregs.h
index d6e6c1df..43136a04 100644
--- a/device/include/pic16/pic18fregs.h
+++ b/device/include/pic16/pic18fregs.h
@@ -44,7 +44,7 @@
 #  include <pic18f1220.h>
 
 #elif defined(pic18f1320)
-# include <pic18f1220.h>	/* Yes, it's 1220.h */
+#  include <pic18f1320.h>
 
 #elif defined(pic18f2220)
 #  include <pic18f2220.h>
@@ -53,7 +53,7 @@
 #  include <pic18f2221.h>
 
 #elif defined(pic18f2320)
-#  include <pic18f2220.h>	/* Yes, it's 2220.h */
+#  include <pic18f2320.h>
 
 #elif defined(pic18f2321)
 #  include <pic18f2321.h>
@@ -77,7 +77,7 @@
 #  include <pic18f2520.h>
 
 #elif defined(pic18f2525)
-#  include <pic18f2620.h>   /* just a 2620 core with less flash */
+#  include <pic18f2525.h>
 
 #elif defined(pic18f2550)
 #  include <pic18f2550.h>
@@ -95,7 +95,7 @@
 #  include <pic18f4221.h>
 
 #elif defined(pic18f4320)
-#  include <pic18f4220.h>	/* Yes, it's 4220.h */
+#  include <pic18f4320.h>
 
 #elif defined(pic18f4321)
 #  include <pic18f4321.h>
@@ -119,10 +119,10 @@
 #  include <pic18f4520.h>
 
 #elif defined(pic18f4525)
-#  include <pic18f4620.h>   /* just a 4620 core with less flash */
+#  include <pic18f4525.h>
 
 #elif defined(pic18f4550)
-#  include <pic18f4550.h>	/* Might use 2550.h */
+#  include <pic18f4550.h>
 
 #elif defined(pic18f45j10)
 #  include <pic18f45j10.h>
diff --git a/device/lib/pic16/Makefile.in b/device/lib/pic16/Makefile.in
index fe9165e2..6e7c01e7 100644
--- a/device/lib/pic16/Makefile.in
+++ b/device/lib/pic16/Makefile.in
@@ -50,7 +50,7 @@ all : install
 install : recurse
 
 clean : 
-	$(Q)$(RM) $(top_pic16builddir)/bin/ $(top_pic16builddir)/build/
+	$(Q)$(RMDIR) $(top_pic16builddir)/bin/ $(top_pic16builddir)/build/
 
 distclean: clean
 	$(Q)-$(RM) config.cache config.log config.status Makefile Makefile.common pics.build
diff --git a/device/lib/pic16/configure b/device/lib/pic16/configure
index 3b29c349..db698188 100755
--- a/device/lib/pic16/configure
+++ b/device/lib/pic16/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60.
+# Generated by GNU Autoconf 2.61.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -10,7 +10,8 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
 else
   as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -233,7 +237,6 @@ IFS=$as_save_IFS
 	 # Try only shells that exist, to save several forks.
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 _ASEOF
@@ -253,7 +258,6 @@ _ASEOF
   CONFIG_SHELL=$as_shell
 	       as_have_required=yes
 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
 
 :
 (as_func_return () {
@@ -512,19 +518,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -722,10 +737,10 @@ do
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
@@ -741,10 +756,10 @@ do
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
     eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -938,19 +953,19 @@ do
   -with-* | --with-*)
     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
     eval with_$ac_package=no ;;
 
   --x)
@@ -1243,7 +1258,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1257,7 +1272,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
 
@@ -1622,7 +1637,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_GPASM="gpasm"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1660,7 +1675,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_GPLINK="gplink"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1698,7 +1713,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_GPLIB="gplib"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1737,7 +1752,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RM="rm -f"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1775,7 +1790,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CP="cp"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1813,7 +1828,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_MV="mv"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1851,7 +1866,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LS="ls"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1889,7 +1904,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_SED="sed"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -1932,7 +1947,7 @@ do
   for ac_prog in grep ggrep; do
   for ac_exec_ext in '' $ac_executable_extensions; do
     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
     # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -2014,7 +2029,7 @@ do
   for ac_prog in egrep; do
   for ac_exec_ext in '' $ac_executable_extensions; do
     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
     # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -2089,7 +2104,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_MKDIR="mkdir -p"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2111,8 +2126,8 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-# Extract the first word of "rmdir", so it can be a program name with args.
-set dummy rmdir; ac_word=$2
+# Extract the first word of "rm", so it can be a program name with args.
+set dummy rm; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_RMDIR+set}" = set; then
@@ -2127,8 +2142,8 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RMDIR="rmdir"
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_RMDIR="rm -rf"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -2343,7 +2358,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
@@ -2352,10 +2368,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+  case `(set -o) 2>/dev/null` in
+  *posix*) set -o posix ;;
+esac
+
 fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
 
 
 # PATH needs CR
@@ -2579,19 +2598,28 @@ else
   as_mkdir_p=false
 fi
 
-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
-  as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
 else
-  as_executable_p=:
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+        test -d "$1/.";
+      else
+	case $1 in
+        -*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
 fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -2607,7 +2635,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -2634,7 +2662,7 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -2650,7 +2678,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
diff --git a/device/lib/pic16/configure.in b/device/lib/pic16/configure.in
index f4e77bc4..7c2950ba 100644
--- a/device/lib/pic16/configure.in
+++ b/device/lib/pic16/configure.in
@@ -30,7 +30,7 @@ AC_CHECK_PROG(LS,	ls,	ls, :)
 AC_CHECK_PROG(SED,	sed,	sed, :)
 AC_PROG_EGREP
 AC_CHECK_PROG(MKDIR,	mkdir,	[mkdir -p], :)
-AC_CHECK_PROG(RMDIR,	rmdir,	rmdir, :)
+AC_CHECK_PROG(RMDIR,	rm,	[rm -rf], :)
 
 AC_PROG_MAKE_SET
 
diff --git a/device/lib/pic16/libc/stdlib/free.c b/device/lib/pic16/libc/stdlib/free.c
index a11c9ecb..c20c0753 100644
--- a/device/lib/pic16/libc/stdlib/free.c
+++ b/device/lib/pic16/libc/stdlib/free.c
@@ -31,6 +31,6 @@ extern char _MALLOC_SPEC *heap;
 void free(unsigned char _MALLOC_SPEC *buf)
 {
   /* mark block as deallocated */
-  ((_malloc_rec *)((unsigned int)buf - 1))->bits.alloc = 0;
+  ((_MALLOC_SPEC _malloc_rec *)((unsigned int)buf - 1))->bits.alloc = 0;
 }
 
diff --git a/device/lib/pic16/libdev/pic18f2320.c b/device/lib/pic16/libdev/pic18f2320.c
index 60adc136..59ee6892 100644
--- a/device/lib/pic16/libdev/pic18f2320.c
+++ b/device/lib/pic16/libdev/pic18f2320.c
@@ -1,4 +1,3 @@
-
 /*
  * pic18f2320.c - PIC18F2320 Device Library Source
  *
@@ -12,190 +11,5 @@
  *
  */
 
-#include <pic18f2220.h>
-
-__sfr __at (0xf80) PORTA;
-volatile __PORTAbits_t __at (0xf80) PORTAbits;
-
-__sfr __at (0xf81) PORTB;
-volatile __PORTBbits_t __at (0xf81) PORTBbits;
-
-__sfr __at (0xf82) PORTC;
-volatile __PORTCbits_t __at (0xf82) PORTCbits;
-
-__sfr __at (0xf89) LATA;
-volatile __LATAbits_t __at (0xf89) LATAbits;
-
-__sfr __at (0xf8a) LATB;
-volatile __LATBbits_t __at (0xf8a) LATBbits;
-
-__sfr __at (0xf8b) LATC;
-volatile __LATCbits_t __at (0xf8b) LATCbits;
-
-__sfr __at (0xf92) TRISA;
-volatile __TRISAbits_t __at (0xf92) TRISAbits;
-
-__sfr __at (0xf93) TRISB;
-volatile __TRISBbits_t __at (0xf93) TRISBbits;
-
-__sfr __at (0xf94) TRISC;
-volatile __TRISCbits_t __at (0xf94) TRISCbits;
-
-__sfr __at (0xf9b) OSCTUNE;
-volatile __OSCTUNEbits_t __at (0xf9b) OSCTUNEbits;
-
-__sfr __at (0xf9d) PIE1;
-volatile __PIE1bits_t __at (0xf9d) PIE1bits;
-
-__sfr __at (0xf9e) PIR1;
-volatile __PIR1bits_t __at (0xf9e) PIR1bits;
-
-__sfr __at (0xf9f) IPR1;
-volatile __IPR1bits_t __at (0xf9f) IPR1bits;
-
-__sfr __at (0xfa0) PIE2;
-volatile __PIE2bits_t __at (0xfa0) PIE2bits;
-
-__sfr __at (0xfa1) PIR2;
-volatile __PIR2bits_t __at (0xfa1) PIR2bits;
-
-__sfr __at (0xfa2) IPR2;
-volatile __IPR2bits_t __at (0xfa2) IPR2bits;
-
-__sfr __at (0xfa6) EECON1;
-volatile __EECON1bits_t __at (0xfa6) EECON1bits;
-
-__sfr __at (0xfa7) EECON2;
-__sfr __at (0xfa8) EEDATA;
-__sfr __at (0xfa9) EEADR;
-__sfr __at (0xfab) RCSTA;
-volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
-
-__sfr __at (0xfac) TXSTA;
-volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
-
-__sfr __at (0xfad) TXREG;
-__sfr __at (0xfae) RCREG;
-__sfr __at (0xfaf) SPBRG;
-__sfr __at (0xfb1) T3CON;
-volatile __T3CONbits_t __at (0xfb1) T3CONbits;
-
-__sfr __at (0xfb2) TMR3L;
-__sfr __at (0xfb3) TMR3H;
-__sfr __at (0xfb4) CMCON;
-volatile __CMCONbits_t __at (0xfb4) CMCONbits;
-
-__sfr __at (0xfb5) CVRCON;
-volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
-
-__sfr __at (0xfba) CCP2CON;
-volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
-
-__sfr __at (0xfbb) CCPR2L;
-__sfr __at (0xfbc) CCPR2H;
-__sfr __at (0xfbd) CCP1CON;
-volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
-
-__sfr __at (0xfbe) CCPR1L;
-__sfr __at (0xfbf) CCPR1H;
-__sfr __at (0xfc0) ADCON2;
-volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
-
-__sfr __at (0xfc1) ADCON1;
-volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
-
-__sfr __at (0xfc2) ADCON0;
-volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
-
-__sfr __at (0xfc3) ADRESL;
-__sfr __at (0xfc4) ADRESH;
-__sfr __at (0xfc5) SSPCON2;
-volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
-
-__sfr __at (0xfc6) SSPCON1;
-volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
-
-__sfr __at (0xfc7) SSPSTAT;
-volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
-
-__sfr __at (0xfc8) SSPADD;
-__sfr __at (0xfc9) SSPBUF;
-__sfr __at (0xfca) T2CON;
-volatile __T2CONbits_t __at (0xfca) T2CONbits;
-
-__sfr __at (0xfcb) PR2;
-__sfr __at (0xfcc) TMR2;
-__sfr __at (0xfcd) T1CON;
-volatile __T1CONbits_t __at (0xfcd) T1CONbits;
-
-__sfr __at (0xfce) TMR1L;
-__sfr __at (0xfcf) TMR1H;
-__sfr __at (0xfd0) RCON;
-volatile __RCONbits_t __at (0xfd0) RCONbits;
-
-__sfr __at (0xfd1) WDTCON;
-volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
-
-__sfr __at (0xfd2) LVDCON;
-volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
-
-__sfr __at (0xfd3) OSCCON;
-volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
-
-__sfr __at (0xfd5) T0CON;
-volatile __T0CONbits_t __at (0xfd5) T0CONbits;
-
-__sfr __at (0xfd6) TMR0L;
-__sfr __at (0xfd7) TMR0H;
-__sfr __at (0xfd8) STATUS;
-volatile __STATUSbits_t __at (0xfd8) STATUSbits;
-
-__sfr __at (0xfd9) FSR2L;
-__sfr __at (0xfda) FSR2H;
-__sfr __at (0xfdb) PLUSW2;
-__sfr __at (0xfdc) PREINC2;
-__sfr __at (0xfdd) POSTDEC2;
-__sfr __at (0xfde) POSTINC2;
-__sfr __at (0xfdf) INDF2;
-__sfr __at (0xfe0) BSR;
-__sfr __at (0xfe1) FSR1L;
-__sfr __at (0xfe2) FSR1H;
-__sfr __at (0xfe3) PLUSW1;
-__sfr __at (0xfe4) PREINC1;
-__sfr __at (0xfe5) POSTDEC1;
-__sfr __at (0xfe6) POSTINC1;
-__sfr __at (0xfe7) INDF1;
-__sfr __at (0xfe8) WREG;
-__sfr __at (0xfe9) FSR0L;
-__sfr __at (0xfea) FSR0H;
-__sfr __at (0xfeb) PLUSW0;
-__sfr __at (0xfec) PREINC0;
-__sfr __at (0xfed) POSTDEC0;
-__sfr __at (0xfee) POSTINC0;
-__sfr __at (0xfef) INDF0;
-__sfr __at (0xff0) INTCON3;
-volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
-
-__sfr __at (0xff1) INTCON2;
-volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
-
-__sfr __at (0xff2) INTCON;
-volatile __INTCONbits_t __at (0xff2) INTCONbits;
-
-__sfr __at (0xff3) PRODL;
-__sfr __at (0xff4) PRODH;
-__sfr __at (0xff5) TABLAT;
-__sfr __at (0xff6) TBLPTRL;
-__sfr __at (0xff7) TBLPTRH;
-__sfr __at (0xff8) TBLPTRU;
-__sfr __at (0xff9) PCL;
-__sfr __at (0xffa) PCLATH;
-__sfr __at (0xffb) PCLATU;
-__sfr __at (0xffc) STKPTR;
-volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
-
-__sfr __at (0xffd) TOSL;
-__sfr __at (0xffe) TOSH;
-__sfr __at (0xfff) TOSU;
-
+#include "pic18f2220.c"
 
diff --git a/device/lib/pic16/libdev/pic18f4320.c b/device/lib/pic16/libdev/pic18f4320.c
index 02a86074..374b1d25 100644
--- a/device/lib/pic16/libdev/pic18f4320.c
+++ b/device/lib/pic16/libdev/pic18f4320.c
@@ -1,4 +1,3 @@
-
 /*
  * pic18f4320.c - PIC18F4320 Device Library Source
  *
@@ -12,211 +11,5 @@
  *
  */
 
-#include <pic18f4220.h>
-
-__sfr __at (0xf80) PORTA;
-volatile __PORTAbits_t __at (0xf80) PORTAbits;
-
-__sfr __at (0xf81) PORTB;
-volatile __PORTBbits_t __at (0xf81) PORTBbits;
-
-__sfr __at (0xf82) PORTC;
-volatile __PORTCbits_t __at (0xf82) PORTCbits;
-
-__sfr __at (0xf83) PORTD;
-volatile __PORTDbits_t __at (0xf83) PORTDbits;
-
-__sfr __at (0xf84) PORTE;
-volatile __PORTEbits_t __at (0xf84) PORTEbits;
-
-__sfr __at (0xf89) LATA;
-volatile __LATAbits_t __at (0xf89) LATAbits;
-
-__sfr __at (0xf8a) LATB;
-volatile __LATBbits_t __at (0xf8a) LATBbits;
-
-__sfr __at (0xf8b) LATC;
-volatile __LATCbits_t __at (0xf8b) LATCbits;
-
-__sfr __at (0xf8c) LATD;
-volatile __LATDbits_t __at (0xf8c) LATDbits;
-
-__sfr __at (0xf8d) LATE;
-volatile __LATEbits_t __at (0xf8d) LATEbits;
-
-__sfr __at (0xf92) TRISA;
-volatile __TRISAbits_t __at (0xf92) TRISAbits;
-
-__sfr __at (0xf93) TRISB;
-volatile __TRISBbits_t __at (0xf93) TRISBbits;
-
-__sfr __at (0xf94) TRISC;
-volatile __TRISCbits_t __at (0xf94) TRISCbits;
-
-__sfr __at (0xf9b) OSCTUNE;
-volatile __OSCTUNEbits_t __at (0xf9b) OSCTUNEbits;
-
-__sfr __at (0xf9d) PIE1;
-volatile __PIE1bits_t __at (0xf9d) PIE1bits;
-
-__sfr __at (0xf9e) PIR1;
-volatile __PIR1bits_t __at (0xf9e) PIR1bits;
-
-__sfr __at (0xf9f) IPR1;
-volatile __IPR1bits_t __at (0xf9f) IPR1bits;
-
-__sfr __at (0xfa0) PIE2;
-volatile __PIE2bits_t __at (0xfa0) PIE2bits;
-
-__sfr __at (0xfa1) PIR2;
-volatile __PIR2bits_t __at (0xfa1) PIR2bits;
-
-__sfr __at (0xfa2) IPR2;
-volatile __IPR2bits_t __at (0xfa2) IPR2bits;
-
-__sfr __at (0xfa6) EECON1;
-volatile __EECON1bits_t __at (0xfa6) EECON1bits;
-
-__sfr __at (0xfa7) EECON2;
-__sfr __at (0xfa8) EEDATA;
-__sfr __at (0xfa9) EEADR;
-__sfr __at (0xfab) RCSTA;
-volatile __RCSTAbits_t __at (0xfab) RCSTAbits;
-
-__sfr __at (0xfac) TXSTA;
-volatile __TXSTAbits_t __at (0xfac) TXSTAbits;
-
-__sfr __at (0xfad) TXREG;
-__sfr __at (0xfae) RCREG;
-__sfr __at (0xfaf) SPBRG;
-__sfr __at (0xfb1) T3CON;
-volatile __T3CONbits_t __at (0xfb1) T3CONbits;
-
-__sfr __at (0xfb2) TMR3L;
-__sfr __at (0xfb3) TMR3H;
-__sfr __at (0xfb4) CMCON;
-volatile __CMCONbits_t __at (0xfb4) CMCONbits;
-
-__sfr __at (0xfb5) CVRCON;
-volatile __CVRCONbits_t __at (0xfb5) CVRCONbits;
-
-__sfr __at (0xfba) CCP2CON;
-volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
-
-__sfr __at (0xfb7) PWM1CON;
-volatile __PWM1CONbits_t __at (0xfb7) PWM1CONbits;
-
-__sfr __at (0xfb6) ECCPAS;
-volatile __ECCPASbits_t __at (0xfb6) ECCPASbits;
-
-__sfr __at (0xfba) CCP2CON;
-volatile __CCP2CONbits_t __at (0xfba) CCP2CONbits;
-
-__sfr __at (0xfbb) CCPR2L;
-__sfr __at (0xfbc) CCPR2H;
-__sfr __at (0xfbd) CCP1CON;
-volatile __CCP1CONbits_t __at (0xfbd) CCP1CONbits;
-
-__sfr __at (0xfbe) CCPR1L;
-__sfr __at (0xfbf) CCPR1H;
-__sfr __at (0xfc0) ADCON2;
-volatile __ADCON2bits_t __at (0xfc0) ADCON2bits;
-
-__sfr __at (0xfc1) ADCON1;
-volatile __ADCON1bits_t __at (0xfc1) ADCON1bits;
-
-__sfr __at (0xfc2) ADCON0;
-volatile __ADCON0bits_t __at (0xfc2) ADCON0bits;
-
-__sfr __at (0xfc3) ADRESL;
-__sfr __at (0xfc4) ADRESH;
-__sfr __at (0xfc5) SSPCON2;
-volatile __SSPCON2bits_t __at (0xfc5) SSPCON2bits;
-
-__sfr __at (0xfc6) SSPCON1;
-volatile __SSPCON1bits_t __at (0xfc6) SSPCON1bits;
-
-__sfr __at (0xfc7) SSPSTAT;
-volatile __SSPSTATbits_t __at (0xfc7) SSPSTATbits;
-
-__sfr __at (0xfc8) SSPADD;
-__sfr __at (0xfc9) SSPBUF;
-__sfr __at (0xfca) T2CON;
-volatile __T2CONbits_t __at (0xfca) T2CONbits;
-
-__sfr __at (0xfcb) PR2;
-__sfr __at (0xfcc) TMR2;
-__sfr __at (0xfcd) T1CON;
-volatile __T1CONbits_t __at (0xfcd) T1CONbits;
-
-__sfr __at (0xfce) TMR1L;
-__sfr __at (0xfcf) TMR1H;
-__sfr __at (0xfd0) RCON;
-volatile __RCONbits_t __at (0xfd0) RCONbits;
-
-__sfr __at (0xfd1) WDTCON;
-volatile __WDTCONbits_t __at (0xfd1) WDTCONbits;
-
-__sfr __at (0xfd2) LVDCON;
-volatile __LVDCONbits_t __at (0xfd2) LVDCONbits;
-
-__sfr __at (0xfd3) OSCCON;
-volatile __OSCCONbits_t __at (0xfd3) OSCCONbits;
-
-__sfr __at (0xfd5) T0CON;
-volatile __T0CONbits_t __at (0xfd5) T0CONbits;
-
-__sfr __at (0xfd6) TMR0L;
-__sfr __at (0xfd7) TMR0H;
-__sfr __at (0xfd8) STATUS;
-volatile __STATUSbits_t __at (0xfd8) STATUSbits;
-
-__sfr __at (0xfd9) FSR2L;
-__sfr __at (0xfda) FSR2H;
-__sfr __at (0xfdb) PLUSW2;
-__sfr __at (0xfdc) PREINC2;
-__sfr __at (0xfdd) POSTDEC2;
-__sfr __at (0xfde) POSTINC2;
-__sfr __at (0xfdf) INDF2;
-__sfr __at (0xfe0) BSR;
-__sfr __at (0xfe1) FSR1L;
-__sfr __at (0xfe2) FSR1H;
-__sfr __at (0xfe3) PLUSW1;
-__sfr __at (0xfe4) PREINC1;
-__sfr __at (0xfe5) POSTDEC1;
-__sfr __at (0xfe6) POSTINC1;
-__sfr __at (0xfe7) INDF1;
-__sfr __at (0xfe8) WREG;
-__sfr __at (0xfe9) FSR0L;
-__sfr __at (0xfea) FSR0H;
-__sfr __at (0xfeb) PLUSW0;
-__sfr __at (0xfec) PREINC0;
-__sfr __at (0xfed) POSTDEC0;
-__sfr __at (0xfee) POSTINC0;
-__sfr __at (0xfef) INDF0;
-__sfr __at (0xff0) INTCON3;
-volatile __INTCON3bits_t __at (0xff0) INTCON3bits;
-
-__sfr __at (0xff1) INTCON2;
-volatile __INTCON2bits_t __at (0xff1) INTCON2bits;
-
-__sfr __at (0xff2) INTCON;
-volatile __INTCONbits_t __at (0xff2) INTCONbits;
-
-__sfr __at (0xff3) PRODL;
-__sfr __at (0xff4) PRODH;
-__sfr __at (0xff5) TABLAT;
-__sfr __at (0xff6) TBLPTRL;
-__sfr __at (0xff7) TBLPTRH;
-__sfr __at (0xff8) TBLPTRU;
-__sfr __at (0xff9) PCL;
-__sfr __at (0xffa) PCLATH;
-__sfr __at (0xffb) PCLATU;
-__sfr __at (0xffc) STKPTR;
-volatile __STKPTRbits_t __at (0xffc) STKPTRbits;
-
-__sfr __at (0xffd) TOSL;
-__sfr __at (0xffe) TOSH;
-__sfr __at (0xfff) TOSU;
-
+#include "pic18f4220.c"