* src/pic16/devices.inc,

[fw/sdcc] / device / include / pic16 / pic18fregs.h

diff --git a/device/include/pic16/pic18fregs.h b/device/include/pic16/pic18fregs.h
index 89fd6f61a49a34e38e0ccc6bfedd7bf01f1903c1..d6e6c1dfbe26cb35ac7ad0c7276f04d9e80ad231 100644 (file)
--- a/device/include/pic16/pic18fregs.h
+++ b/device/include/pic16/pic18fregs.h
@@ -43,9 +43,93 @@
 #elif defined(pic18f1220)
 #  include <pic18f1220.h>
 
+#elif defined(pic18f1320)
+# include <pic18f1220.h>       /* Yes, it's 1220.h */
+
 #elif defined(pic18f2220)
 #  include <pic18f2220.h>
 
+#elif defined(pic18f2221)
+#  include <pic18f2221.h>
+
+#elif defined(pic18f2320)
+#  include <pic18f2220.h>      /* Yes, it's 2220.h */
+
+#elif defined(pic18f2321)
+#  include <pic18f2321.h>
+
+#elif defined(pic18f2331)
+#  include <pic18f2331.h>
+
+#elif defined(pic18f2420)
+#  include <pic18f2420.h>
+
+#elif defined(pic18f2431)
+#  include <pic18f2431.h>
+
+#elif defined(pic18f2455)
+#  include <pic18f2455.h>
+
+#elif defined(pic18f24j10)
+#  include <pic18f24j10.h>
+
+#elif defined(pic18f2520)
+#  include <pic18f2520.h>
+
+#elif defined(pic18f2525)
+#  include <pic18f2620.h>   /* just a 2620 core with less flash */
+
+#elif defined(pic18f2550)
+#  include <pic18f2550.h>
+
+#elif defined(pic18f25j10)
+#  include <pic18f25j10.h>
+
+#elif defined(pic18f2620)
+#  include <pic18f2620.h>
+
+#elif defined(pic18f4220)
+#  include <pic18f4220.h>
+
+#elif defined(pic18f4221)
+#  include <pic18f4221.h>
+
+#elif defined(pic18f4320)
+#  include <pic18f4220.h>      /* Yes, it's 4220.h */
+
+#elif defined(pic18f4321)
+#  include <pic18f4321.h>
+
+#elif defined(pic18f4331)
+#  include <pic18f4331.h>
+
+#elif defined(pic18f4420)
+#  include <pic18f4420.h>
+
+#elif defined(pic18f4431)
+#  include <pic18f4431.h>
+
+#elif defined(pic18f4455)
+#  include <pic18f4455.h>
+
+#elif defined(pic18f44j10)
+#  include <pic18f44j10.h>
+
+#elif defined(pic18f4520)
+#  include <pic18f4520.h>
+
+#elif defined(pic18f4525)
+#  include <pic18f4620.h>   /* just a 4620 core with less flash */
+
+#elif defined(pic18f4550)
+#  include <pic18f4550.h>      /* Might use 2550.h */
+
+#elif defined(pic18f45j10)
+#  include <pic18f45j10.h>
+
+#elif defined(pic18f4620)
+#  include <pic18f4620.h>
+
 #elif defined(pic18f6520)
 #  include <pic18f6520.h>
 
@@ -76,10 +160,10 @@
 #endif
 
 
-#define Nop()           { _asm nop _endasm; }
-#define ClrWdt()        { _asm clrwdt _endasm; }
-#define Sleep()         { _asm sleep _endasm; }
-#define Reset()         { _asm reset _endasm; }
+#define Nop()           do { __asm nop __endasm; } while(0)
+#define ClrWdt()        do { __asm clrwdt __endasm; } while(0)
+#define Sleep()         do { __asm sleep __endasm; } while(0)
+#define Reset()         do { __asm reset __endasm; } while(0)
 
 
 #endif /* __PIC18FREGS_H__ */