* device/include/pic16/pic18fregs.h, 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 739d56397144b984c0554d3190711c7e516123e0..4375b459489880d2c6c52fea4593e58cfdfa8f0b 100644 (file)
--- a/device/include/pic16/pic18fregs.h
+++ b/device/include/pic16/pic18fregs.h
@@ -43,12 +43,26 @@
 #elif defined(pic18f1220)
 #  include <pic18f1220.h>
 
+#elif defined(pic18f1320)
+# include <pic18f1220.h>       /* Yes, it's 1220.h */
+
 #elif defined(pic18f2220)
 #  include <pic18f2220.h>
+#elif defined(pic18f2320)
+#  include <pic18f2220.h>      /* Yes, it's 2220.h */
+
+#elif defined(pic18f2455)
+#  include <pic18f2455.h>
 
 #elif defined(pic18f2550)
 #  include <pic18f2550.h>
 
+#elif defined(pic18f4220)
+#  include <pic18f4220.h>
+
+#elif defined(pic18f4320)
+#  include <pic18f4220.h>      /* Yes, it's 4220.h */
+
 #elif defined(pic18f4331)
 #  include <pic18f4331.h>
 
@@ -88,10 +102,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__ */