Include file refactor

Examples/src/adctest.c

@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "easypdk/pdk.h" 
+#include "pdk/io.h"
 
 volatile uint16_t txdata;                       //txdata, serial data shift register
 
@@ -33,9 +33,9 @@ int putchar(int c)
 
 unsigned char _sdcc_external_startup(void)
 {
-  EASY_PDK_INIT_SYSCLOCK_8MHZ();                //use 8MHz sysclock
-  EASY_PDK_USE_FACTORY_IHRCR_16MHZ()            //use factory IHCR tuning value (tuned for 8MHz SYSCLK @ 5.0V)
-  EASY_PDK_USE_FACTORY_BGTR();                  //use factory BandGap tuning value (tuned @ 5.0V)
+  PDK_USE_8MHZ_IHRC_SYSCLOCK();                 //use 8MHz sysclock
+  PDK_USE_FACTORY_IHRCR_16MHZ()                 //use factory IHCR tuning value (tuned for 8MHz SYSCLK @ 5.0V)
+  PDK_USE_FACTORY_BGTR();                       //use factory BandGap tuning value (tuned @ 5.0V)
   return 0;                                     //perform normal initialization
 }
 

Examples/src/calib-and-fuse-demo.c

@@ -1,13 +1,14 @@
 #include <stdint.h>
