Переглянути джерело

tiny/usiTwiSlave.h/c : Make usi_onRequestPtr,usi_onRecievePtr extern and include <stdddef.h> to fix compilation errors apparently caused by new version of compiler.

master
kevin 3 роки тому
джерело
коміт
37bb0cf065
2 змінених файлів з 17 додано та 4 видалено
  1. 4
    1
      control/tiny/usiTwiSlave.c
  2. 13
    3
      control/tiny/usiTwiSlave.h

+ 4
- 1
control/tiny/usiTwiSlave.c Переглянути файл

40
 /********************************************************************************
40
 /********************************************************************************
41
                                     includes
41
                                     includes
42
 ********************************************************************************/
42
 ********************************************************************************/
43
-
43
+#include <stddef.h>
44
 #include <avr/io.h>
44
 #include <avr/io.h>
45
 #include <avr/interrupt.h>
45
 #include <avr/interrupt.h>
46
 
46
 
47
 #include "usiTwiSlave.h"
47
 #include "usiTwiSlave.h"
48
 //#include "../common/util.h"
48
 //#include "../common/util.h"
49
 
49
 
50
+//request_func_t _onTwiDataRequest = NULL;
51
+request_func_t usi_onRequestPtr = NULL;
52
+receive_func_t usi_onReceiverPtr = NULL;
50
 
53
 
51
 /********************************************************************************
54
 /********************************************************************************
52
                             device dependent defines
55
                             device dependent defines

+ 13
- 3
control/tiny/usiTwiSlave.h Переглянути файл

36
 
36
 
37
 
37
 
38
 
38
 
39
+
39
 /********************************************************************************
40
 /********************************************************************************
40
 
41
 
41
                                     includes
42
                                     includes
52
 
53
 
53
 ********************************************************************************/
54
 ********************************************************************************/
54
 
55
 
56
+
55
 void    usiTwiSlaveInit( uint8_t );
57
 void    usiTwiSlaveInit( uint8_t );
56
 void    usiTwiTransmitByte( uint8_t );
58
 void    usiTwiTransmitByte( uint8_t );
57
 uint8_t usiTwiReceiveByte( void );
59
 uint8_t usiTwiReceiveByte( void );
58
 bool    usiTwiDataInReceiveBuffer( void );
60
 bool    usiTwiDataInReceiveBuffer( void );
59
-void    (*_onTwiDataRequest)(void);
61
+//void    (*_onTwiDataRequest)(void);
62
+
63
+//extern request_func_t _onTwiDataRequest;
64
+
60
 bool    usiTwiDataInTransmitBuffer(void);
65
 bool    usiTwiDataInTransmitBuffer(void);
61
 uint8_t usiTwiAmountDataInReceiveBuffer(void);
66
 uint8_t usiTwiAmountDataInReceiveBuffer(void);
62
 // on_XXX handler pointers
67
 // on_XXX handler pointers
63
-void    (*usi_onRequestPtr)(void);
64
-void    (*usi_onReceiverPtr)(uint8_t);
68
+//void    (*usi_onRequestPtr)(void);
69
+//void    (*usi_onReceiverPtr)(uint8_t);
70
+
71
+typedef void (*request_func_t)(void);
72
+typedef void (*receive_func_t)(uint8_t);
65
 
73
 
74
+extern request_func_t usi_onRequestPtr;
75
+extern receive_func_t usi_onReceiverPtr;
66
 
76
 
67
 /********************************************************************************
77
 /********************************************************************************
68
 
78
 

Завантаження…
Відмінити
Зберегти