#include <htc.h>
-#define RUNAT32MHZ /* else 16 MHz */
-
-#if defined(RUNAT32MHZ)
__CONFIG(WDTE_OFF & FOSC_INTOSC);
-__CONFIG(LVP_OFF & PLLEN_ON);
-#else
-__CONFIG(WDTE_OFF);
__CONFIG(LVP_OFF);
-#endif
void pic_init()
{
-#if defined(RUNAT32MHZ)
- OSCCON = 0b11110000;
-#else /* 16 MHz */
- OSCCON = 0b01111010;
-#endif
+ /* Setting below must match _XTAL_FREQ in picinit.h */
+ OSCCON = 0b01100000;
/* OSCSTAT.HFIOFL is set when oscillator is locked (accurate within 2%) */
while (!HFIOFL);