-#include "easypdk/pdk.h"
+#include "pdk/io.h"
+#include "easy-pdk/calibrate.h"
 
 unsigned char _sdcc_external_startup(void)
 {
   //
   // F U S E S
   //
-  // Set specific FUSES (defines in IC specific header file, e.g. "easypdk/pfs173.h"), easypdk programmer will set FUSE values after writing
-  EASY_PDK_FUSE(FUSE_SECURITY_OFF|FUSE_BOOTUP_FAST);
+  // Set specific FUSES (defines in IC specific header file, e.g. "pdk/io_pfs173.h"), easypdk programmer will set FUSE values after writing
+  PDK_SET_FUSE(FUSE_SECURITY_OFF|FUSE_BOOTUP_FAST);
 
   //
   // C A L I B R A T I O N S
@@ -17,48 +18,48 @@ unsigned char _sdcc_external_startup(void)
   // SYSCLK setup and calibration (Your application should use only one of the IHRC and/or ILRC setup and claibrations).
 
   // setup ILRC as sysclock and let easypdk programmer do the calibration (after writing)
-  EASY_PDK_INIT_SYSCLOCK_ILRC();                //use ILRC as sysclock, 60-96kHz, depends on IC variant
+  PDK_USE_ILRC_SYSCLOCK();                      //use ILRC as sysclock, 60-96kHz, depends on IC variant
   EASY_PDK_CALIBRATE_ILRC(ILRC_FREQ,4000);      //tune SYSCLK to 95kHz @ 4.000V (value for PFS173)
 
   // setup ILRC/4 as sysclock and let easypdk programmer do the calibration (after writing)
-  EASY_PDK_INIT_SYSCLOCK_ILRC_DIV4();           //use ILRC/4 as sysclock, 15-24kHz, depends on IC variant
+  PDK_USE_ILRC_DIV4_SYSCLOCK();                 //use ILRC/4 as sysclock, 15-24kHz, depends on IC variant
   EASY_PDK_CALIBRATE_ILRC(ILRC_FREQ/4,3300);    //tune SYSCLK to 24kHz @ 3.300V (value for PFS173)
 
 #if defined(CLKMD_ILRC_DIV16)
   // setup ILRC/16 as sysclock and let easypdk programmer do the calibration (after writing)
-  EASY_PDK_INIT_SYSCLOCK_ILRC_DIV16();          //use ILRC/16 as sysclock, 4-6kHz, depends on IC variant
+  PDK_USE_ILRC_DIV16_SYSCLOCK();                //use ILRC/16 as sysclock, 4-6kHz, depends on IC variant
   EASY_PDK_CALIBRATE_ILRC(ILRC_FREQ/16,3000);   //tune SYSCLK to 6kHz @ 3.000V (value for PFS173)
 #endif
 
 #if defined(PFS154) || defined(PFS172) || defined(PFS173)
   // setup 8MHz sysclock and use factory calibration (available on PFS154 and PFS173)
-  EASY_PDK_INIT_SYSCLOCK_8MHZ();                //use 8MHz sysclock
-  EASY_PDK_USE_FACTORY_IHRCR_16MHZ();           //use factory calibration value
+  PDK_USE_8MHZ_IHRC_SYSCLOCK();                 //use 8MHz sysclock
+  PDK_USE_FACTORY_IHRCR_16MHZ();                //use factory calibration value
 #endif
 
   // setup 8MHz sysclock and let easypdk programmer do the calibration (after writing)
-  EASY_PDK_INIT_SYSCLOCK_8MHZ();                //use 8MHz sysclock
+  PDK_USE_8MHZ_IHRC_SYSCLOCK();                 //use 8MHz sysclock
   EASY_PDK_CALIBRATE_IHRC(8000000,5000);        //tune SYSCLK to 8MHz @ 5.000V
 
   // setup 4MHz sysclock and let easypdk programmer do the calibration (after writing)
-  EASY_PDK_INIT_SYSCLOCK_4MHZ();                //use 4MHz sysclock
+  PDK_USE_4MHZ_IHRC_SYSCLOCK();                 //use 4MHz sysclock
   EASY_PDK_CALIBRATE_IHRC(4000000,4500);        //tune SYSCLK to 4MHz @ 4.500V
 
   // setup 2MHz sysclock and let easypdk programmer do the calibration (after writing)
-  EASY_PDK_INIT_SYSCLOCK_2MHZ();                //use 2MHz sysclock
+  PDK_USE_2MHZ_IHRC_SYSCLOCK();                 //use 2MHz sysclock
   EASY_PDK_CALIBRATE_IHRC(2000000,4000);        //tune SYSCLK to 4MHz @ 4.000V
 
   // setup 1MHz sysclock and let easypdk programmer do the calibration (after writing)
-  EASY_PDK_INIT_SYSCLOCK_1MHZ();                //use 1MHz sysclock
+  PDK_USE_1MHZ_IHRC_SYSCLOCK();                 //use 1MHz sysclock
   EASY_PDK_CALIBRATE_IHRC(1000000,3300);        //tune SYSCLK to 1MHz @ 3.300V
 
   // setup 500kHz sysclock and let easypdk programmer do the calibration (after writing)
-  EASY_PDK_INIT_SYSCLOCK_500KHZ();              //use 500KHZ sysclock
+  PDK_USE_500KHZ_IHRC_SYSCLOCK();               //use 500KHZ sysclock
   EASY_PDK_CALIBRATE_IHRC(500000,3000);         //tune SYSCLK to 500kHz @ 3.000V
 
 
   // BANDGAP calibration:
-  EASY_PDK_USE_FACTORY_BGTR();                  //use factory BandGap calibration value
+  PDK_USE_FACTORY_BGTR();                       //use factory BandGap calibration value
                                                 // -OR-
   EASY_PDK_CALIBRATE_BG();                      //let easypdk progammer do the bandgap calibration (after writing) - bandgap tuning requires any IHRC SYSCLK
 

Examples/src/comptest.c

@@ -8,7 +8,8 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include "easypdk/pdk.h" 
+#include "pdk/io.h"
+#include "easy-pdk/calibrate.h"
 
 volatile uint16_t txdata;                       //txdata, serial data shift register
 
@@ -39,9 +40,9 @@ int putchar(int c)
 
 unsigned char _sdcc_external_startup(void)
 {
-  EASY_PDK_INIT_SYSCLOCK_1MHZ();                //use 1MHz sysclock
+  PDK_USE_1MHZ_IHRC_SYSCLOCK();                 //use 1MHz sysclock
   EASY_PDK_CALIBRATE_IHRC(1000000,5000);        //tune SYSCLK to 1MHz @ 5.000V
-  EASY_PDK_USE_FACTORY_BGTR();                  //use factory BandGap tuning value (tuned @ 5.0V)
+  PDK_USE_FACTORY_BGTR();                       //use factory BandGap tuning value (tuned @ 5.0V)
   return 0;                                     //perform normal initialization
 }
 

Examples/src/easy-pdk/calibrate.h

@@ -0,0 +1,48 @@
+#ifndef __EASY_PDK_CALIBRATE_H__
+#define __EASY_PDK_CALIBRATE_H__
+
+#if !defined(__PDK_IO_H__)
+#  error "You must #include "pdk/io.h" "
+#endif
+
+//place holder for EASYPDK calibrations executed / replaced by easypdkprog
+#define EASY_PDK_CALIBRATE_IHRC(frequency,millivolt)  EASY_PDK_CALIBRATE_RC_M(EASY_PDK_CALTYPE_IHRC, IHRCR_ADDR, frequency, millivolt)
+#define EASY_PDK_CALIBRATE_ILRC(frequency,millivolt)  EASY_PDK_CALIBRATE_RC_M(EASY_PDK_CALTYPE_ILRC, ILRCR_ADDR, frequency, millivolt)
+#define EASY_PDK_CALIBRATE_BG()                       EASY_PDK_CALIBRATE_BG_M(BGTR_ADDR, GPCC_ADDR, GPCS_ADDR)
+
+#define EASY_PDK_CALTYPE_IHRC 1
+#define EASY_PDK_CALTYPE_ILRC 2
+
+#define EASY_PDK_CALIBRATE_RC_M(type,reg,frequency,millivolt) \
+__asm__(                                 \
+  "and a, #'R'                        \n"\
+  "and a, #'C'                        \n"\
+  "and a, #(("_ASMD(type)"))          \n"\
+  "and a, #(("_ASMD(frequency)"))     \n"\
+  "and a, #(("_ASMD(frequency)")>>8)  \n"\
+  "and a, #(("_ASMD(frequency)")>>16) \n"\
+  "and a, #(("_ASMD(frequency)")>>24) \n"\
+  "and a, #(("_ASMD(millivolt)"))     \n"\
+  "and a, #(("_ASMD(millivolt)")>>8)  \n"\
+  "and a, #(("_ASMD(reg)")>>8)        \n"\
+)
+
+#define EASY_PDK_CALIBRATE_BG_M(bgtr,gpcc,gpcs) \
+__asm__(                                 \
+  "and a, #'B'                        \n"\
+  "and a, #'G'                        \n"\
+  "and a, #(3)                        \n"\
+  "and a, #(3950)                     \n"\
+  "and a, #(3950>>8)                  \n"\
+  "and a, #(("_ASMD(bgtr)"))          \n"\
+  "and a, #(("_ASMD(gpcc)"))          \n"\
+  "and a, #(("_ASMD(gpcs)"))          \n"\
+  "and a, #0                          \n"\
+  "and a, #0                          \n"\
+  "and a, #0                          \n"\
+  "and a, #0                          \n"\
+  "and a, #0                          \n"\
+  "and a, #0                          \n"\
+)
+
+#endif //__EASY_PDK_CALIBRATE_H__

Examples/src/easy-pdk/serial_num.h

@@ -0,0 +1,7 @@
+#ifndef __EASY_PDK_SERIAL_NUM_H__
+#define __EASY_PDK_SERIAL_NUM_H__
+
+//place holder for EASYPDK serial inserted from easypdkprog
+#define EASY_PDK_SERIAL_NUM(sname) static const uint8_t sname[8] = {'F','P','S','E','R','I','A','L'}
+
+#endif //__EASY_PDK_SERIAL_NUM_H__