[POWER] Wait correct time on idle(), idle_time_ms().

[openi2cradio/OpenI2CRadio.git] / iodef.h

diff --git a/iodef.h b/iodef.h
index 5942793..879d297 100644 (file)
--- a/iodef.h
+++ b/iodef.h
@@ -63,17 +63,18 @@ extern "C" {
 #define _PIO_HAS_FIVE
 #endif
 #else // __XC
-#if defined(__18F23K22) || defined(__18F24k22) || defined(__18F25K22) || defined(__18F26K22)
+
+#if defined(_18F23K22) || defined(_18F24K22) || defined(_18F25K22) || defined(_18F26K22)
 #define _I2C_IO_TWO_MSSPS
 #define _PIO_HAS_THREE
 #endif
 
-#if defined(__18F23K20) || defined(__18F24K20) || defined(__18F25K20) || defined(__18F26K20)
+#if defined(_18F23K20) || defined(_18F24K20) || defined(_18F25K20) || defined(_18F26K20)
 #define _I2C_IO_ONE_MSSP
 #define _PIO_HAS_THREE
 #endif
 
-#if defined(__18F43K20) || defined(__18F44K20) || defined(__18F45K20) || defined(__18F46K20)
+#if defined(_18F43K20) || defined(_18F44K20) || defined(_18F45K20) || defined(_18F46K20)
 #define _I2C_IO_ONE_MSSP
 #define _PIO_HAS_FIVE
 #endif
@@ -249,16 +250,16 @@ enum {
  *        RD2 : EN
  *        RD4-RD7: DATA(4-7).
  */
- #ifndef _LCDPORT_DATA
+#ifndef _LCDPORT_DATA
 #define _LCDPORT_DATA PORTD
 #define _LCDPORT_TRIS_DATA TRISD
 #define _LCDPORT_LATCH_DATA LATD
 #define _LCDPORT_BUSYMASK 0b10000000
 #define _LCDPORT_READMASK TRIS_D_RVAL
 #define _LCDPORT_DATA_SHIFT 4
- #endif
+#endif
 
- #ifndef _LCDPORT_CONT
+#ifndef _LCDPORT_CONT
 #define _LCDPORT_CONT PORTD
 #define _LCDPORT_TRIS_CONT TRISD
 #define _LCDPORT_CONT_LATCH LATD
@@ -266,15 +267,9 @@ enum {
 #define _LCDPORT_CONT_RWbit b1
 #define _LCDPORT_CONT_ENbit b2
 #define _LCDPORT_CONT_BLbit b3
-#ifdef __SDCC
 #define _LCDPORT_CONT_RS LATDbits.LATD0
 #define _LCDPORT_CONT_RW LATDbits.LATD1
 #define _LCDPORT_CONT_EN LATDbits.LATD2
-#else
-#define _LCDPORT_CONT_RS _PORTD_RD0_MASK
-#define _LCDPORT_CONT_RW _PORTD_RD1_MASK
-#define _LCDPORT_CONT_EN _PORTD_RD2_MASK
-#endif
 #endif
 
 #else