Diff: Bios/bios.h

Revision:

26:a65fbb4bde5c

Parent:

22:1a58a518435c

Child:

28:8ae20cb0b943

--- a/Bios/bios.h	Tue Jan 20 09:11:28 2015 +0100
+++ b/Bios/bios.h	Thu Jan 22 16:04:54 2015 +0100
@@ -5,7 +5,8 @@
 #include <stdbool.h>
 
 #define BIOS_MAGIC  0xEA0123EA
-#define BIOS_VER      1
+#define BIOS_VER      0x000100  // MAJOR.MINOR.BUILD
+#define BIOS_VER_MASK 0xffffff
 
 typedef enum {
     BiosError_Ok            =  0,
@@ -53,7 +54,10 @@
                                  uint8_t* numPoints);
 
 typedef void (*touchIrqFunc)(uint32_t arg, bool enable, bool rising);
-typedef BiosError_t (*touchInitFunc)(void* data, touchIrqFunc irqEnabler, uint32_t enablerArg);
+typedef void (*touchNewDataFunc)(uint32_t arg, touch_coordinate_t* coords, int num);
+typedef BiosError_t (*touchInitFunc)(void* data, 
+                                     touchIrqFunc irqEnabler, uint32_t enablerArg, 
+                                     touchNewDataFunc newData, uint32_t newDataArg);
 typedef BiosError_t (*readFunc)(void* data, touch_coordinate_t* coords, int num);
 typedef BiosError_t (*nextFunc)(void* data, uint16_t* x, uint16_t* y, bool* last);
 typedef BiosError_t (*waitCalibFunc)(void* data, bool* morePoints, uint32_t timeoutMs);
@@ -77,6 +81,8 @@
   waitCalibFunc touchWaitForCalibratePoint;
   simpleFunc    touchIrqHandler;
   infoFuncT     touchInformation;
+
+  simpleFunc    touchI2CIRQHandler;
     
   spifiFunc     spifiIsSupported;
 } bios_header_t;