浏览代码

Fix TWIlib compilation on avr-gcc 10 (#9273)

Joel Challis 4 年之前
父节点
当前提交
410d09675a
共有 4 个文件被更改,包括 28 次插入22 次删除
  1. 13 0
      keyboards/lfkeyboards/TWIlib.c
  2. 1 11
      keyboards/lfkeyboards/TWIlib.h
  3. 13 0
      keyboards/meira/TWIlib.c
  4. 1 11
      keyboards/meira/TWIlib.h

+ 13 - 0
keyboards/lfkeyboards/TWIlib.c

@@ -11,6 +11,19 @@
 #include "util/delay.h"
 #include "print.h"
 
+// Global transmit buffer
+volatile uint8_t *TWITransmitBuffer;
+// Global receive buffer
+volatile uint8_t TWIReceiveBuffer[RXMAXBUFLEN];
+// Buffer indexes
+volatile int TXBuffIndex; // Index of the transmit buffer. Is volatile, can change at any time.
+int RXBuffIndex; // Current index in the receive buffer
+// Buffer lengths
+int TXBuffLen; // The total length of the transmit buffer
+int RXBuffLen; // The total number of bytes to read (should be less than RXMAXBUFFLEN)
+
+TWIInfoStruct TWIInfo;
+
 void TWIInit()
 {
 	TWIInfo.mode = Ready;

+ 1 - 11
keyboards/lfkeyboards/TWIlib.h

@@ -16,16 +16,6 @@
 #define TXMAXBUFLEN 20
 // Receive buffer length
 #define RXMAXBUFLEN 20
-// Global transmit buffer
-volatile uint8_t *TWITransmitBuffer;
-// Global receive buffer
-volatile uint8_t TWIReceiveBuffer[RXMAXBUFLEN];
-// Buffer indexes
-volatile int TXBuffIndex; // Index of the transmit buffer. Is volatile, can change at any time.
-int RXBuffIndex; // Current index in the receive buffer
-// Buffer lengths
-int TXBuffLen; // The total length of the transmit buffer
-int RXBuffLen; // The total number of bytes to read (should be less than RXMAXBUFFLEN)
 
 typedef enum {
 	Ready,
@@ -42,8 +32,8 @@ typedef enum {
 	uint8_t errorCode;
 	uint8_t repStart;
 	}TWIInfoStruct;
-TWIInfoStruct TWIInfo;
 
+extern TWIInfoStruct TWIInfo;
 
 // TWI Status Codes
 #define TWI_START_SENT			0x08 // Start sent

+ 13 - 0
keyboards/meira/TWIlib.c

@@ -11,6 +11,19 @@
 #include "util/delay.h"
 #include "print.h"
 
+// Global transmit buffer
+volatile uint8_t *TWITransmitBuffer;
+// Global receive buffer
+volatile uint8_t TWIReceiveBuffer[RXMAXBUFLEN];
+// Buffer indexes
+volatile int TXBuffIndex; // Index of the transmit buffer. Is volatile, can change at any time.
+int RXBuffIndex; // Current index in the receive buffer
+// Buffer lengths
+int TXBuffLen; // The total length of the transmit buffer
+int RXBuffLen; // The total number of bytes to read (should be less than RXMAXBUFFLEN)
+
+TWIInfoStruct TWIInfo;
+
 void TWIInit()
 {
 	TWIInfo.mode = Ready;

+ 1 - 11
keyboards/meira/TWIlib.h

@@ -16,16 +16,6 @@
 #define TXMAXBUFLEN 20
 // Receive buffer length
 #define RXMAXBUFLEN 20
-// Global transmit buffer
-volatile uint8_t *TWITransmitBuffer;
-// Global receive buffer
-volatile uint8_t TWIReceiveBuffer[RXMAXBUFLEN];
-// Buffer indexes
-volatile int TXBuffIndex; // Index of the transmit buffer. Is volatile, can change at any time.
-int RXBuffIndex; // Current index in the receive buffer
-// Buffer lengths
-int TXBuffLen; // The total length of the transmit buffer
-int RXBuffLen; // The total number of bytes to read (should be less than RXMAXBUFFLEN)
 
 typedef enum {
 	Ready,
@@ -42,8 +32,8 @@ typedef enum {
 	uint8_t errorCode;
 	uint8_t repStart;
 	}TWIInfoStruct;
-TWIInfoStruct TWIInfo;
 
+extern TWIInfoStruct TWIInfo;
 
 // TWI Status Codes
 #define TWI_START_SENT			0x08 // Start sent