From 13906aff7874da28c033f501fb593bffc2e25dd3 Mon Sep 17 00:00:00 2001 From: tecodev Date: Tue, 1 May 2007 10:59:39 +0000 Subject: [PATCH] * device/lib/pic/libdev/*.c * device/include/pic/*.h: regenerated all device libs from updated .inc files * support/scripts/inc2h.pl: documented usage, now uses strict to catch more bugs git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4783 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 10 +- device/include/pic/pic12f629.h | 6 +- device/include/pic/pic12f635.h | 6 +- device/include/pic/pic12f675.h | 6 +- device/include/pic/pic12f683.h | 14 +- device/include/pic/pic16c432.h | 6 +- device/include/pic/pic16c433.h | 6 +- device/include/pic/pic16c554.h | 6 +- device/include/pic/pic16c557.h | 6 +- device/include/pic/pic16c558.h | 6 +- device/include/pic/pic16c62.h | 6 +- device/include/pic/pic16c620.h | 6 +- device/include/pic/pic16c620a.h | 6 +- device/include/pic/pic16c621.h | 6 +- device/include/pic/pic16c621a.h | 6 +- device/include/pic/pic16c622.h | 6 +- device/include/pic/pic16c622a.h | 6 +- device/include/pic/pic16c63a.h | 6 +- device/include/pic/pic16c65b.h | 6 +- device/include/pic/pic16c71.h | 6 +- device/include/pic/pic16c710.h | 6 +- device/include/pic/pic16c711.h | 6 +- device/include/pic/pic16c715.h | 6 +- device/include/pic/pic16c717.h | 6 +- device/include/pic/pic16c72.h | 19 ++- device/include/pic/pic16c73b.h | 6 +- device/include/pic/pic16c745.h | 6 +- device/include/pic/pic16c74b.h | 6 +- device/include/pic/pic16c765.h | 6 +- device/include/pic/pic16c770.h | 6 +- device/include/pic/pic16c771.h | 6 +- device/include/pic/pic16c773.h | 6 +- device/include/pic/pic16c774.h | 6 +- device/include/pic/pic16c781.h | 6 +- device/include/pic/pic16c782.h | 6 +- device/include/pic/pic16c925.h | 6 +- device/include/pic/pic16c926.h | 6 +- device/include/pic/pic16f627.h | 6 +- device/include/pic/pic16f627a.h | 6 +- device/include/pic/pic16f628.h | 6 +- device/include/pic/pic16f628a.h | 6 +- device/include/pic/pic16f630.h | 6 +- device/include/pic/pic16f636.h | 6 +- device/include/pic/pic16f639.h | 6 +- device/include/pic/pic16f648a.h | 6 +- device/include/pic/pic16f676.h | 6 +- device/include/pic/pic16f684.h | 6 +- device/include/pic/pic16f685.h | 60 +++++-- device/include/pic/pic16f687.h | 127 +++++++++++--- device/include/pic/pic16f688.h | 6 +- device/include/pic/pic16f689.h | 123 ++++++++++++-- device/include/pic/pic16f690.h | 126 +++++++++++--- device/include/pic/pic16f716.h | 6 +- device/include/pic/pic16f72.h | 6 +- device/include/pic/pic16f73.h | 6 +- device/include/pic/pic16f737.h | 6 +- device/include/pic/pic16f74.h | 6 +- device/include/pic/pic16f76.h | 6 +- device/include/pic/pic16f767.h | 6 +- device/include/pic/pic16f77.h | 6 +- device/include/pic/pic16f777.h | 6 +- device/include/pic/pic16f785.h | 6 +- device/include/pic/pic16f818.h | 6 +- device/include/pic/pic16f819.h | 6 +- device/include/pic/pic16f84.h | 12 +- device/include/pic/pic16f84a.h | 12 +- device/include/pic/pic16f87.h | 6 +- device/include/pic/pic16f870.h | 6 +- device/include/pic/pic16f871.h | 6 +- device/include/pic/pic16f872.h | 19 ++- device/include/pic/pic16f873.h | 6 +- device/include/pic/pic16f873a.h | 22 ++- device/include/pic/pic16f874.h | 6 +- device/include/pic/pic16f874a.h | 22 ++- device/include/pic/pic16f876.h | 6 +- device/include/pic/pic16f876a.h | 22 ++- device/include/pic/pic16f877.h | 6 +- device/include/pic/pic16f877a.h | 10 +- device/include/pic/pic16f88.h | 6 +- device/include/pic/pic16f886.h | 4 +- device/include/pic/pic16f887.h | 4 +- device/include/pic/pic16f913.h | 95 +++++++++-- device/include/pic/pic16f914.h | 108 ++++++++++-- device/include/pic/pic16f916.h | 96 +++++++++-- device/include/pic/pic16f917.h | 108 ++++++++++-- device/lib/pic/libdev/disabled_pic16f886.c | 4 +- device/lib/pic/libdev/disabled_pic16f887.c | 4 +- device/lib/pic/libdev/pic12f629.c | 6 +- device/lib/pic/libdev/pic12f635.c | 6 +- device/lib/pic/libdev/pic12f675.c | 6 +- device/lib/pic/libdev/pic12f683.c | 6 +- device/lib/pic/libdev/pic16c432.c | 6 +- device/lib/pic/libdev/pic16c433.c | 6 +- device/lib/pic/libdev/pic16c554.c | 6 +- device/lib/pic/libdev/pic16c557.c | 6 +- device/lib/pic/libdev/pic16c558.c | 6 +- device/lib/pic/libdev/pic16c62.c | 6 +- device/lib/pic/libdev/pic16c620.c | 6 +- device/lib/pic/libdev/pic16c620a.c | 6 +- device/lib/pic/libdev/pic16c621.c | 6 +- device/lib/pic/libdev/pic16c621a.c | 6 +- device/lib/pic/libdev/pic16c622.c | 6 +- device/lib/pic/libdev/pic16c622a.c | 6 +- device/lib/pic/libdev/pic16c63a.c | 6 +- device/lib/pic/libdev/pic16c65b.c | 6 +- device/lib/pic/libdev/pic16c71.c | 6 +- device/lib/pic/libdev/pic16c710.c | 6 +- device/lib/pic/libdev/pic16c711.c | 6 +- device/lib/pic/libdev/pic16c715.c | 6 +- device/lib/pic/libdev/pic16c717.c | 6 +- device/lib/pic/libdev/pic16c72.c | 6 +- device/lib/pic/libdev/pic16c73b.c | 6 +- device/lib/pic/libdev/pic16c745.c | 6 +- device/lib/pic/libdev/pic16c74b.c | 6 +- device/lib/pic/libdev/pic16c765.c | 6 +- device/lib/pic/libdev/pic16c770.c | 6 +- device/lib/pic/libdev/pic16c771.c | 6 +- device/lib/pic/libdev/pic16c773.c | 6 +- device/lib/pic/libdev/pic16c774.c | 6 +- device/lib/pic/libdev/pic16c781.c | 6 +- device/lib/pic/libdev/pic16c782.c | 6 +- device/lib/pic/libdev/pic16c925.c | 6 +- device/lib/pic/libdev/pic16c926.c | 6 +- device/lib/pic/libdev/pic16f627.c | 6 +- device/lib/pic/libdev/pic16f627a.c | 6 +- device/lib/pic/libdev/pic16f628.c | 6 +- device/lib/pic/libdev/pic16f628a.c | 6 +- device/lib/pic/libdev/pic16f630.c | 6 +- device/lib/pic/libdev/pic16f636.c | 6 +- device/lib/pic/libdev/pic16f639.c | 6 +- device/lib/pic/libdev/pic16f648a.c | 6 +- device/lib/pic/libdev/pic16f676.c | 6 +- device/lib/pic/libdev/pic16f684.c | 6 +- device/lib/pic/libdev/pic16f685.c | 8 +- device/lib/pic/libdev/pic16f687.c | 8 +- device/lib/pic/libdev/pic16f688.c | 6 +- device/lib/pic/libdev/pic16f689.c | 8 +- device/lib/pic/libdev/pic16f690.c | 8 +- device/lib/pic/libdev/pic16f716.c | 6 +- device/lib/pic/libdev/pic16f72.c | 6 +- device/lib/pic/libdev/pic16f73.c | 6 +- device/lib/pic/libdev/pic16f737.c | 6 +- device/lib/pic/libdev/pic16f74.c | 6 +- device/lib/pic/libdev/pic16f76.c | 6 +- device/lib/pic/libdev/pic16f767.c | 6 +- device/lib/pic/libdev/pic16f77.c | 6 +- device/lib/pic/libdev/pic16f777.c | 6 +- device/lib/pic/libdev/pic16f785.c | 6 +- device/lib/pic/libdev/pic16f818.c | 6 +- device/lib/pic/libdev/pic16f819.c | 6 +- device/lib/pic/libdev/pic16f84.c | 6 +- device/lib/pic/libdev/pic16f84a.c | 6 +- device/lib/pic/libdev/pic16f87.c | 6 +- device/lib/pic/libdev/pic16f870.c | 6 +- device/lib/pic/libdev/pic16f871.c | 6 +- device/lib/pic/libdev/pic16f872.c | 6 +- device/lib/pic/libdev/pic16f873.c | 6 +- device/lib/pic/libdev/pic16f873a.c | 6 +- device/lib/pic/libdev/pic16f874.c | 6 +- device/lib/pic/libdev/pic16f874a.c | 6 +- device/lib/pic/libdev/pic16f876.c | 6 +- device/lib/pic/libdev/pic16f876a.c | 6 +- device/lib/pic/libdev/pic16f877.c | 6 +- device/lib/pic/libdev/pic16f877a.c | 6 +- device/lib/pic/libdev/pic16f88.c | 6 +- device/lib/pic/libdev/pic16f913.c | 8 +- device/lib/pic/libdev/pic16f914.c | 8 +- device/lib/pic/libdev/pic16f916.c | 8 +- device/lib/pic/libdev/pic16f917.c | 8 +- support/scripts/inc2h.pl | 186 +++++++++++++++------ 170 files changed, 1430 insertions(+), 675 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6bd0cf01..4e665641 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-05-01 Raphael Neider + + * device/lib/pic/libdev/*.c + * device/include/pic/*.h: regenerated all device libs from updated + .inc files + * support/scripts/inc2h.pl: documented usage, now uses strict to + catch more bugs + 2007-04-30 Borut Razem * doc/sdccman.lyx: @@ -96,7 +104,7 @@ 2007-04-19 Borut Razem - * src/port.h: use const poiters to strings + * src/port.h: use const pointers to strings * src/SDCCargs.h: declared getStringArg() and getIntArg() * src/pic16/main.c: include SDCCargs.h * src/SDCCglobl.h: code_seg and const_seg are not pointers to diff --git a/device/include/pic/pic12f629.h b/device/include/pic/pic12f629.h index cee2c295..4e701117 100644 --- a/device/include/pic/pic12f629.h +++ b/device/include/pic/pic12f629.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -108,9 +108,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 (GPIO_ADDR) GPIO; diff --git a/device/include/pic/pic12f635.h b/device/include/pic/pic12f635.h index ce6be3f5..1c5d7887 100644 --- a/device/include/pic/pic12f635.h +++ b/device/include/pic/pic12f635.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -116,9 +116,9 @@ //----- Register Files------------------------------------------------------ //Bank 0 -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; diff --git a/device/include/pic/pic12f675.h b/device/include/pic/pic12f675.h index e2519dd7..66e338c2 100644 --- a/device/include/pic/pic12f675.h +++ b/device/include/pic/pic12f675.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -112,9 +112,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 (GPIO_ADDR) GPIO; diff --git a/device/include/pic/pic12f683.h b/device/include/pic/pic12f683.h index d80e585d..f8c12be0 100644 --- a/device/include/pic/pic12f683.h +++ b/device/include/pic/pic12f683.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -118,9 +118,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 (GPIO_ADDR) GPIO; @@ -273,13 +273,13 @@ extern __sfr __at (ANSEL_ADDR) ANSEL; #define _HS_OSC 0x3FFA #define _EC_OSC 0x3FFB #define _INTRC_OSC_NOCLKOUT 0x3FFC +#define _INTOSCIO 0x3FFC #define _INTRC_OSC_CLKOUT 0x3FFD -#define _INTOSCIO 0x3FFD -#define _INTOSC 0x3FFC +#define _INTOSC 0x3FFD #define _EXTRC_OSC_NOCLKOUT 0x3FFE +#define _EXTRCIO 0x3FFE #define _EXTRC_OSC_CLKOUT 0x3FFF -#define _EXTRCIO 0x3FFF -#define _EXTRC 0x3FFE +#define _EXTRC 0x3FFF // LIST diff --git a/device/include/pic/pic16c432.h b/device/include/pic/pic16c432.h index e95c58e9..a4ba728d 100644 --- a/device/include/pic/pic16c432.h +++ b/device/include/pic/pic16c432.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -99,9 +99,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; diff --git a/device/include/pic/pic16c433.h b/device/include/pic/pic16c433.h index 94c6bc33..3e3741f6 100644 --- a/device/include/pic/pic16c433.h +++ b/device/include/pic/pic16c433.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -97,9 +97,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 (GPIO_ADDR) GPIO; diff --git a/device/include/pic/pic16c554.h b/device/include/pic/pic16c554.h index 011b5e2d..22d8f762 100644 --- a/device/include/pic/pic16c554.h +++ b/device/include/pic/pic16c554.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // 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; diff --git a/device/include/pic/pic16c557.h b/device/include/pic/pic16c557.h index 0ed1e2f8..f24028eb 100644 --- a/device/include/pic/pic16c557.h +++ b/device/include/pic/pic16c557.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -95,9 +95,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; diff --git a/device/include/pic/pic16c558.h b/device/include/pic/pic16c558.h index 70d05c3b..9353f969 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 V4585 // // 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; diff --git a/device/include/pic/pic16c62.h b/device/include/pic/pic16c62.h index 34f5873d..15aa88dc 100644 --- a/device/include/pic/pic16c62.h +++ b/device/include/pic/pic16c62.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -110,9 +110,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; diff --git a/device/include/pic/pic16c620.h b/device/include/pic/pic16c620.h index 31db1685..f20a564a 100644 --- a/device/include/pic/pic16c620.h +++ b/device/include/pic/pic16c620.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -98,9 +98,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; diff --git a/device/include/pic/pic16c620a.h b/device/include/pic/pic16c620a.h index 9b1bef56..63d99d52 100644 --- a/device/include/pic/pic16c620a.h +++ b/device/include/pic/pic16c620a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -103,9 +103,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; diff --git a/device/include/pic/pic16c621.h b/device/include/pic/pic16c621.h index 07fb4a6c..97cddc64 100644 --- a/device/include/pic/pic16c621.h +++ b/device/include/pic/pic16c621.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -98,9 +98,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; diff --git a/device/include/pic/pic16c621a.h b/device/include/pic/pic16c621a.h index c2064b78..21c6d73d 100644 --- a/device/include/pic/pic16c621a.h +++ b/device/include/pic/pic16c621a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -98,9 +98,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; diff --git a/device/include/pic/pic16c622.h b/device/include/pic/pic16c622.h index e03a4b3b..7aff8d6a 100644 --- a/device/include/pic/pic16c622.h +++ b/device/include/pic/pic16c622.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -98,9 +98,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; diff --git a/device/include/pic/pic16c622a.h b/device/include/pic/pic16c622a.h index 5a4a2909..284af6ed 100644 --- a/device/include/pic/pic16c622a.h +++ b/device/include/pic/pic16c622a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -98,9 +98,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; diff --git a/device/include/pic/pic16c63a.h b/device/include/pic/pic16c63a.h index d611fcd2..7b2f083f 100644 --- a/device/include/pic/pic16c63a.h +++ b/device/include/pic/pic16c63a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -120,9 +120,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; diff --git a/device/include/pic/pic16c65b.h b/device/include/pic/pic16c65b.h index efdca384..72467645 100644 --- a/device/include/pic/pic16c65b.h +++ b/device/include/pic/pic16c65b.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -124,9 +124,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; diff --git a/device/include/pic/pic16c71.h b/device/include/pic/pic16c71.h index 0163f0c9..fe3c80be 100644 --- a/device/include/pic/pic16c71.h +++ b/device/include/pic/pic16c71.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -95,9 +95,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; diff --git a/device/include/pic/pic16c710.h b/device/include/pic/pic16c710.h index 129e4c24..20cfbdbc 100644 --- a/device/include/pic/pic16c710.h +++ b/device/include/pic/pic16c710.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -96,9 +96,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; diff --git a/device/include/pic/pic16c711.h b/device/include/pic/pic16c711.h index 42064aff..2147a43f 100644 --- a/device/include/pic/pic16c711.h +++ b/device/include/pic/pic16c711.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -96,9 +96,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; diff --git a/device/include/pic/pic16c715.h b/device/include/pic/pic16c715.h index d13c37dd..2af976fd 100644 --- a/device/include/pic/pic16c715.h +++ b/device/include/pic/pic16c715.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -99,9 +99,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; diff --git a/device/include/pic/pic16c717.h b/device/include/pic/pic16c717.h index 58b32c07..f6d5302f 100644 --- a/device/include/pic/pic16c717.h +++ b/device/include/pic/pic16c717.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -126,9 +126,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; diff --git a/device/include/pic/pic16c72.h b/device/include/pic/pic16c72.h index 36fe8d95..3ea01b29 100644 --- a/device/include/pic/pic16c72.h +++ b/device/include/pic/pic16c72.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -114,9 +114,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; @@ -633,18 +633,29 @@ typedef union { struct { unsigned char TMR1ON:1; unsigned char TMR1CS:1; - unsigned char T1INSYNC:1; + unsigned char NOT_T1SYNC:1; unsigned char T1OSCEN:1; unsigned char T1CKPS0:1; unsigned char T1CKPS1:1; unsigned char :1; unsigned char :1; }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char T1INSYNC:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; } __T1CON_bits_t; extern volatile __T1CON_bits_t __at(T1CON_ADDR) T1CON_bits; #define TMR1ON T1CON_bits.TMR1ON #define TMR1CS T1CON_bits.TMR1CS +#define NOT_T1SYNC T1CON_bits.NOT_T1SYNC #define T1INSYNC T1CON_bits.T1INSYNC #define T1OSCEN T1CON_bits.T1OSCEN #define T1CKPS0 T1CON_bits.T1CKPS0 diff --git a/device/include/pic/pic16c73b.h b/device/include/pic/pic16c73b.h index d29df737..6fa6177c 100644 --- a/device/include/pic/pic16c73b.h +++ b/device/include/pic/pic16c73b.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -123,9 +123,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; diff --git a/device/include/pic/pic16c745.h b/device/include/pic/pic16c745.h index 94ce8fef..871e37d5 100644 --- a/device/include/pic/pic16c745.h +++ b/device/include/pic/pic16c745.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -148,9 +148,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; diff --git a/device/include/pic/pic16c74b.h b/device/include/pic/pic16c74b.h index 90b99c96..1ee20e04 100644 --- a/device/include/pic/pic16c74b.h +++ b/device/include/pic/pic16c74b.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -127,9 +127,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; diff --git a/device/include/pic/pic16c765.h b/device/include/pic/pic16c765.h index a8eb4100..ffb794da 100644 --- a/device/include/pic/pic16c765.h +++ b/device/include/pic/pic16c765.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -152,9 +152,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; diff --git a/device/include/pic/pic16c770.h b/device/include/pic/pic16c770.h index 3066a3c3..32f94c5b 100644 --- a/device/include/pic/pic16c770.h +++ b/device/include/pic/pic16c770.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -126,9 +126,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; diff --git a/device/include/pic/pic16c771.h b/device/include/pic/pic16c771.h index e9c5449b..f3e22e9f 100644 --- a/device/include/pic/pic16c771.h +++ b/device/include/pic/pic16c771.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -126,9 +126,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; diff --git a/device/include/pic/pic16c773.h b/device/include/pic/pic16c773.h index 4037658e..96b701c9 100644 --- a/device/include/pic/pic16c773.h +++ b/device/include/pic/pic16c773.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -128,9 +128,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; diff --git a/device/include/pic/pic16c774.h b/device/include/pic/pic16c774.h index 77f2efc5..e9a19c10 100644 --- a/device/include/pic/pic16c774.h +++ b/device/include/pic/pic16c774.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -132,9 +132,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; diff --git a/device/include/pic/pic16c781.h b/device/include/pic/pic16c781.h index 2e9c3d88..a3ad8ce6 100644 --- a/device/include/pic/pic16c781.h +++ b/device/include/pic/pic16c781.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -120,9 +120,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; diff --git a/device/include/pic/pic16c782.h b/device/include/pic/pic16c782.h index 9f08b09a..5b994113 100644 --- a/device/include/pic/pic16c782.h +++ b/device/include/pic/pic16c782.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -120,9 +120,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; diff --git a/device/include/pic/pic16c925.h b/device/include/pic/pic16c925.h index 2737c46e..ff0cd12c 100644 --- a/device/include/pic/pic16c925.h +++ b/device/include/pic/pic16c925.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -154,9 +154,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; diff --git a/device/include/pic/pic16c926.h b/device/include/pic/pic16c926.h index 89d675f0..54c21eba 100644 --- a/device/include/pic/pic16c926.h +++ b/device/include/pic/pic16c926.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -154,9 +154,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; diff --git a/device/include/pic/pic16f627.h b/device/include/pic/pic16f627.h index f4300d83..ac78f4b3 100644 --- a/device/include/pic/pic16f627.h +++ b/device/include/pic/pic16f627.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -115,9 +115,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; diff --git a/device/include/pic/pic16f627a.h b/device/include/pic/pic16f627a.h index 180c6e46..4b3d21f6 100644 --- a/device/include/pic/pic16f627a.h +++ b/device/include/pic/pic16f627a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -115,9 +115,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; diff --git a/device/include/pic/pic16f628.h b/device/include/pic/pic16f628.h index 7e4152cd..7fc4216b 100644 --- a/device/include/pic/pic16f628.h +++ b/device/include/pic/pic16f628.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -115,9 +115,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; diff --git a/device/include/pic/pic16f628a.h b/device/include/pic/pic16f628a.h index 7e087d05..ed44658b 100644 --- a/device/include/pic/pic16f628a.h +++ b/device/include/pic/pic16f628a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -115,9 +115,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; diff --git a/device/include/pic/pic16f630.h b/device/include/pic/pic16f630.h index fdc5acab..00080127 100644 --- a/device/include/pic/pic16f630.h +++ b/device/include/pic/pic16f630.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -107,9 +107,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; diff --git a/device/include/pic/pic16f636.h b/device/include/pic/pic16f636.h index e23fced8..2b6c26dc 100644 --- a/device/include/pic/pic16f636.h +++ b/device/include/pic/pic16f636.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -116,9 +116,9 @@ //----- Register Files------------------------------------------------------ //Bank 0 -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; diff --git a/device/include/pic/pic16f639.h b/device/include/pic/pic16f639.h index 817d1ecb..031980f0 100644 --- a/device/include/pic/pic16f639.h +++ b/device/include/pic/pic16f639.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -114,9 +114,9 @@ //----- Register Files------------------------------------------------------ //Bank 0 -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; diff --git a/device/include/pic/pic16f648a.h b/device/include/pic/pic16f648a.h index b990035b..f63df500 100644 --- a/device/include/pic/pic16f648a.h +++ b/device/include/pic/pic16f648a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -114,9 +114,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; diff --git a/device/include/pic/pic16f676.h b/device/include/pic/pic16f676.h index 871e82c5..37bf15f9 100644 --- a/device/include/pic/pic16f676.h +++ b/device/include/pic/pic16f676.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -112,9 +112,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; diff --git a/device/include/pic/pic16f684.h b/device/include/pic/pic16f684.h index 37311051..b02ad0ed 100644 --- a/device/include/pic/pic16f684.h +++ b/device/include/pic/pic16f684.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -125,9 +125,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; diff --git a/device/include/pic/pic16f685.h b/device/include/pic/pic16f685.h index 44626182..ca715c29 100644 --- a/device/include/pic/pic16f685.h +++ b/device/include/pic/pic16f685.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -66,6 +66,7 @@ #define WDTCON_ADDR 0x0097 #define ADRESL_ADDR 0x009E #define ADCON1_ADDR 0x009F +#define EEDAT_ADDR 0x010C #define EEDATA_ADDR 0x010C #define EEADR_ADDR 0x010D #define EEDATH_ADDR 0x010E @@ -112,6 +113,7 @@ // //========================================================================== //1.00 10/12/04 Original +//2.00 04/21/05 Modified file to match released datasheet //========================================================================== // // Verify Processor @@ -133,9 +135,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; @@ -191,7 +193,7 @@ extern __sfr __at (ADRESL_ADDR) ADRESL; extern __sfr __at (ADCON1_ADDR) ADCON1; - +extern __sfr __at (EEDAT_ADDR) EEDAT; extern __sfr __at (EEDATA_ADDR) EEDATA; extern __sfr __at (EEADR_ADDR) EEADR; extern __sfr __at (EEDATH_ADDR) EEDATH; @@ -319,6 +321,9 @@ extern __sfr __at (SRCON_ADDR) SRCON; //----- CM2CON1 Bits ------------------------------------------------------- +//----- ANSELH -------------------------------------------------------------- + + //----- ANSEL -------------------------------------------------------------- @@ -354,10 +359,10 @@ extern __sfr __at (SRCON_ADDR) SRCON; #define _FCMEN_OFF 0x37FF #define _IESO_ON 0x3FFF #define _IESO_OFF 0x3BFF -#define _BOD_ON 0x3FFF -#define _BOD_NSLEEP 0x3EFF -#define _BOD_SBODEN 0x3DFF -#define _BOD_OFF 0x3CFF +#define _BOR_ON 0x3FFF +#define _BOR_NSLEEP 0x3EFF +#define _BOR_SBODEN 0x3DFF +#define _BOR_OFF 0x3CFF #define _CPD_ON 0x3F7F #define _CPD_OFF 0x3FFF #define _CP_ON 0x3FBF @@ -472,6 +477,26 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define ANS6 ANSEL_bits.ANS6 #define ANS7 ANSEL_bits.ANS7 +// ----- ANSELH bits -------------------- +typedef union { + struct { + unsigned char ANS8:1; + unsigned char ANS9:1; + unsigned char ANS10:1; + unsigned char ANS11:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __ANSELH_bits_t; +extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; + +#define ANS8 ANSELH_bits.ANS8 +#define ANS9 ANSELH_bits.ANS9 +#define ANS10 ANSELH_bits.ANS10 +#define ANS11 ANSELH_bits.ANS11 + // ----- CCP1CON bits -------------------- typedef union { struct { @@ -770,17 +795,28 @@ typedef union { unsigned char NOT_POR:1; unsigned char :1; unsigned char :1; - unsigned char SBODEN:1; + unsigned char SBOREN:1; unsigned char ULPWUE:1; unsigned char :1; unsigned char :1; }; + struct { + unsigned char NOT_BOR:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; #define NOT_BOD PCON_bits.NOT_BOD +#define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR -#define SBODEN PCON_bits.SBODEN +#define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE // ----- PIE1 bits -------------------- @@ -788,7 +824,7 @@ typedef union { struct { unsigned char T1IE:1; unsigned char T2IE:1; - unsigned char CCPIE:1; + unsigned char CCP1IE:1; unsigned char :1; unsigned char :1; unsigned char :1; @@ -812,7 +848,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TMR1IE PIE1_bits.TMR1IE #define T2IE PIE1_bits.T2IE #define TMR2IE PIE1_bits.TMR2IE -#define CCPIE PIE1_bits.CCPIE +#define CCP1IE PIE1_bits.CCP1IE #define ADIE PIE1_bits.ADIE // ----- PIE2 bits -------------------- diff --git a/device/include/pic/pic16f687.h b/device/include/pic/pic16f687.h index 603370b4..677b0dea 100644 --- a/device/include/pic/pic16f687.h +++ b/device/include/pic/pic16f687.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -71,6 +71,7 @@ #define BAUDCTL_ADDR 0x009B #define ADRESL_ADDR 0x009E #define ADCON1_ADDR 0x009F +#define EEDAT_ADDR 0x010C #define EEDATA_ADDR 0x010C #define EEADR_ADDR 0x010D #define EEDATH_ADDR 0x010E @@ -116,6 +117,7 @@ // //========================================================================== //1.00 10/12/04 Original +//2.00 04/21/05 Modified to match released datasheet //========================================================================== // // Verify Processor @@ -137,9 +139,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; @@ -198,7 +200,7 @@ extern __sfr __at (ADRESL_ADDR) ADRESL; extern __sfr __at (ADCON1_ADDR) ADCON1; - +extern __sfr __at (EEDAT_ADDR) EEDAT; extern __sfr __at (EEDATA_ADDR) EEDATA; extern __sfr __at (EEADR_ADDR) EEADR; extern __sfr __at (EEDATH_ADDR) EEDATH; @@ -243,7 +245,7 @@ extern __sfr __at (SRCON_ADDR) SRCON; -//----- SSPCON0 Bits ------------------------------------------------------- +//----- SSPCON Bits -------------------------------------------------------- @@ -338,6 +340,9 @@ extern __sfr __at (SRCON_ADDR) SRCON; //----- CM2CON1 Bits ------------------------------------------------------- +//----- ANSELH ------------------------------------------------------------- + + //----- ANSEL -------------------------------------------------------------- @@ -357,7 +362,7 @@ extern __sfr __at (SRCON_ADDR) SRCON; // __MAXRAM H'1FF' // __BADRAM H'08'-H'09', H'11'-H'12', H'15'-H'17', H'1B'- H'1D' // __BADRAM H'88'-H'89', H'91'-H'92', H'9C'-H'9D', H'C0'-H'EF' -// __BADRAM H'108'-H'109', H'10F'-H'114', H'117', H'11C'-H'11D', H'120'-H'16F' +// __BADRAM H'108'-H'109', H'10E'-H'114', H'117', H'11C'-H'11D', H'120'-H'16F' // __BADRAM H'188'-H'189', H'18E'-H'19D', H'19F'-H'1EF' //========================================================================== @@ -370,10 +375,10 @@ extern __sfr __at (SRCON_ADDR) SRCON; #define _FCMEN_OFF 0x37FF #define _IESO_ON 0x3FFF #define _IESO_OFF 0x3BFF -#define _BOD_ON 0x3FFF -#define _BOD_NSLEEP 0x3EFF -#define _BOD_SBODEN 0x3DFF -#define _BOD_OFF 0x3CFF +#define _BOR_ON 0x3FFF +#define _BOR_NSLEEP 0x3EFF +#define _BOR_SBODEN 0x3DFF +#define _BOR_OFF 0x3CFF #define _CPD_ON 0x3F7F #define _CPD_OFF 0x3FFF #define _CP_ON 0x3FBF @@ -488,6 +493,26 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define ANS6 ANSEL_bits.ANS6 #define ANS7 ANSEL_bits.ANS7 +// ----- ANSELH bits -------------------- +typedef union { + struct { + unsigned char ANS8:1; + unsigned char ANS9:1; + unsigned char ANS10:1; + unsigned char ANS11:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __ANSELH_bits_t; +extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; + +#define ANS8 ANSELH_bits.ANS8 +#define ANS9 ANSELH_bits.ANS9 +#define ANS10 ANSELH_bits.ANS10 +#define ANS11 ANSELH_bits.ANS11 + // ----- BAUDCTL bits -------------------- typedef union { struct { @@ -495,7 +520,7 @@ typedef union { unsigned char WUE:1; unsigned char :1; unsigned char BRG16:1; - unsigned char CKTXP:1; + unsigned char SCKP:1; unsigned char :1; unsigned char RCIDL:1; unsigned char ABDOVF:1; @@ -506,7 +531,7 @@ extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 -#define CKTXP BAUDCTL_bits.CKTXP +#define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF @@ -756,11 +781,11 @@ extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; // ----- PCON bits -------------------- typedef union { struct { - unsigned char NOT_BOD:1; + unsigned char NOT_BOR:1; unsigned char NOT_POR:1; unsigned char :1; unsigned char :1; - unsigned char SBODEN:1; + unsigned char SBOREN:1; unsigned char ULPWUE:1; unsigned char :1; unsigned char :1; @@ -768,9 +793,9 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; -#define NOT_BOD PCON_bits.NOT_BOD +#define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR -#define SBODEN PCON_bits.SBODEN +#define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE // ----- PIE1 bits -------------------- @@ -1070,22 +1095,84 @@ typedef union { struct { unsigned char BF:1; unsigned char UA:1; - unsigned char R_W_NOT:1; + unsigned char R:1; unsigned char S:1; unsigned char P:1; - unsigned char D_A_NOT:1; + unsigned char D:1; unsigned char CKE:1; unsigned char SMP:1; }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char I2C_READ:1; + unsigned char I2C_START:1; + unsigned char I2C_STOP:1; + unsigned char I2C_DATA:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char NOT_W:1; + unsigned char :1; + unsigned char :1; + unsigned char NOT_A:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char NOT_WRITE:1; + unsigned char :1; + unsigned char :1; + unsigned char NOT_ADDRESS:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char R_W:1; + unsigned char :1; + unsigned char :1; + unsigned char D_A:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char READ_WRITE:1; + unsigned char :1; + unsigned char :1; + unsigned char DATA_ADDRESS:1; + unsigned char :1; + unsigned char :1; + }; } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA -#define R_W_NOT SSPSTAT_bits.R_W_NOT +#define R SSPSTAT_bits.R +#define I2C_READ SSPSTAT_bits.I2C_READ +#define NOT_W SSPSTAT_bits.NOT_W +#define NOT_WRITE SSPSTAT_bits.NOT_WRITE +#define R_W SSPSTAT_bits.R_W +#define READ_WRITE SSPSTAT_bits.READ_WRITE #define S SSPSTAT_bits.S +#define I2C_START SSPSTAT_bits.I2C_START #define P SSPSTAT_bits.P -#define D_A_NOT SSPSTAT_bits.D_A_NOT +#define I2C_STOP SSPSTAT_bits.I2C_STOP +#define D SSPSTAT_bits.D +#define I2C_DATA SSPSTAT_bits.I2C_DATA +#define NOT_A SSPSTAT_bits.NOT_A +#define NOT_ADDRESS SSPSTAT_bits.NOT_ADDRESS +#define D_A SSPSTAT_bits.D_A +#define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP diff --git a/device/include/pic/pic16f688.h b/device/include/pic/pic16f688.h index 811cc771..6d35ff5e 100644 --- a/device/include/pic/pic16f688.h +++ b/device/include/pic/pic16f688.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -125,9 +125,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; diff --git a/device/include/pic/pic16f689.h b/device/include/pic/pic16f689.h index 82cefc36..3d115aa4 100644 --- a/device/include/pic/pic16f689.h +++ b/device/include/pic/pic16f689.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -71,6 +71,7 @@ #define BAUDCTL_ADDR 0x009B #define ADRESL_ADDR 0x009E #define ADCON1_ADDR 0x009F +#define EEDAT_ADDR 0x010C #define EEDATA_ADDR 0x010C #define EEADR_ADDR 0x010D #define EEDATH_ADDR 0x010E @@ -116,6 +117,7 @@ // //========================================================================== //1.00 10/12/04 Original +//2.00 04/21/05 Modified names to match released datasheet //========================================================================== // // Verify Processor @@ -137,9 +139,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; @@ -198,7 +200,7 @@ extern __sfr __at (ADRESL_ADDR) ADRESL; extern __sfr __at (ADCON1_ADDR) ADCON1; - +extern __sfr __at (EEDAT_ADDR) EEDAT; extern __sfr __at (EEDATA_ADDR) EEDATA; extern __sfr __at (EEADR_ADDR) EEADR; extern __sfr __at (EEDATH_ADDR) EEDATH; @@ -338,6 +340,9 @@ extern __sfr __at (SRCON_ADDR) SRCON; //----- CM2CON1 Bits ------------------------------------------------------- +//----- ANSELH ------------------------------------------------------------- + + //----- ANSEL -------------------------------------------------------------- @@ -370,10 +375,10 @@ extern __sfr __at (SRCON_ADDR) SRCON; #define _FCMEN_OFF 0x37FF #define _IESO_ON 0x3FFF #define _IESO_OFF 0x3BFF -#define _BOD_ON 0x3FFF -#define _BOD_NSLEEP 0x3EFF -#define _BOD_SBODEN 0x3DFF -#define _BOD_OFF 0x3CFF +#define _BOR_ON 0x3FFF +#define _BOR_NSLEEP 0x3EFF +#define _BOR_SBODEN 0x3DFF +#define _BOR_OFF 0x3CFF #define _CPD_ON 0x3F7F #define _CPD_OFF 0x3FFF #define _CP_ON 0x3FBF @@ -488,6 +493,26 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define ANS6 ANSEL_bits.ANS6 #define ANS7 ANSEL_bits.ANS7 +// ----- ANSELH bits -------------------- +typedef union { + struct { + unsigned char ANS8:1; + unsigned char ANS9:1; + unsigned char ANS10:1; + unsigned char ANS11:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __ANSELH_bits_t; +extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; + +#define ANS8 ANSELH_bits.ANS8 +#define ANS9 ANSELH_bits.ANS9 +#define ANS10 ANSELH_bits.ANS10 +#define ANS11 ANSELH_bits.ANS11 + // ----- BAUDCTL bits -------------------- typedef union { struct { @@ -495,7 +520,7 @@ typedef union { unsigned char WUE:1; unsigned char :1; unsigned char BRG16:1; - unsigned char CKTXP:1; + unsigned char SCKP:1; unsigned char :1; unsigned char RCIDL:1; unsigned char ABDOVF:1; @@ -506,7 +531,7 @@ extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 -#define CKTXP BAUDCTL_bits.CKTXP +#define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF @@ -756,11 +781,11 @@ extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; // ----- PCON bits -------------------- typedef union { struct { - unsigned char NOT_BOD:1; + unsigned char NOT_BOR:1; unsigned char NOT_POR:1; unsigned char :1; unsigned char :1; - unsigned char SBODEN:1; + unsigned char SBOREN:1; unsigned char ULPWUE:1; unsigned char :1; unsigned char :1; @@ -768,9 +793,9 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; -#define NOT_BOD PCON_bits.NOT_BOD +#define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR -#define SBODEN PCON_bits.SBODEN +#define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE // ----- PIE1 bits -------------------- @@ -1070,22 +1095,84 @@ typedef union { struct { unsigned char BF:1; unsigned char UA:1; - unsigned char R_W_NOT:1; + unsigned char R:1; unsigned char S:1; unsigned char P:1; - unsigned char D_A_NOT:1; + unsigned char D:1; unsigned char CKE:1; unsigned char SMP:1; }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char I2C_READ:1; + unsigned char I2C_START:1; + unsigned char I2C_STOP:1; + unsigned char I2C_DATA:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char NOT_W:1; + unsigned char :1; + unsigned char :1; + unsigned char NOT_A:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char NOT_WRITE:1; + unsigned char :1; + unsigned char :1; + unsigned char NOT_ADDRESS:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char R_W:1; + unsigned char :1; + unsigned char :1; + unsigned char D_A:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char READ_WRITE:1; + unsigned char :1; + unsigned char :1; + unsigned char DATA_ADDRESS:1; + unsigned char :1; + unsigned char :1; + }; } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA -#define R_W_NOT SSPSTAT_bits.R_W_NOT +#define R SSPSTAT_bits.R +#define I2C_READ SSPSTAT_bits.I2C_READ +#define NOT_W SSPSTAT_bits.NOT_W +#define NOT_WRITE SSPSTAT_bits.NOT_WRITE +#define R_W SSPSTAT_bits.R_W +#define READ_WRITE SSPSTAT_bits.READ_WRITE #define S SSPSTAT_bits.S +#define I2C_START SSPSTAT_bits.I2C_START #define P SSPSTAT_bits.P -#define D_A_NOT SSPSTAT_bits.D_A_NOT +#define I2C_STOP SSPSTAT_bits.I2C_STOP +#define D SSPSTAT_bits.D +#define I2C_DATA SSPSTAT_bits.I2C_DATA +#define NOT_A SSPSTAT_bits.NOT_A +#define NOT_ADDRESS SSPSTAT_bits.NOT_ADDRESS +#define D_A SSPSTAT_bits.D_A +#define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP diff --git a/device/include/pic/pic16f690.h b/device/include/pic/pic16f690.h index 08826eef..40bb0441 100644 --- a/device/include/pic/pic16f690.h +++ b/device/include/pic/pic16f690.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -79,6 +79,7 @@ #define BAUDCTL_ADDR 0x009B #define ADRESL_ADDR 0x009E #define ADCON1_ADDR 0x009F +#define EEDAT_ADDR 0x010C #define EEDATA_ADDR 0x010C #define EEADR_ADDR 0x010D #define EEDATH_ADDR 0x010E @@ -146,9 +147,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; @@ -211,7 +212,7 @@ extern __sfr __at (ADRESL_ADDR) ADRESL; extern __sfr __at (ADCON1_ADDR) ADCON1; - +extern __sfr __at (EEDAT_ADDR) EEDAT; extern __sfr __at (EEDATA_ADDR) EEDATA; extern __sfr __at (EEADR_ADDR) EEADR; extern __sfr __at (EEDATH_ADDR) EEDATH; @@ -357,6 +358,9 @@ extern __sfr __at (SRCON_ADDR) SRCON; //----- CM2CON1 Bits ------------------------------------------------------- +//----- ANSELH ------------------------------------------------------------- + + //----- ANSEL -------------------------------------------------------------- @@ -392,10 +396,10 @@ extern __sfr __at (SRCON_ADDR) SRCON; #define _FCMEN_OFF 0x37FF #define _IESO_ON 0x3FFF #define _IESO_OFF 0x3BFF -#define _BOD_ON 0x3FFF -#define _BOD_NSLEEP 0x3EFF -#define _BOD_SBODEN 0x3DFF -#define _BOD_OFF 0x3CFF +#define _BOR_ON 0x3FFF +#define _BOR_NSLEEP 0x3EFF +#define _BOR_SBODEN 0x3DFF +#define _BOR_OFF 0x3CFF #define _CPD_ON 0x3F7F #define _CPD_OFF 0x3FFF #define _CP_ON 0x3FBF @@ -510,6 +514,26 @@ extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; #define ANS6 ANSEL_bits.ANS6 #define ANS7 ANSEL_bits.ANS7 +// ----- ANSELH bits -------------------- +typedef union { + struct { + unsigned char ANS8:1; + unsigned char ANS9:1; + unsigned char ANS10:1; + unsigned char ANS11:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __ANSELH_bits_t; +extern volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; + +#define ANS8 ANSELH_bits.ANS8 +#define ANS9 ANSELH_bits.ANS9 +#define ANS10 ANSELH_bits.ANS10 +#define ANS11 ANSELH_bits.ANS11 + // ----- BAUDCTL bits -------------------- typedef union { struct { @@ -517,7 +541,7 @@ typedef union { unsigned char WUE:1; unsigned char :1; unsigned char BRG16:1; - unsigned char CKTXP:1; + unsigned char SCKP:1; unsigned char :1; unsigned char RCIDL:1; unsigned char ABDOVF:1; @@ -528,7 +552,7 @@ extern volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; #define ABDEN BAUDCTL_bits.ABDEN #define WUE BAUDCTL_bits.WUE #define BRG16 BAUDCTL_bits.BRG16 -#define CKTXP BAUDCTL_bits.CKTXP +#define SCKP BAUDCTL_bits.SCKP #define RCIDL BAUDCTL_bits.RCIDL #define ABDOVF BAUDCTL_bits.ABDOVF @@ -826,11 +850,11 @@ extern volatile __OSCTUNE_bits_t __at(OSCTUNE_ADDR) OSCTUNE_bits; // ----- PCON bits -------------------- typedef union { struct { - unsigned char NOT_BOD:1; + unsigned char NOT_BOR:1; unsigned char NOT_POR:1; unsigned char :1; unsigned char :1; - unsigned char SBODEN:1; + unsigned char SBOREN:1; unsigned char ULPWUE:1; unsigned char :1; unsigned char :1; @@ -838,9 +862,9 @@ typedef union { } __PCON_bits_t; extern volatile __PCON_bits_t __at(PCON_ADDR) PCON_bits; -#define NOT_BOD PCON_bits.NOT_BOD +#define NOT_BOR PCON_bits.NOT_BOR #define NOT_POR PCON_bits.NOT_POR -#define SBODEN PCON_bits.SBODEN +#define SBOREN PCON_bits.SBOREN #define ULPWUE PCON_bits.ULPWUE // ----- PIE1 bits -------------------- @@ -848,7 +872,7 @@ typedef union { struct { unsigned char T1IE:1; unsigned char T2IE:1; - unsigned char CCPIE:1; + unsigned char CCP1IE:1; unsigned char SSPIE:1; unsigned char TXIE:1; unsigned char RCIE:1; @@ -872,7 +896,7 @@ extern volatile __PIE1_bits_t __at(PIE1_ADDR) PIE1_bits; #define TMR1IE PIE1_bits.TMR1IE #define T2IE PIE1_bits.T2IE #define TMR2IE PIE1_bits.TMR2IE -#define CCPIE PIE1_bits.CCPIE +#define CCP1IE PIE1_bits.CCP1IE #define SSPIE PIE1_bits.SSPIE #define TXIE PIE1_bits.TXIE #define RCIE PIE1_bits.RCIE @@ -1191,22 +1215,84 @@ typedef union { struct { unsigned char BF:1; unsigned char UA:1; - unsigned char R_W_NOT:1; + unsigned char R:1; unsigned char S:1; unsigned char P:1; - unsigned char D_A_NOT:1; + unsigned char D:1; unsigned char CKE:1; unsigned char SMP:1; }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char I2C_READ:1; + unsigned char I2C_START:1; + unsigned char I2C_STOP:1; + unsigned char I2C_DATA:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char NOT_W:1; + unsigned char :1; + unsigned char :1; + unsigned char NOT_A:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char NOT_WRITE:1; + unsigned char :1; + unsigned char :1; + unsigned char NOT_ADDRESS:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char R_W:1; + unsigned char :1; + unsigned char :1; + unsigned char D_A:1; + unsigned char :1; + unsigned char :1; + }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char READ_WRITE:1; + unsigned char :1; + unsigned char :1; + unsigned char DATA_ADDRESS:1; + unsigned char :1; + unsigned char :1; + }; } __SSPSTAT_bits_t; extern volatile __SSPSTAT_bits_t __at(SSPSTAT_ADDR) SSPSTAT_bits; #define BF SSPSTAT_bits.BF #define UA SSPSTAT_bits.UA -#define R_W_NOT SSPSTAT_bits.R_W_NOT +#define R SSPSTAT_bits.R +#define I2C_READ SSPSTAT_bits.I2C_READ +#define NOT_W SSPSTAT_bits.NOT_W +#define NOT_WRITE SSPSTAT_bits.NOT_WRITE +#define R_W SSPSTAT_bits.R_W +#define READ_WRITE SSPSTAT_bits.READ_WRITE #define S SSPSTAT_bits.S +#define I2C_START SSPSTAT_bits.I2C_START #define P SSPSTAT_bits.P -#define D_A_NOT SSPSTAT_bits.D_A_NOT +#define I2C_STOP SSPSTAT_bits.I2C_STOP +#define D SSPSTAT_bits.D +#define I2C_DATA SSPSTAT_bits.I2C_DATA +#define NOT_A SSPSTAT_bits.NOT_A +#define NOT_ADDRESS SSPSTAT_bits.NOT_ADDRESS +#define D_A SSPSTAT_bits.D_A +#define DATA_ADDRESS SSPSTAT_bits.DATA_ADDRESS #define CKE SSPSTAT_bits.CKE #define SMP SSPSTAT_bits.SMP diff --git a/device/include/pic/pic16f716.h b/device/include/pic/pic16f716.h index 9dafc066..10de6181 100644 --- a/device/include/pic/pic16f716.h +++ b/device/include/pic/pic16f716.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -112,9 +112,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; diff --git a/device/include/pic/pic16f72.h b/device/include/pic/pic16f72.h index 398d2f6c..b41df748 100644 --- a/device/include/pic/pic16f72.h +++ b/device/include/pic/pic16f72.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -118,9 +118,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; diff --git a/device/include/pic/pic16f73.h b/device/include/pic/pic16f73.h index 8e31d6d6..6d4e5c75 100644 --- a/device/include/pic/pic16f73.h +++ b/device/include/pic/pic16f73.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -128,9 +128,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; diff --git a/device/include/pic/pic16f737.h b/device/include/pic/pic16f737.h index d2833fca..23fe3b5e 100644 --- a/device/include/pic/pic16f737.h +++ b/device/include/pic/pic16f737.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -145,9 +145,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; diff --git a/device/include/pic/pic16f74.h b/device/include/pic/pic16f74.h index 37a9f367..4857492b 100644 --- a/device/include/pic/pic16f74.h +++ b/device/include/pic/pic16f74.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -132,9 +132,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; diff --git a/device/include/pic/pic16f76.h b/device/include/pic/pic16f76.h index 6f44ed82..6b2b381b 100644 --- a/device/include/pic/pic16f76.h +++ b/device/include/pic/pic16f76.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -128,9 +128,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; diff --git a/device/include/pic/pic16f767.h b/device/include/pic/pic16f767.h index 3ec253e8..2aab8cc1 100644 --- a/device/include/pic/pic16f767.h +++ b/device/include/pic/pic16f767.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -143,9 +143,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; diff --git a/device/include/pic/pic16f77.h b/device/include/pic/pic16f77.h index 22f26e89..56911c48 100644 --- a/device/include/pic/pic16f77.h +++ b/device/include/pic/pic16f77.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -132,9 +132,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; diff --git a/device/include/pic/pic16f777.h b/device/include/pic/pic16f777.h index 2d0ce6b9..294d73b0 100644 --- a/device/include/pic/pic16f777.h +++ b/device/include/pic/pic16f777.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -145,9 +145,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; diff --git a/device/include/pic/pic16f785.h b/device/include/pic/pic16f785.h index 72f2c936..feffba4c 100644 --- a/device/include/pic/pic16f785.h +++ b/device/include/pic/pic16f785.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -138,9 +138,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; diff --git a/device/include/pic/pic16f818.h b/device/include/pic/pic16f818.h index 27d9f66b..6eefb35b 100644 --- a/device/include/pic/pic16f818.h +++ b/device/include/pic/pic16f818.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -123,9 +123,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; diff --git a/device/include/pic/pic16f819.h b/device/include/pic/pic16f819.h index 9e65cdb8..59e09306 100644 --- a/device/include/pic/pic16f819.h +++ b/device/include/pic/pic16f819.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -123,9 +123,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; diff --git a/device/include/pic/pic16f84.h b/device/include/pic/pic16f84.h index ae7b4e6e..b92918dd 100644 --- a/device/include/pic/pic16f84.h +++ b/device/include/pic/pic16f84.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -98,9 +98,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; @@ -233,7 +233,7 @@ typedef union { unsigned char RA2:1; unsigned char RA3:1; unsigned char RA4:1; - unsigned char :1; + unsigned char RA5:1; unsigned char :1; unsigned char :1; }; @@ -245,6 +245,7 @@ extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; #define RA2 PORTA_bits.RA2 #define RA3 PORTA_bits.RA3 #define RA4 PORTA_bits.RA4 +#define RA5 PORTA_bits.RA5 // ----- PORTB bits -------------------- typedef union { @@ -302,7 +303,7 @@ typedef union { unsigned char TRISA2:1; unsigned char TRISA3:1; unsigned char TRISA4:1; - unsigned char :1; + unsigned char TRISA5:1; unsigned char :1; unsigned char :1; }; @@ -314,6 +315,7 @@ extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; #define TRISA2 TRISA_bits.TRISA2 #define TRISA3 TRISA_bits.TRISA3 #define TRISA4 TRISA_bits.TRISA4 +#define TRISA5 TRISA_bits.TRISA5 // ----- TRISB bits -------------------- typedef union { diff --git a/device/include/pic/pic16f84a.h b/device/include/pic/pic16f84a.h index 1ef0e0ad..eea59b60 100644 --- a/device/include/pic/pic16f84a.h +++ b/device/include/pic/pic16f84a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -96,9 +96,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; @@ -231,7 +231,7 @@ typedef union { unsigned char RA2:1; unsigned char RA3:1; unsigned char RA4:1; - unsigned char :1; + unsigned char RA5:1; unsigned char :1; unsigned char :1; }; @@ -243,6 +243,7 @@ extern volatile __PORTA_bits_t __at(PORTA_ADDR) PORTA_bits; #define RA2 PORTA_bits.RA2 #define RA3 PORTA_bits.RA3 #define RA4 PORTA_bits.RA4 +#define RA5 PORTA_bits.RA5 // ----- PORTB bits -------------------- typedef union { @@ -300,7 +301,7 @@ typedef union { unsigned char TRISA2:1; unsigned char TRISA3:1; unsigned char TRISA4:1; - unsigned char :1; + unsigned char TRISA5:1; unsigned char :1; unsigned char :1; }; @@ -312,6 +313,7 @@ extern volatile __TRISA_bits_t __at(TRISA_ADDR) TRISA_bits; #define TRISA2 TRISA_bits.TRISA2 #define TRISA3 TRISA_bits.TRISA3 #define TRISA4 TRISA_bits.TRISA4 +#define TRISA5 TRISA_bits.TRISA5 // ----- TRISB bits -------------------- typedef union { diff --git a/device/include/pic/pic16f87.h b/device/include/pic/pic16f87.h index 0868b2be..c9462acf 100644 --- a/device/include/pic/pic16f87.h +++ b/device/include/pic/pic16f87.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -131,9 +131,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; diff --git a/device/include/pic/pic16f870.h b/device/include/pic/pic16f870.h index dea3cd83..e0b93a93 100644 --- a/device/include/pic/pic16f870.h +++ b/device/include/pic/pic16f870.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -123,9 +123,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; diff --git a/device/include/pic/pic16f871.h b/device/include/pic/pic16f871.h index 84cbfd3d..d58d181b 100644 --- a/device/include/pic/pic16f871.h +++ b/device/include/pic/pic16f871.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -127,9 +127,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; diff --git a/device/include/pic/pic16f872.h b/device/include/pic/pic16f872.h index 0d05fb28..7ad8c32c 100644 --- a/device/include/pic/pic16f872.h +++ b/device/include/pic/pic16f872.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -100,6 +100,7 @@ //Rev: Date: Reason: +//1.01 11/17/05 Added the INTCON bits TMR0IE and TMR0IF //1.00 01/25/98 Initial Release //========================================================================== @@ -123,9 +124,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; @@ -390,15 +391,27 @@ typedef union { unsigned char PEIE:1; unsigned char GIE:1; }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char TMR0IF:1; + unsigned char :1; + unsigned char :1; + unsigned char TMR0IE:1; + unsigned char :1; + unsigned char :1; + }; } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF +#define TMR0IF INTCON_bits.TMR0IF #define RBIE INTCON_bits.RBIE #define INTE INTCON_bits.INTE #define T0IE INTCON_bits.T0IE +#define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE diff --git a/device/include/pic/pic16f873.h b/device/include/pic/pic16f873.h index f4ac07b0..17ad6e3d 100644 --- a/device/include/pic/pic16f873.h +++ b/device/include/pic/pic16f873.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -135,9 +135,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; diff --git a/device/include/pic/pic16f873a.h b/device/include/pic/pic16f873a.h index ed79b55c..710e2375 100644 --- a/device/include/pic/pic16f873a.h +++ b/device/include/pic/pic16f873a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -109,6 +109,7 @@ //========================================================================== //Rev: Date: Reason: +//1.03 11/17/05 Added the INTCON bits TMR0IE and TMR0IF and the ADCON1 bit ADCS2. //1.02 05/28/02 Corrected values for _CP_ALL and _CP_OFF in Configuration Bits section. //1.01 10/03/01 Added the PIR2 bit CMIF and the PIE2 bit CMIE //1.00 04/19/01 Initial Release (BD - generated from PIC16F877a.inc) @@ -134,9 +135,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; @@ -352,7 +353,7 @@ typedef union { unsigned char PCFG3:1; unsigned char :1; unsigned char :1; - unsigned char :1; + unsigned char ADCS2:1; unsigned char ADFM:1; }; } __ADCON1_bits_t; @@ -362,6 +363,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 +#define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM // ----- CCP1CON bits -------------------- @@ -488,15 +490,27 @@ typedef union { unsigned char PEIE:1; unsigned char GIE:1; }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char TMR0IF:1; + unsigned char :1; + unsigned char :1; + unsigned char TMR0IE:1; + unsigned char :1; + unsigned char :1; + }; } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF +#define TMR0IF INTCON_bits.TMR0IF #define RBIE INTCON_bits.RBIE #define INTE INTCON_bits.INTE #define T0IE INTCON_bits.T0IE +#define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE diff --git a/device/include/pic/pic16f874.h b/device/include/pic/pic16f874.h index 9f9af250..ea11a7c0 100644 --- a/device/include/pic/pic16f874.h +++ b/device/include/pic/pic16f874.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -139,9 +139,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; diff --git a/device/include/pic/pic16f874a.h b/device/include/pic/pic16f874a.h index 663391dd..47b19f9c 100644 --- a/device/include/pic/pic16f874a.h +++ b/device/include/pic/pic16f874a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -113,6 +113,7 @@ //========================================================================== //Rev: Date: Reason: +//1.03 11/17/05 Added the INTCON bits TMR0IE and TMR0IF and the ADCON1 bit ADCS2. //1.02 05/28/02 Corrected values for _CP_ALL and _CP_OFF in Configuration Bits section. //1.01 10/03/01 Added the PIR2 bit CMIF and the PIE2 bit CMIE //1.00 04/19/01 Initial Release (BD - generated from PIC16F877A.inc) @@ -138,9 +139,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; @@ -363,7 +364,7 @@ typedef union { unsigned char PCFG3:1; unsigned char :1; unsigned char :1; - unsigned char :1; + unsigned char ADCS2:1; unsigned char ADFM:1; }; } __ADCON1_bits_t; @@ -373,6 +374,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 +#define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM // ----- CCP1CON bits -------------------- @@ -499,15 +501,27 @@ typedef union { unsigned char PEIE:1; unsigned char GIE:1; }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char TMR0IF:1; + unsigned char :1; + unsigned char :1; + unsigned char TMR0IE:1; + unsigned char :1; + unsigned char :1; + }; } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF +#define TMR0IF INTCON_bits.TMR0IF #define RBIE INTCON_bits.RBIE #define INTE INTCON_bits.INTE #define T0IE INTCON_bits.T0IE +#define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE diff --git a/device/include/pic/pic16f876.h b/device/include/pic/pic16f876.h index 2f962aa0..50e86d75 100644 --- a/device/include/pic/pic16f876.h +++ b/device/include/pic/pic16f876.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -133,9 +133,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; diff --git a/device/include/pic/pic16f876a.h b/device/include/pic/pic16f876a.h index ae23e8b4..de5c3e70 100644 --- a/device/include/pic/pic16f876a.h +++ b/device/include/pic/pic16f876a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -109,6 +109,7 @@ //========================================================================== //Rev: Date: Reason: +//1.03 11/17/05 Added the INTCON bits TMR0IE and TMR0IF and the ADCON1 bit ADCS2. //1.02 05/28/02 Corrected values for _CP_ALL and _CP_OFF in Configuration Bits section. //1.01 10/03/01 Added the PIR2 bit CMIF and the PIE2 bit CMIE //1.00 04/19/01 Initial Release (BD - generated from PIC16F877.inc) @@ -134,9 +135,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; @@ -352,7 +353,7 @@ typedef union { unsigned char PCFG3:1; unsigned char :1; unsigned char :1; - unsigned char :1; + unsigned char ADCS2:1; unsigned char ADFM:1; }; } __ADCON1_bits_t; @@ -362,6 +363,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 +#define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM // ----- CCP1CON bits -------------------- @@ -488,15 +490,27 @@ typedef union { unsigned char PEIE:1; unsigned char GIE:1; }; + struct { + unsigned char :1; + unsigned char :1; + unsigned char TMR0IF:1; + unsigned char :1; + unsigned char :1; + unsigned char TMR0IE:1; + unsigned char :1; + unsigned char :1; + }; } __INTCON_bits_t; extern volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; #define RBIF INTCON_bits.RBIF #define INTF INTCON_bits.INTF #define T0IF INTCON_bits.T0IF +#define TMR0IF INTCON_bits.TMR0IF #define RBIE INTCON_bits.RBIE #define INTE INTCON_bits.INTE #define T0IE INTCON_bits.T0IE +#define TMR0IE INTCON_bits.TMR0IE #define PEIE INTCON_bits.PEIE #define GIE INTCON_bits.GIE diff --git a/device/include/pic/pic16f877.h b/device/include/pic/pic16f877.h index c9343a1c..6805f234 100644 --- a/device/include/pic/pic16f877.h +++ b/device/include/pic/pic16f877.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -137,9 +137,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; diff --git a/device/include/pic/pic16f877a.h b/device/include/pic/pic16f877a.h index 5fa4fda1..b100c1b0 100644 --- a/device/include/pic/pic16f877a.h +++ b/device/include/pic/pic16f877a.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -113,6 +113,7 @@ //========================================================================== //Rev: Date: Reason: +//1.03 11/17/05 Added the ADCON1 bit ADCS2. //1.02 05/28/02 Corrected values for _CP_ALL and _CP_OFF in Configuration Bits section. //1.01 09/13/01 Added the PIR2 bit CMIF and the PIE2 bit CMIE //1.00 04/19/01 Initial Release (BD - generated from PIC16F877.inc) @@ -138,9 +139,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; @@ -363,7 +364,7 @@ typedef union { unsigned char PCFG3:1; unsigned char :1; unsigned char :1; - unsigned char :1; + unsigned char ADCS2:1; unsigned char ADFM:1; }; } __ADCON1_bits_t; @@ -373,6 +374,7 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; #define PCFG1 ADCON1_bits.PCFG1 #define PCFG2 ADCON1_bits.PCFG2 #define PCFG3 ADCON1_bits.PCFG3 +#define ADCS2 ADCON1_bits.ADCS2 #define ADFM ADCON1_bits.ADFM // ----- CCP1CON bits -------------------- diff --git a/device/include/pic/pic16f88.h b/device/include/pic/pic16f88.h index 47d337bf..5acd3f1a 100644 --- a/device/include/pic/pic16f88.h +++ b/device/include/pic/pic16f88.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -136,9 +136,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; diff --git a/device/include/pic/pic16f886.h b/device/include/pic/pic16f886.h index ad9fb9bb..7ed04f88 100644 --- a/device/include/pic/pic16f886.h +++ b/device/include/pic/pic16f886.h @@ -148,9 +148,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; diff --git a/device/include/pic/pic16f887.h b/device/include/pic/pic16f887.h index 74fca3b2..3f6b398e 100644 --- a/device/include/pic/pic16f887.h +++ b/device/include/pic/pic16f887.h @@ -150,9 +150,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; diff --git a/device/include/pic/pic16f913.h b/device/include/pic/pic16f913.h index 8ce61068..c8e832b1 100644 --- a/device/include/pic/pic16f913.h +++ b/device/include/pic/pic16f913.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -106,7 +106,7 @@ // LIST -// P16F913.INC Standard Header File, Version 1.00 Microchip Technology, Inc. +// P16F913.INC Standard Header File, Version 1.04 Microchip Technology, Inc. // NOLIST // This header file defines configurations, registers, and other useful bits of @@ -132,6 +132,9 @@ //1.00 06/11/04 Initial Release //1.01 06/18/04 Corrected typo in 'bad ram' section //1.02 08/16/04 Added EECON2 +//1.03 05/20/05 Removed EECON2 from badram +//1.04 10/05/05 Correct names of bits in ANSEL, Add EEADRH and EEADRL bit +// definitions //========================================================================== @@ -155,9 +158,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; @@ -333,38 +336,38 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- LVDCON Bits -------------------------------------------------------- -//----- LCDDAT0 Bits ------------------------------------------------------- +//----- LCDDATA0 Bits ------------------------------------------------------- -//----- LCDDAT1 Bits ------------------------------------------------------- +//----- LCDDATA1 Bits ------------------------------------------------------- -//----- LCDDAT3 Bits ------------------------------------------------------- +//----- LCDDATA3 Bits ------------------------------------------------------- -//----- LCDDAT4 Bits ------------------------------------------------------- +//----- LCDDATA4 Bits ------------------------------------------------------- -//----- LCDDAT6 Bits ------------------------------------------------------- +//----- LCDDATA6 Bits ------------------------------------------------------- -//----- LCDDAT7 Bits ------------------------------------------------------- +//----- LCDDATA7 Bits ------------------------------------------------------- -//----- LCDDAT9 Bits ------------------------------------------------------- +//----- LCDDATA9 Bits ------------------------------------------------------- -//----- LCDDAT10 Bits ------------------------------------------------------- +//----- LCDDATA10 Bits ------------------------------------------------------- @@ -381,6 +384,12 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- EECON1 Bits -------------------------------------------------------- +//----- EEADRH Bits -------------------------------------------------------- + + +//----- EEADRL Bits -------------------------------------------------------- + + //========================================================================== // @@ -392,7 +401,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; // __BADRAM H'08', H'1B'-H'1D' // __BADRAM H'88', H'9A'-H'9B' // __BADRAM H'112', H'115', H'118', H'11B',H'11E'-H'11F' -// __BADRAM H'185', H'187'-H'189', H'18D'-H'1EF' +// __BADRAM H'185', H'187'-H'189', H'18E'-H'1EF' //========================================================================== // @@ -495,6 +504,16 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; // ----- ANSEL bits -------------------- typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; struct { unsigned char AN0:1; unsigned char AN1:1; @@ -508,10 +527,15 @@ typedef union { } __ANSEL_bits_t; extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +#define ANS0 ANSEL_bits.ANS0 #define AN0 ANSEL_bits.AN0 +#define ANS1 ANSEL_bits.ANS1 #define AN1 ANSEL_bits.AN1 +#define ANS2 ANSEL_bits.ANS2 #define AN2 ANSEL_bits.AN2 +#define ANS3 ANSEL_bits.ANS3 #define AN3 ANSEL_bits.AN3 +#define ANS4 ANSEL_bits.ANS4 #define AN4 ANSEL_bits.AN4 // ----- CCP1CON bits -------------------- @@ -578,6 +602,51 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define C2SYNC CMCON1_bits.C2SYNC #define T1GSS CMCON1_bits.T1GSS +// ----- EEADRH bits -------------------- +typedef union { + struct { + unsigned char EEADRH0:1; + unsigned char EEADRH1:1; + unsigned char EEADRH2:1; + unsigned char EEADRH3:1; + unsigned char EEADRH4:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EEADRH_bits_t; +extern volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; + +#define EEADRH0 EEADRH_bits.EEADRH0 +#define EEADRH1 EEADRH_bits.EEADRH1 +#define EEADRH2 EEADRH_bits.EEADRH2 +#define EEADRH3 EEADRH_bits.EEADRH3 +#define EEADRH4 EEADRH_bits.EEADRH4 + +// ----- EEADRL bits -------------------- +typedef union { + struct { + unsigned char EEADRL0:1; + unsigned char EEADRL1:1; + unsigned char EEADRL2:1; + unsigned char EEADRL3:1; + unsigned char EEADRL4:1; + unsigned char EEADRL5:1; + unsigned char EEADRL6:1; + unsigned char EEADRL7:1; + }; +} __EEADRL_bits_t; +extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; + +#define EEADRL0 EEADRL_bits.EEADRL0 +#define EEADRL1 EEADRL_bits.EEADRL1 +#define EEADRL2 EEADRL_bits.EEADRL2 +#define EEADRL3 EEADRL_bits.EEADRL3 +#define EEADRL4 EEADRL_bits.EEADRL4 +#define EEADRL5 EEADRL_bits.EEADRL5 +#define EEADRL6 EEADRL_bits.EEADRL6 +#define EEADRL7 EEADRL_bits.EEADRL7 + // ----- EECON1 bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f914.h b/device/include/pic/pic16f914.h index f7f7c6fc..7382d5ef 100644 --- a/device/include/pic/pic16f914.h +++ b/device/include/pic/pic16f914.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -116,7 +116,7 @@ // LIST -// P16F914.INC Standard Header File, Version 1.00 Microchip Technology, Inc. +// P16F914.INC Standard Header File, Version 1.03 Microchip Technology, Inc. // NOLIST // This header file defines configurations, registers, and other useful bits of @@ -141,6 +141,9 @@ //Rev: Date: Reason: //1.00 06/11/04 Initial Release //1.01 08/16/04 Added EECON2 +//1.02 05/20/05 Removed EECON2 from badram +//1.03 10/05/05 Correct names of bits in ANSEL, Add EEADRH and EEADRL bit +// definitions //========================================================================== @@ -164,9 +167,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; @@ -355,51 +358,51 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- LVDCON Bits -------------------------------------------------------- -//----- LCDDAT0 Bits ------------------------------------------------------- +//----- LCDDATA0 Bits ------------------------------------------------------- -//----- LCDDAT1 Bits ------------------------------------------------------- +//----- LCDDATA1 Bits ------------------------------------------------------- -//----- LCDDAT2 Bits ------------------------------------------------------- +//----- LCDDATA2 Bits ------------------------------------------------------- -//----- LCDDAT3 Bits ------------------------------------------------------- +//----- LCDDATA3 Bits ------------------------------------------------------- -//----- LCDDAT4 Bits ------------------------------------------------------- +//----- LCDDATA4 Bits ------------------------------------------------------- -//----- LCDDAT5 Bits ------------------------------------------------------- +//----- LCDDATA5 Bits ------------------------------------------------------- -//----- LCDDAT6 Bits ------------------------------------------------------- +//----- LCDDATA6 Bits ------------------------------------------------------- -//----- LCDDAT7 Bits ------------------------------------------------------- +//----- LCDDATA7 Bits ------------------------------------------------------- -//----- LCDDAT8 Bits ------------------------------------------------------- +//----- LCDDATA8 Bits ------------------------------------------------------- -//----- LCDDAT9 Bits ------------------------------------------------------- +//----- LCDDATA9 Bits ------------------------------------------------------- -//----- LCDDAT10 Bits ------------------------------------------------------- +//----- LCDDATA10 Bits ------------------------------------------------------- -//----- LCDDAT11 Bits ------------------------------------------------------- +//----- LCDDATA11 Bits ------------------------------------------------------- @@ -411,13 +414,19 @@ extern __sfr __at (EECON2_ADDR) EECON2; -//----- LCDSE3 Bits -------------------------------------------------------- +//----- LCDSE2 Bits -------------------------------------------------------- //----- EECON1 Bits -------------------------------------------------------- +//----- EEADRH Bits -------------------------------------------------------- + + +//----- EEADRL Bits -------------------------------------------------------- + + //========================================================================== // @@ -428,7 +437,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; // __MAXRAM H'1FF' // __BADRAM H'9A'-H'9B' // __BADRAM H'11F' -// __BADRAM H'185', H'187'-H'189', H'18D'-H'1EF' +// __BADRAM H'185', H'187'-H'189', H'18E'-H'1EF' //========================================================================== // @@ -531,6 +540,16 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; // ----- ANSEL bits -------------------- typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; struct { unsigned char AN0:1; unsigned char AN1:1; @@ -544,13 +563,21 @@ typedef union { } __ANSEL_bits_t; extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +#define ANS0 ANSEL_bits.ANS0 #define AN0 ANSEL_bits.AN0 +#define ANS1 ANSEL_bits.ANS1 #define AN1 ANSEL_bits.AN1 +#define ANS2 ANSEL_bits.ANS2 #define AN2 ANSEL_bits.AN2 +#define ANS3 ANSEL_bits.ANS3 #define AN3 ANSEL_bits.AN3 +#define ANS4 ANSEL_bits.ANS4 #define AN4 ANSEL_bits.AN4 +#define ANS5 ANSEL_bits.ANS5 #define AN5 ANSEL_bits.AN5 +#define ANS6 ANSEL_bits.ANS6 #define AN6 ANSEL_bits.AN6 +#define ANS7 ANSEL_bits.ANS7 #define AN7 ANSEL_bits.AN7 // ----- CCP1CON bits -------------------- @@ -639,6 +666,51 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define C2SYNC CMCON1_bits.C2SYNC #define T1GSS CMCON1_bits.T1GSS +// ----- EEADRH bits -------------------- +typedef union { + struct { + unsigned char EEADRH0:1; + unsigned char EEADRH1:1; + unsigned char EEADRH2:1; + unsigned char EEADRH3:1; + unsigned char EEADRH4:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EEADRH_bits_t; +extern volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; + +#define EEADRH0 EEADRH_bits.EEADRH0 +#define EEADRH1 EEADRH_bits.EEADRH1 +#define EEADRH2 EEADRH_bits.EEADRH2 +#define EEADRH3 EEADRH_bits.EEADRH3 +#define EEADRH4 EEADRH_bits.EEADRH4 + +// ----- EEADRL bits -------------------- +typedef union { + struct { + unsigned char EEADRL0:1; + unsigned char EEADRL1:1; + unsigned char EEADRL2:1; + unsigned char EEADRL3:1; + unsigned char EEADRL4:1; + unsigned char EEADRL5:1; + unsigned char EEADRL6:1; + unsigned char EEADRL7:1; + }; +} __EEADRL_bits_t; +extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; + +#define EEADRL0 EEADRL_bits.EEADRL0 +#define EEADRL1 EEADRL_bits.EEADRL1 +#define EEADRL2 EEADRL_bits.EEADRL2 +#define EEADRL3 EEADRL_bits.EEADRL3 +#define EEADRL4 EEADRL_bits.EEADRL4 +#define EEADRL5 EEADRL_bits.EEADRL5 +#define EEADRL6 EEADRL_bits.EEADRL6 +#define EEADRL7 EEADRL_bits.EEADRL7 + // ----- EECON1 bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f916.h b/device/include/pic/pic16f916.h index 42175544..dd973339 100644 --- a/device/include/pic/pic16f916.h +++ b/device/include/pic/pic16f916.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -106,7 +106,7 @@ // LIST -// P16F916.INC Standard Header File, Version 1.00 Microchip Technology, Inc. +// P16F916.INC Standard Header File, Version 1.04 Microchip Technology, Inc. // NOLIST // This header file defines configurations, registers, and other useful bits of @@ -132,6 +132,10 @@ //1.00 06/11/04 Initial Release //1.01 06/18/04 Corrected typo in 'bad ram' section //1.02 08/16/04 Added EECON2 +//1.03 05/20/05 Removed EECON2 from badram +//1.04 10/05/05 Correct names of bits in ANSEL, Add EEADRH and EEADRL bit +// definitions + //========================================================================== // @@ -154,9 +158,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; @@ -333,38 +337,38 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- LVDCON Bits -------------------------------------------------------- -//----- LCDDAT0 Bits ------------------------------------------------------- +//----- LCDDATA0 Bits ------------------------------------------------------- -//----- LCDDAT1 Bits ------------------------------------------------------- +//----- LCDDATA1 Bits ------------------------------------------------------- -//----- LCDDAT3 Bits ------------------------------------------------------- +//----- LCDDATA3 Bits ------------------------------------------------------- -//----- LCDDAT4 Bits ------------------------------------------------------- +//----- LCDDATA4 Bits ------------------------------------------------------- -//----- LCDDAT6 Bits ------------------------------------------------------- +//----- LCDDATA6 Bits ------------------------------------------------------- -//----- LCDDAT7 Bits ------------------------------------------------------- +//----- LCDDATA7 Bits ------------------------------------------------------- -//----- LCDDAT9 Bits ------------------------------------------------------- +//----- LCDDATA9 Bits ------------------------------------------------------- -//----- LCDDAT10 Bits ------------------------------------------------------- +//----- LCDDATA10 Bits ------------------------------------------------------- @@ -381,6 +385,12 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- EECON1 Bits -------------------------------------------------------- +//----- EEADRH Bits -------------------------------------------------------- + + +//----- EEADRL Bits -------------------------------------------------------- + + //========================================================================== // @@ -392,7 +402,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; // __BADRAM H'08', H'1B'-H'1D' // __BADRAM H'88', H'9A'-H'9B' // __BADRAM H'112', H'115', H'118', H'11B',H'11E'-H'11F' -// __BADRAM H'185', H'187'-H'189', H'18D'-H'18F' +// __BADRAM H'185', H'187'-H'189', H'18E'-H'18F' //========================================================================== // @@ -495,6 +505,16 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; // ----- ANSEL bits -------------------- typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; struct { unsigned char AN0:1; unsigned char AN1:1; @@ -508,10 +528,15 @@ typedef union { } __ANSEL_bits_t; extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +#define ANS0 ANSEL_bits.ANS0 #define AN0 ANSEL_bits.AN0 +#define ANS1 ANSEL_bits.ANS1 #define AN1 ANSEL_bits.AN1 +#define ANS2 ANSEL_bits.ANS2 #define AN2 ANSEL_bits.AN2 +#define ANS3 ANSEL_bits.ANS3 #define AN3 ANSEL_bits.AN3 +#define ANS4 ANSEL_bits.ANS4 #define AN4 ANSEL_bits.AN4 // ----- CCP1CON bits -------------------- @@ -578,6 +603,51 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define C2SYNC CMCON1_bits.C2SYNC #define T1GSS CMCON1_bits.T1GSS +// ----- EEADRH bits -------------------- +typedef union { + struct { + unsigned char EEADRH0:1; + unsigned char EEADRH1:1; + unsigned char EEADRH2:1; + unsigned char EEADRH3:1; + unsigned char EEADRH4:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EEADRH_bits_t; +extern volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; + +#define EEADRH0 EEADRH_bits.EEADRH0 +#define EEADRH1 EEADRH_bits.EEADRH1 +#define EEADRH2 EEADRH_bits.EEADRH2 +#define EEADRH3 EEADRH_bits.EEADRH3 +#define EEADRH4 EEADRH_bits.EEADRH4 + +// ----- EEADRL bits -------------------- +typedef union { + struct { + unsigned char EEADRL0:1; + unsigned char EEADRL1:1; + unsigned char EEADRL2:1; + unsigned char EEADRL3:1; + unsigned char EEADRL4:1; + unsigned char EEADRL5:1; + unsigned char EEADRL6:1; + unsigned char EEADRL7:1; + }; +} __EEADRL_bits_t; +extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; + +#define EEADRL0 EEADRL_bits.EEADRL0 +#define EEADRL1 EEADRL_bits.EEADRL1 +#define EEADRL2 EEADRL_bits.EEADRL2 +#define EEADRL3 EEADRL_bits.EEADRL3 +#define EEADRL4 EEADRL_bits.EEADRL4 +#define EEADRL5 EEADRL_bits.EEADRL5 +#define EEADRL6 EEADRL_bits.EEADRL6 +#define EEADRL7 EEADRL_bits.EEADRL7 + // ----- EECON1 bits -------------------- typedef union { struct { diff --git a/device/include/pic/pic16f917.h b/device/include/pic/pic16f917.h index c37c56c2..7c81ac09 100644 --- a/device/include/pic/pic16f917.h +++ b/device/include/pic/pic16f917.h @@ -4,7 +4,7 @@ // // This header file was automatically generated by: // -// inc2h.pl V4514 +// inc2h.pl V4585 // // Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved // @@ -116,7 +116,7 @@ // LIST -// P16F917.INC Standard Header File, Version 1.00 Microchip Technology, Inc. +// P16F917.INC Standard Header File, Version 1.03 Microchip Technology, Inc. // NOLIST // This header file defines configurations, registers, and other useful bits of @@ -141,6 +141,9 @@ //Rev: Date: Reason: //1.00 06/11/04 Initial Release //1.01 08/16/04 Added EECON2 +//1.02 05/20/05 Removed EECON2 from badram +//1.03 10/05/05 Correct names of bits in ANSEL, Add EEADRH and EEADRL bit +// definitions //========================================================================== @@ -164,9 +167,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; @@ -355,51 +358,51 @@ extern __sfr __at (EECON2_ADDR) EECON2; //----- LVDCON Bits -------------------------------------------------------- -//----- LCDDAT0 Bits ------------------------------------------------------- +//----- LCDDATA0 Bits ------------------------------------------------------- -//----- LCDDAT1 Bits ------------------------------------------------------- +//----- LCDDATA1 Bits ------------------------------------------------------- -//----- LCDDAT2 Bits ------------------------------------------------------- +//----- LCDDATA2 Bits ------------------------------------------------------- -//----- LCDDAT3 Bits ------------------------------------------------------- +//----- LCDDATA3 Bits ------------------------------------------------------- -//----- LCDDAT4 Bits ------------------------------------------------------- +//----- LCDDATA4 Bits ------------------------------------------------------- -//----- LCDDAT5 Bits ------------------------------------------------------- +//----- LCDDATA5 Bits ------------------------------------------------------- -//----- LCDDAT6 Bits ------------------------------------------------------- +//----- LCDDATA6 Bits ------------------------------------------------------- -//----- LCDDAT7 Bits ------------------------------------------------------- +//----- LCDDATA7 Bits ------------------------------------------------------- -//----- LCDDAT8 Bits ------------------------------------------------------- +//----- LCDDATA8 Bits ------------------------------------------------------- -//----- LCDDAT9 Bits ------------------------------------------------------- +//----- LCDDATA9 Bits ------------------------------------------------------- -//----- LCDDAT10 Bits ------------------------------------------------------- +//----- LCDDATA10 Bits ------------------------------------------------------- -//----- LCDDAT11 Bits ------------------------------------------------------- +//----- LCDDATA11 Bits ------------------------------------------------------- @@ -411,13 +414,19 @@ extern __sfr __at (EECON2_ADDR) EECON2; -//----- LCDSE3 Bits -------------------------------------------------------- +//----- LCDSE2 Bits -------------------------------------------------------- //----- EECON1 Bits -------------------------------------------------------- +//----- EEADRH Bits -------------------------------------------------------- + + +//----- EEADRL Bits -------------------------------------------------------- + + //========================================================================== // @@ -428,7 +437,7 @@ extern __sfr __at (EECON2_ADDR) EECON2; // __MAXRAM H'1FF' // __BADRAM H'9A'-H'9B' // __BADRAM H'11F' -// __BADRAM H'185', H'187'-H'189', H'18D'-H'18F' +// __BADRAM H'185', H'187'-H'189', H'18E'-H'18F' //========================================================================== // @@ -531,6 +540,16 @@ extern volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; // ----- ANSEL bits -------------------- typedef union { + struct { + unsigned char ANS0:1; + unsigned char ANS1:1; + unsigned char ANS2:1; + unsigned char ANS3:1; + unsigned char ANS4:1; + unsigned char ANS5:1; + unsigned char ANS6:1; + unsigned char ANS7:1; + }; struct { unsigned char AN0:1; unsigned char AN1:1; @@ -544,13 +563,21 @@ typedef union { } __ANSEL_bits_t; extern volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +#define ANS0 ANSEL_bits.ANS0 #define AN0 ANSEL_bits.AN0 +#define ANS1 ANSEL_bits.ANS1 #define AN1 ANSEL_bits.AN1 +#define ANS2 ANSEL_bits.ANS2 #define AN2 ANSEL_bits.AN2 +#define ANS3 ANSEL_bits.ANS3 #define AN3 ANSEL_bits.AN3 +#define ANS4 ANSEL_bits.ANS4 #define AN4 ANSEL_bits.AN4 +#define ANS5 ANSEL_bits.ANS5 #define AN5 ANSEL_bits.AN5 +#define ANS6 ANSEL_bits.ANS6 #define AN6 ANSEL_bits.AN6 +#define ANS7 ANSEL_bits.ANS7 #define AN7 ANSEL_bits.AN7 // ----- CCP1CON bits -------------------- @@ -639,6 +666,51 @@ extern volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; #define C2SYNC CMCON1_bits.C2SYNC #define T1GSS CMCON1_bits.T1GSS +// ----- EEADRH bits -------------------- +typedef union { + struct { + unsigned char EEADRH0:1; + unsigned char EEADRH1:1; + unsigned char EEADRH2:1; + unsigned char EEADRH3:1; + unsigned char EEADRH4:1; + unsigned char :1; + unsigned char :1; + unsigned char :1; + }; +} __EEADRH_bits_t; +extern volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; + +#define EEADRH0 EEADRH_bits.EEADRH0 +#define EEADRH1 EEADRH_bits.EEADRH1 +#define EEADRH2 EEADRH_bits.EEADRH2 +#define EEADRH3 EEADRH_bits.EEADRH3 +#define EEADRH4 EEADRH_bits.EEADRH4 + +// ----- EEADRL bits -------------------- +typedef union { + struct { + unsigned char EEADRL0:1; + unsigned char EEADRL1:1; + unsigned char EEADRL2:1; + unsigned char EEADRL3:1; + unsigned char EEADRL4:1; + unsigned char EEADRL5:1; + unsigned char EEADRL6:1; + unsigned char EEADRL7:1; + }; +} __EEADRL_bits_t; +extern volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; + +#define EEADRL0 EEADRL_bits.EEADRL0 +#define EEADRL1 EEADRL_bits.EEADRL1 +#define EEADRL2 EEADRL_bits.EEADRL2 +#define EEADRL3 EEADRL_bits.EEADRL3 +#define EEADRL4 EEADRL_bits.EEADRL4 +#define EEADRL5 EEADRL_bits.EEADRL5 +#define EEADRL6 EEADRL_bits.EEADRL6 +#define EEADRL7 EEADRL_bits.EEADRL7 + // ----- EECON1 bits -------------------- typedef union { struct { diff --git a/device/lib/pic/libdev/disabled_pic16f886.c b/device/lib/pic/libdev/disabled_pic16f886.c index 67139b80..f34a2096 100644 --- a/device/lib/pic/libdev/disabled_pic16f886.c +++ b/device/lib/pic/libdev/disabled_pic16f886.c @@ -7,9 +7,9 @@ */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/disabled_pic16f887.c b/device/lib/pic/libdev/disabled_pic16f887.c index b091ee35..56496f12 100644 --- a/device/lib/pic/libdev/disabled_pic16f887.c +++ b/device/lib/pic/libdev/disabled_pic16f887.c @@ -7,9 +7,9 @@ */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic12f629.c b/device/lib/pic/libdev/pic12f629.c index 6a6f8c58..217f9dca 100644 --- a/device/lib/pic/libdev/pic12f629.c +++ b/device/lib/pic/libdev/pic12f629.c @@ -1,13 +1,13 @@ /* Register definitions for pic12f629. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (GPIO_ADDR) GPIO; diff --git a/device/lib/pic/libdev/pic12f635.c b/device/lib/pic/libdev/pic12f635.c index 84f24216..82b1f32d 100644 --- a/device/lib/pic/libdev/pic12f635.c +++ b/device/lib/pic/libdev/pic12f635.c @@ -1,13 +1,13 @@ /* Register definitions for pic12f635. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic12f675.c b/device/lib/pic/libdev/pic12f675.c index 7108cff3..cea182c3 100644 --- a/device/lib/pic/libdev/pic12f675.c +++ b/device/lib/pic/libdev/pic12f675.c @@ -1,13 +1,13 @@ /* Register definitions for pic12f675. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (GPIO_ADDR) GPIO; diff --git a/device/lib/pic/libdev/pic12f683.c b/device/lib/pic/libdev/pic12f683.c index 9dae3117..6631c9cc 100644 --- a/device/lib/pic/libdev/pic12f683.c +++ b/device/lib/pic/libdev/pic12f683.c @@ -1,13 +1,13 @@ /* Register definitions for pic12f683. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (GPIO_ADDR) GPIO; diff --git a/device/lib/pic/libdev/pic16c432.c b/device/lib/pic/libdev/pic16c432.c index 078f1787..4d569cd2 100644 --- a/device/lib/pic/libdev/pic16c432.c +++ b/device/lib/pic/libdev/pic16c432.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c432. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c433.c b/device/lib/pic/libdev/pic16c433.c index 97152d33..41c25a8d 100644 --- a/device/lib/pic/libdev/pic16c433.c +++ b/device/lib/pic/libdev/pic16c433.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c433. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (GPIO_ADDR) GPIO; diff --git a/device/lib/pic/libdev/pic16c554.c b/device/lib/pic/libdev/pic16c554.c index a690590e..793bc6c6 100644 --- a/device/lib/pic/libdev/pic16c554.c +++ b/device/lib/pic/libdev/pic16c554.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c554. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c557.c b/device/lib/pic/libdev/pic16c557.c index 1a3d6bf1..d68bf3b1 100644 --- a/device/lib/pic/libdev/pic16c557.c +++ b/device/lib/pic/libdev/pic16c557.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c557. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c558.c b/device/lib/pic/libdev/pic16c558.c index 439965c3..0297aa06 100644 --- a/device/lib/pic/libdev/pic16c558.c +++ b/device/lib/pic/libdev/pic16c558.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c558. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c62.c b/device/lib/pic/libdev/pic16c62.c index 35eb57de..0347eb6c 100644 --- a/device/lib/pic/libdev/pic16c62.c +++ b/device/lib/pic/libdev/pic16c62.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c62. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c620.c b/device/lib/pic/libdev/pic16c620.c index 790f278f..4b5bd8c9 100644 --- a/device/lib/pic/libdev/pic16c620.c +++ b/device/lib/pic/libdev/pic16c620.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c620. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c620a.c b/device/lib/pic/libdev/pic16c620a.c index 3d0fc153..e4928b79 100644 --- a/device/lib/pic/libdev/pic16c620a.c +++ b/device/lib/pic/libdev/pic16c620a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c620a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c621.c b/device/lib/pic/libdev/pic16c621.c index 8ad25181..f9001f8d 100644 --- a/device/lib/pic/libdev/pic16c621.c +++ b/device/lib/pic/libdev/pic16c621.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c621. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c621a.c b/device/lib/pic/libdev/pic16c621a.c index 2f0fee44..786c439a 100644 --- a/device/lib/pic/libdev/pic16c621a.c +++ b/device/lib/pic/libdev/pic16c621a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c621a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c622.c b/device/lib/pic/libdev/pic16c622.c index ce95620b..74b65fe9 100644 --- a/device/lib/pic/libdev/pic16c622.c +++ b/device/lib/pic/libdev/pic16c622.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c622. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c622a.c b/device/lib/pic/libdev/pic16c622a.c index efa52751..e67f576f 100644 --- a/device/lib/pic/libdev/pic16c622a.c +++ b/device/lib/pic/libdev/pic16c622a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c622a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c63a.c b/device/lib/pic/libdev/pic16c63a.c index 5c089989..9bd52d76 100644 --- a/device/lib/pic/libdev/pic16c63a.c +++ b/device/lib/pic/libdev/pic16c63a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c63a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c65b.c b/device/lib/pic/libdev/pic16c65b.c index 9e36bc0c..0423ea41 100644 --- a/device/lib/pic/libdev/pic16c65b.c +++ b/device/lib/pic/libdev/pic16c65b.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c65b. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c71.c b/device/lib/pic/libdev/pic16c71.c index d0315202..7997fcf7 100644 --- a/device/lib/pic/libdev/pic16c71.c +++ b/device/lib/pic/libdev/pic16c71.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c71. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c710.c b/device/lib/pic/libdev/pic16c710.c index 18033833..438bb3a7 100644 --- a/device/lib/pic/libdev/pic16c710.c +++ b/device/lib/pic/libdev/pic16c710.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c710. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c711.c b/device/lib/pic/libdev/pic16c711.c index 9e5fc0aa..9bee096a 100644 --- a/device/lib/pic/libdev/pic16c711.c +++ b/device/lib/pic/libdev/pic16c711.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c711. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c715.c b/device/lib/pic/libdev/pic16c715.c index 788396f3..62eb299d 100644 --- a/device/lib/pic/libdev/pic16c715.c +++ b/device/lib/pic/libdev/pic16c715.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c715. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c717.c b/device/lib/pic/libdev/pic16c717.c index 69efee2a..5dd7bf28 100644 --- a/device/lib/pic/libdev/pic16c717.c +++ b/device/lib/pic/libdev/pic16c717.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c717. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c72.c b/device/lib/pic/libdev/pic16c72.c index c1f4faf5..181c06f7 100644 --- a/device/lib/pic/libdev/pic16c72.c +++ b/device/lib/pic/libdev/pic16c72.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c72. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c73b.c b/device/lib/pic/libdev/pic16c73b.c index 4a234e41..cc59a638 100644 --- a/device/lib/pic/libdev/pic16c73b.c +++ b/device/lib/pic/libdev/pic16c73b.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c73b. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c745.c b/device/lib/pic/libdev/pic16c745.c index 9fa42f60..4df80b66 100644 --- a/device/lib/pic/libdev/pic16c745.c +++ b/device/lib/pic/libdev/pic16c745.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c745. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c74b.c b/device/lib/pic/libdev/pic16c74b.c index 97d0e21b..c3e52177 100644 --- a/device/lib/pic/libdev/pic16c74b.c +++ b/device/lib/pic/libdev/pic16c74b.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c74b. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c765.c b/device/lib/pic/libdev/pic16c765.c index 4e8ed426..9263df4e 100644 --- a/device/lib/pic/libdev/pic16c765.c +++ b/device/lib/pic/libdev/pic16c765.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c765. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c770.c b/device/lib/pic/libdev/pic16c770.c index dcce2a77..5dd5838e 100644 --- a/device/lib/pic/libdev/pic16c770.c +++ b/device/lib/pic/libdev/pic16c770.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c770. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c771.c b/device/lib/pic/libdev/pic16c771.c index 7cc5385a..2b22c4c0 100644 --- a/device/lib/pic/libdev/pic16c771.c +++ b/device/lib/pic/libdev/pic16c771.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c771. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c773.c b/device/lib/pic/libdev/pic16c773.c index 7eddb892..a749d03a 100644 --- a/device/lib/pic/libdev/pic16c773.c +++ b/device/lib/pic/libdev/pic16c773.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c773. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c774.c b/device/lib/pic/libdev/pic16c774.c index 90f63dc8..52a9a245 100644 --- a/device/lib/pic/libdev/pic16c774.c +++ b/device/lib/pic/libdev/pic16c774.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c774. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c781.c b/device/lib/pic/libdev/pic16c781.c index 69ee5bdb..6a3638da 100644 --- a/device/lib/pic/libdev/pic16c781.c +++ b/device/lib/pic/libdev/pic16c781.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c781. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c782.c b/device/lib/pic/libdev/pic16c782.c index 0c17df74..32bbc261 100644 --- a/device/lib/pic/libdev/pic16c782.c +++ b/device/lib/pic/libdev/pic16c782.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c782. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c925.c b/device/lib/pic/libdev/pic16c925.c index 1423c915..9fd2021a 100644 --- a/device/lib/pic/libdev/pic16c925.c +++ b/device/lib/pic/libdev/pic16c925.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c925. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16c926.c b/device/lib/pic/libdev/pic16c926.c index 29c46c56..6929422c 100644 --- a/device/lib/pic/libdev/pic16c926.c +++ b/device/lib/pic/libdev/pic16c926.c @@ -1,13 +1,13 @@ /* Register definitions for pic16c926. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f627.c b/device/lib/pic/libdev/pic16f627.c index 0d247a9e..9c3228b4 100644 --- a/device/lib/pic/libdev/pic16f627.c +++ b/device/lib/pic/libdev/pic16f627.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f627. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f627a.c b/device/lib/pic/libdev/pic16f627a.c index e1024365..15c08155 100644 --- a/device/lib/pic/libdev/pic16f627a.c +++ b/device/lib/pic/libdev/pic16f627a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f627a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f628.c b/device/lib/pic/libdev/pic16f628.c index 9cbcb3b1..8f9e60e4 100644 --- a/device/lib/pic/libdev/pic16f628.c +++ b/device/lib/pic/libdev/pic16f628.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f628. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f628a.c b/device/lib/pic/libdev/pic16f628a.c index 59e910cb..f9ed439a 100644 --- a/device/lib/pic/libdev/pic16f628a.c +++ b/device/lib/pic/libdev/pic16f628a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f628a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f630.c b/device/lib/pic/libdev/pic16f630.c index 43cdb88b..47b67502 100644 --- a/device/lib/pic/libdev/pic16f630.c +++ b/device/lib/pic/libdev/pic16f630.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f630. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f636.c b/device/lib/pic/libdev/pic16f636.c index 59466f9c..309552f1 100644 --- a/device/lib/pic/libdev/pic16f636.c +++ b/device/lib/pic/libdev/pic16f636.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f636. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f639.c b/device/lib/pic/libdev/pic16f639.c index 72a9d214..97259861 100644 --- a/device/lib/pic/libdev/pic16f639.c +++ b/device/lib/pic/libdev/pic16f639.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f639. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f648a.c b/device/lib/pic/libdev/pic16f648a.c index b811d051..b7fd2f2d 100644 --- a/device/lib/pic/libdev/pic16f648a.c +++ b/device/lib/pic/libdev/pic16f648a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f648a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f676.c b/device/lib/pic/libdev/pic16f676.c index 761c4c4d..572a3b89 100644 --- a/device/lib/pic/libdev/pic16f676.c +++ b/device/lib/pic/libdev/pic16f676.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f676. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f684.c b/device/lib/pic/libdev/pic16f684.c index 6f8ee745..84da2a16 100644 --- a/device/lib/pic/libdev/pic16f684.c +++ b/device/lib/pic/libdev/pic16f684.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f684. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f685.c b/device/lib/pic/libdev/pic16f685.c index 5b5b07e8..3fe7833b 100644 --- a/device/lib/pic/libdev/pic16f685.c +++ b/device/lib/pic/libdev/pic16f685.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f685. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; @@ -46,6 +46,7 @@ __sfr __at (IOCA_ADDR) IOCA; __sfr __at (WDTCON_ADDR) WDTCON; __sfr __at (ADRESL_ADDR) ADRESL; __sfr __at (ADCON1_ADDR) ADCON1; +__sfr __at (EEDAT_ADDR) EEDAT; __sfr __at (EEDATA_ADDR) EEDATA; __sfr __at (EEADR_ADDR) EEADR; __sfr __at (EEDATH_ADDR) EEDATH; @@ -69,6 +70,7 @@ __sfr __at (SRCON_ADDR) SRCON; volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; diff --git a/device/lib/pic/libdev/pic16f687.c b/device/lib/pic/libdev/pic16f687.c index dced3246..e330b524 100644 --- a/device/lib/pic/libdev/pic16f687.c +++ b/device/lib/pic/libdev/pic16f687.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f687. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; @@ -51,6 +51,7 @@ __sfr __at (SPBRGH_ADDR) SPBRGH; __sfr __at (BAUDCTL_ADDR) BAUDCTL; __sfr __at (ADRESL_ADDR) ADRESL; __sfr __at (ADCON1_ADDR) ADCON1; +__sfr __at (EEDAT_ADDR) EEDAT; __sfr __at (EEDATA_ADDR) EEDATA; __sfr __at (EEADR_ADDR) EEADR; __sfr __at (EEDATH_ADDR) EEDATH; @@ -73,6 +74,7 @@ __sfr __at (SRCON_ADDR) SRCON; volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; diff --git a/device/lib/pic/libdev/pic16f688.c b/device/lib/pic/libdev/pic16f688.c index fb3dab8b..541791ad 100644 --- a/device/lib/pic/libdev/pic16f688.c +++ b/device/lib/pic/libdev/pic16f688.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f688. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f689.c b/device/lib/pic/libdev/pic16f689.c index 04e62024..f9191f7e 100644 --- a/device/lib/pic/libdev/pic16f689.c +++ b/device/lib/pic/libdev/pic16f689.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f689. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; @@ -51,6 +51,7 @@ __sfr __at (SPBRGH_ADDR) SPBRGH; __sfr __at (BAUDCTL_ADDR) BAUDCTL; __sfr __at (ADRESL_ADDR) ADRESL; __sfr __at (ADCON1_ADDR) ADCON1; +__sfr __at (EEDAT_ADDR) EEDAT; __sfr __at (EEDATA_ADDR) EEDATA; __sfr __at (EEADR_ADDR) EEADR; __sfr __at (EEDATH_ADDR) EEDATH; @@ -73,6 +74,7 @@ __sfr __at (SRCON_ADDR) SRCON; volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; volatile __CM2CON0_bits_t __at(CM2CON0_ADDR) CM2CON0_bits; diff --git a/device/lib/pic/libdev/pic16f690.c b/device/lib/pic/libdev/pic16f690.c index 6674368d..d431fc09 100644 --- a/device/lib/pic/libdev/pic16f690.c +++ b/device/lib/pic/libdev/pic16f690.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f690. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; @@ -59,6 +59,7 @@ __sfr __at (SPBRGH_ADDR) SPBRGH; __sfr __at (BAUDCTL_ADDR) BAUDCTL; __sfr __at (ADRESL_ADDR) ADRESL; __sfr __at (ADCON1_ADDR) ADCON1; +__sfr __at (EEDAT_ADDR) EEDAT; __sfr __at (EEDATA_ADDR) EEDATA; __sfr __at (EEADR_ADDR) EEADR; __sfr __at (EEDATH_ADDR) EEDATH; @@ -82,6 +83,7 @@ __sfr __at (SRCON_ADDR) SRCON; volatile __ADCON0_bits_t __at(ADCON0_ADDR) ADCON0_bits; volatile __ADCON1_bits_t __at(ADCON1_ADDR) ADCON1_bits; volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; +volatile __ANSELH_bits_t __at(ANSELH_ADDR) ANSELH_bits; volatile __BAUDCTL_bits_t __at(BAUDCTL_ADDR) BAUDCTL_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CM1CON0_bits_t __at(CM1CON0_ADDR) CM1CON0_bits; diff --git a/device/lib/pic/libdev/pic16f716.c b/device/lib/pic/libdev/pic16f716.c index b22efc71..bf3acdb2 100644 --- a/device/lib/pic/libdev/pic16f716.c +++ b/device/lib/pic/libdev/pic16f716.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f716. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f72.c b/device/lib/pic/libdev/pic16f72.c index 88ec320a..75d3b3ba 100644 --- a/device/lib/pic/libdev/pic16f72.c +++ b/device/lib/pic/libdev/pic16f72.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f72. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f73.c b/device/lib/pic/libdev/pic16f73.c index 3f9177d5..a5a788a8 100644 --- a/device/lib/pic/libdev/pic16f73.c +++ b/device/lib/pic/libdev/pic16f73.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f73. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f737.c b/device/lib/pic/libdev/pic16f737.c index 1b9c68ef..425ae1dd 100644 --- a/device/lib/pic/libdev/pic16f737.c +++ b/device/lib/pic/libdev/pic16f737.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f737. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f74.c b/device/lib/pic/libdev/pic16f74.c index cb8f33f1..02fb8704 100644 --- a/device/lib/pic/libdev/pic16f74.c +++ b/device/lib/pic/libdev/pic16f74.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f74. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f76.c b/device/lib/pic/libdev/pic16f76.c index f925201d..ccf01152 100644 --- a/device/lib/pic/libdev/pic16f76.c +++ b/device/lib/pic/libdev/pic16f76.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f76. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f767.c b/device/lib/pic/libdev/pic16f767.c index 0580d4e2..4912f7e6 100644 --- a/device/lib/pic/libdev/pic16f767.c +++ b/device/lib/pic/libdev/pic16f767.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f767. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f77.c b/device/lib/pic/libdev/pic16f77.c index 5ab45e72..abbf41c8 100644 --- a/device/lib/pic/libdev/pic16f77.c +++ b/device/lib/pic/libdev/pic16f77.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f77. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f777.c b/device/lib/pic/libdev/pic16f777.c index d173bcd1..b9ef8236 100644 --- a/device/lib/pic/libdev/pic16f777.c +++ b/device/lib/pic/libdev/pic16f777.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f777. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f785.c b/device/lib/pic/libdev/pic16f785.c index 66d473bb..35b2ba24 100644 --- a/device/lib/pic/libdev/pic16f785.c +++ b/device/lib/pic/libdev/pic16f785.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f785. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f818.c b/device/lib/pic/libdev/pic16f818.c index 5d210a1b..a9a030d0 100644 --- a/device/lib/pic/libdev/pic16f818.c +++ b/device/lib/pic/libdev/pic16f818.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f818. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f819.c b/device/lib/pic/libdev/pic16f819.c index f6417748..9c36d295 100644 --- a/device/lib/pic/libdev/pic16f819.c +++ b/device/lib/pic/libdev/pic16f819.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f819. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f84.c b/device/lib/pic/libdev/pic16f84.c index d529c6d5..dbb666af 100644 --- a/device/lib/pic/libdev/pic16f84.c +++ b/device/lib/pic/libdev/pic16f84.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f84. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f84a.c b/device/lib/pic/libdev/pic16f84a.c index d96e9008..edd87f97 100644 --- a/device/lib/pic/libdev/pic16f84a.c +++ b/device/lib/pic/libdev/pic16f84a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f84a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f87.c b/device/lib/pic/libdev/pic16f87.c index d99f4b8d..43254d8b 100644 --- a/device/lib/pic/libdev/pic16f87.c +++ b/device/lib/pic/libdev/pic16f87.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f87. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f870.c b/device/lib/pic/libdev/pic16f870.c index b8d81afd..780b1995 100644 --- a/device/lib/pic/libdev/pic16f870.c +++ b/device/lib/pic/libdev/pic16f870.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f870. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f871.c b/device/lib/pic/libdev/pic16f871.c index 36514c0d..942561ce 100644 --- a/device/lib/pic/libdev/pic16f871.c +++ b/device/lib/pic/libdev/pic16f871.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f871. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f872.c b/device/lib/pic/libdev/pic16f872.c index a2211099..109751ab 100644 --- a/device/lib/pic/libdev/pic16f872.c +++ b/device/lib/pic/libdev/pic16f872.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f872. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f873.c b/device/lib/pic/libdev/pic16f873.c index 5670d96a..24bcdc62 100644 --- a/device/lib/pic/libdev/pic16f873.c +++ b/device/lib/pic/libdev/pic16f873.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f873. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f873a.c b/device/lib/pic/libdev/pic16f873a.c index 976f58ae..42d73e0e 100644 --- a/device/lib/pic/libdev/pic16f873a.c +++ b/device/lib/pic/libdev/pic16f873a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f873a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f874.c b/device/lib/pic/libdev/pic16f874.c index 211b19b1..378f1b09 100644 --- a/device/lib/pic/libdev/pic16f874.c +++ b/device/lib/pic/libdev/pic16f874.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f874. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f874a.c b/device/lib/pic/libdev/pic16f874a.c index eea92fc1..1a2d9476 100644 --- a/device/lib/pic/libdev/pic16f874a.c +++ b/device/lib/pic/libdev/pic16f874a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f874a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f876.c b/device/lib/pic/libdev/pic16f876.c index 33d5c81f..baaea1f6 100644 --- a/device/lib/pic/libdev/pic16f876.c +++ b/device/lib/pic/libdev/pic16f876.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f876. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f876a.c b/device/lib/pic/libdev/pic16f876a.c index 9d7f1e78..e64cbd57 100644 --- a/device/lib/pic/libdev/pic16f876a.c +++ b/device/lib/pic/libdev/pic16f876a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f876a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f877.c b/device/lib/pic/libdev/pic16f877.c index 6f7ae888..89b81ac6 100644 --- a/device/lib/pic/libdev/pic16f877.c +++ b/device/lib/pic/libdev/pic16f877.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f877. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f877a.c b/device/lib/pic/libdev/pic16f877a.c index 84241fd8..e23cbea5 100644 --- a/device/lib/pic/libdev/pic16f877a.c +++ b/device/lib/pic/libdev/pic16f877a.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f877a. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f88.c b/device/lib/pic/libdev/pic16f88.c index a6ccf8b0..ca8a067e 100644 --- a/device/lib/pic/libdev/pic16f88.c +++ b/device/lib/pic/libdev/pic16f88.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f88. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; diff --git a/device/lib/pic/libdev/pic16f913.c b/device/lib/pic/libdev/pic16f913.c index cf21bd00..b6daccd2 100644 --- a/device/lib/pic/libdev/pic16f913.c +++ b/device/lib/pic/libdev/pic16f913.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f913. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; @@ -88,6 +88,8 @@ volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; +volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; diff --git a/device/lib/pic/libdev/pic16f914.c b/device/lib/pic/libdev/pic16f914.c index 91b56d7a..34be36bc 100644 --- a/device/lib/pic/libdev/pic16f914.c +++ b/device/lib/pic/libdev/pic16f914.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f914. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; @@ -99,6 +99,8 @@ volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; +volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; diff --git a/device/lib/pic/libdev/pic16f916.c b/device/lib/pic/libdev/pic16f916.c index d2a201f2..9addbbbd 100644 --- a/device/lib/pic/libdev/pic16f916.c +++ b/device/lib/pic/libdev/pic16f916.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f916. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; @@ -88,6 +88,8 @@ volatile __ANSEL_bits_t __at(ANSEL_ADDR) ANSEL_bits; volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; +volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; diff --git a/device/lib/pic/libdev/pic16f917.c b/device/lib/pic/libdev/pic16f917.c index 099913f0..565c063e 100644 --- a/device/lib/pic/libdev/pic16f917.c +++ b/device/lib/pic/libdev/pic16f917.c @@ -1,13 +1,13 @@ /* Register definitions for pic16f917. * This file was automatically generated by: - * inc2h.pl V4514 + * inc2h.pl V4585 * Copyright (c) 2002, Kevin L. Pauba, All Rights Reserved */ #include -__data __at (INDF_ADDR) volatile char INDF; +__sfr __at (INDF_ADDR) INDF; __sfr __at (TMR0_ADDR) TMR0; -__data __at (PCL_ADDR) volatile char PCL; +__sfr __at (PCL_ADDR) PCL; __sfr __at (STATUS_ADDR) STATUS; __sfr __at (FSR_ADDR) FSR; __sfr __at (PORTA_ADDR) PORTA; @@ -99,6 +99,8 @@ volatile __CCP1CON_bits_t __at(CCP1CON_ADDR) CCP1CON_bits; volatile __CCP2CON_bits_t __at(CCP2CON_ADDR) CCP2CON_bits; volatile __CMCON0_bits_t __at(CMCON0_ADDR) CMCON0_bits; volatile __CMCON1_bits_t __at(CMCON1_ADDR) CMCON1_bits; +volatile __EEADRH_bits_t __at(EEADRH_ADDR) EEADRH_bits; +volatile __EEADRL_bits_t __at(EEADRL_ADDR) EEADRL_bits; volatile __EECON1_bits_t __at(EECON1_ADDR) EECON1_bits; volatile __INTCON_bits_t __at(INTCON_ADDR) INTCON_bits; volatile __IOC_bits_t __at(IOC_ADDR) IOC_bits; diff --git a/support/scripts/inc2h.pl b/support/scripts/inc2h.pl index 02dce1ca..5a242e3f 100755 --- a/support/scripts/inc2h.pl +++ b/support/scripts/inc2h.pl @@ -1,4 +1,6 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w + +use strict; # Copyright (c) 2002 Kevin L. Pauba @@ -10,23 +12,70 @@ # but explicitly does not cover any code or objects generated by sdcc. # We have not yet decided on a license for the run time libraries, but # it will not put any requirements on code linked against it. See: -# +# # http://www.gnu.org/copyleft/gpl.html # # See http://sdcc.sourceforge.net/ for the latest information on sdcc. - -$rcsid = q~$Id$~; -($junk, $file, $version, $date, $time, $programmer, $status) +##################################################################### +# >>> How to add a new device to SDCC PIC14 port? +# +# This description assumes that you have a copy of SDCC's sources +# in /path/to/sdcc and a (source or installed) version of gputils +# in /path/to/gputils (the only important point here is that +# /path/to/gputils/headers must exist and contain "p.inc"). +# Furthermore, I assume you want to add support for the 16f887 device +# (note: no 'pic' or 'p' prefix!), change this as desired. +# inc2h.pl can only deal with one single device at a time; repeat the +# ../inc2h.pl-step as often as required. +# +# The proposed sequence of commands is then: +# +# $ cd /path/to/sdcc/support/scripts +# $ mkdir build && cd build +# $ ../inc2h.pl 16f887 /path/to/gputils +# $ mv pic16f887.c /path/to/sdcc/device/lib/pic/libdev +# $ mv pic16f887.h /path/to/sdcc/device/include/pic +# $ vim /path/to/sdcc/device/include/pic/pic14devices.inc +# +# # Use any pure text editor you like (`[Esc]:q![Enter]' quits Vim ;-)). +# # Add a record for the new device to the file; usually you can copy +# # the record of a similar device and adjust the values using the +# # datasheet. The format of pic14devices.txt is explained in the file +# # itself. Please keep the file sorted. +# # When you are done: +# +# $ cd /path/to/sdcc/device/lib +# $ make model-pic14 +# $ make install +# +# Congratulations, you have just added support for a new device to +# the port. You may consider posting your (changes to) +# pic14devices.txt and the generated files (picDEVICE.[ch]) to +# have them included into the official source tree. +# Some testing beforehand would be appreciated, though. +##################################################################### + +my $rcsid = q~$Id$~; +my ($junk, $file, $version, $date, $time, $programmer, $status) = split(/\s+/, $rcsid); -($programName) = ($file =~ /(\S+)/); +my ($programName) = ($file =~ /(\S+)/); if ($#ARGV < 0 || $#ARGV > 1 ) { Usage(); } -$processor = uc(shift); -$path = shift; - +my $processor = uc(shift); +my $path = shift; +my %sfrs = (); +my %alias = (); +my %bits = (); +my %bitmasks = (); +my %addr = (); +my %ram = (); +my $path_delim = "/"; +my $devices = ""; +my %types = (); +my $type = ""; # just in time fixes for some register names sub fixname { @@ -55,7 +104,7 @@ sub checkname { print " but ".$name."0 exists---using that instead.\n"; return $name."0"; } - $try = $name; + my $try = $name; $try =~ s/[0-9]$//; if (exists $sfrs{$try}) { print " but $try exists---using that instead.\n"; @@ -78,6 +127,7 @@ sub contained { } +$path = "" if (!defined $path); if ($^O eq 'MSWin32') { if ($path eq '') { if (defined($path = $ENV{'GPUTILS_HEADER_PATH'}) || defined($path = $ENV{'GPUTILS_LKR_PATH'})) { @@ -125,22 +175,22 @@ while () { # of all registers. # # $addr{"$1"} = $2; - foreach $device (split(/[,\s]+/, $devices)) { + foreach my $device (split(/[,\s]+/, $devices)) { $addr{"p$device", "$1"} = $2; } } elsif (/^\s*bitmask\s+(\S+)\s+/) { # # Set the bitmask that will be used in the 'memmap' pragma. # - $bitmask = "$1"; - foreach $register (split(/\s+/, $')) { - $bitmask{"$register"} = $bitmask; + my $bitmask = "$1"; + foreach my $register (split(/\s+/, $')) { + $bitmasks{"$register"} = $bitmask; } } elsif (/^\s*ram\s+(\S+)\s+(\S+)\s+(\S+)/) { # This info is now provided in "include/pic/pic14devices.txt". #$lo = $1; #$hi = $2; - #$bitmask = $3; + #my $bitmask = $3; #foreach $device (split(/[,\s]+/, $devices)) { # $ram{"p$device"} .= "#pragma memmap $lo $hi RAM $bitmask$'"; #} @@ -150,12 +200,12 @@ while () { } elsif (/^\s*(\S+)/) { $type = $1; $_ = $'; - foreach $key (split) { - eval "\$type{'$key'} = $type;"; + foreach my $key (split) { + eval "\$types{'$key'} = $type;"; } } else { - foreach $key (split) { - eval "\$type{'$key'} = $type;"; + foreach my $key (split) { + eval "\$types{'$key'} = $type;"; } } } @@ -184,8 +234,8 @@ while () { # } # Create header for pic${processor}.c file -$lcproc = "pic" . lc($processor); -$c_head = <) { } elsif (/^;-+\s*(\S+)\s+Bits/i || /^;-+\s*(\S+)\s+-+/i) { # The second case is usually bits, but the word Bits is missing # also accept "UIE/UIR Bits" - foreach $name (split(/\//, $1)) { + foreach my $name (split(/\//, $1)) { $name = fixname($name); $name = checkname($name); @@ -246,26 +301,27 @@ while (
) { # # Useful bit of information. # - $name = $1; - $value = $2; - $rest = $'; + my $name = $1; + my $value = $2; + my $rest = $'; + my $bitmask = "0x0000"; + $rest =~ s/;/\/\//; chomp($rest); - if (defined($type{"p$processor", "$name"})) { - $type = $type{"p$processor", "$name"}; - } elsif (defined($type{"$name"})) { - $type = $type{"$name"}; + if (defined($types{"p$processor", "$name"})) { + $type = $types{"p$processor", "$name"}; + } elsif (defined($types{"$name"})) { + $type = $types{"$name"}; } else { $type = $defaultType; } + #print "$name --> $type\n"; ## DEBUG - if (defined($bitmask{"p$processor", "$name"})) { - $bitmask = $bitmask{"p$processor", "$name"}; -# } elsif (defined($bitmask{"$name"})) { -# $bitmask = $bitmask{"$name"}; - } else { - $bitmask = "0x000"; + if (defined($bitmasks{"p$processor", "$name"})) { + $bitmask = $bitmasks{"p$processor", "$name"}; +# } elsif (defined($bitmasks{"$name"})) { +# $bitmask = $bitmasks{"$name"}; } if ($type eq 'sfr') { @@ -302,11 +358,24 @@ while (
) { $addresses .= sprintf("#define %s_ADDR\t0x%s\n", $name, $value); } } elsif ($type =~ /^bits/) { - ($junk, $register) = split(/\s/, $type); - $bit = hex($value); - $addr = $addr{"$register"}; + my ($junk, $register) = split(/\s/, $type); + my $bit = hex($value); + my $addr = $addr{"$register"}; + # prepare struct declaration - for ($k=0; $k < scalar @{$bits{"$register"}->{oct($bit)}}; $k++) { + if (0) { # DEBUG + foreach my $key (keys %bits) { + print " $key\n"; + } + print "$register // $bit // ".$bits{"$register"}."\n"; + } + if (!defined $bits{"$register"}) { + $bits{"$register"} = {}; # reference to empty hash + } + if (!defined $bits{"$register"}->{oct($bit)}) { + $bits{"$register"}->{oct($bit)} = []; # reference to empty array + } + for (my $k=0; $k < scalar @{$bits{"$register"}->{oct($bit)}}; $k++) { $name = "" if ($bits{"$register"}->{oct($bit)} eq $name) } if (($name ne "") @@ -340,7 +409,10 @@ while (
) { # $body .= "\n"; } elsif (/__MAXRAM\s+H'([0-9a-fA-F]+)'/) { - $maxram .= "//\n// Memory organization.\n//\n"; + my $maxram .= "//\n// Memory organization.\n//\n"; + if (!defined $ram{"p$processor"}) { + $ram{"p$processor"} = ""; + } $pragmas = $maxram . $ram{"p$processor"} . "\n" . $pragmas; @@ -436,18 +508,26 @@ EOT } } -$structs = ""; +my $structs = ""; ## create struct declarations -foreach $reg (sort keys %bits) +foreach my $reg (sort keys %bits) { $structs .= "// ----- $reg bits --------------------\n"; $structs .= "typedef union {\n"; - $idx = 0; $max = 1; + my $idx = 0; + my $max = 1; do { $structs .= " struct {\n"; - for ($i=0; $i < 8; $i++) + for (my $i=0; $i < 8; $i++) { - @names = @{$bits{$reg}->{oct($i)}}; + if (!defined $bits{$reg}) { + #print "bits{$reg} undefined\n"; + } + if (!defined $bits{$reg}->{oct($i)}) { + #print "bits{$reg}->{".oct($i)."} undefined\n"; + $bits{$reg}->{oct($i)} = []; # empty array reference + } + my @names = @{$bits{$reg}->{oct($i)}}; if ($max < scalar @names) { $max = scalar @names; } if ($idx >= scalar @names) { $structs .= " unsigned char :1;\n"; @@ -471,10 +551,10 @@ foreach $reg (sort keys %bits) #} # emit defines for individual bits - for ($i=0; $i < 8; $i++) + for (my $i=0; $i < 8; $i++) { - @names = @{$bits{$reg}->{oct($i)}}; - foreach $field (@names) { + my @names = @{$bits{$reg}->{oct($i)}}; + foreach my $field (@names) { $structs .= sprintf("#define %-20s ${reg}_bits.$field\n", $field); } # foreach } -- 2.30.2