#elif defined(pic18f2321)
# include <pic18f2321.h>
+#elif defined(pic18f2331)
+# include <pic18f2331.h>
+
+#elif defined(pic18f2431)
+# include <pic18f2431.h>
+
#elif defined(pic18f2455)
# include <pic18f2455.h>
#elif defined(pic18f4331)
# include <pic18f4331.h>
+#elif defined(pic18f4431)
+# include <pic18f4431.h>
+
#elif defined(pic18f4455)
# include <pic18f4455.h>
#endif
-#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)
+#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__ */