Browse Source

fix warning

Xiangfu 13 years ago
parent
commit
dd88ad0a40
1 changed files with 3 additions and 23 deletions
  1. 3 23
      driver-avalon.c

+ 3 - 23
driver-avalon.c

@@ -31,24 +31,14 @@
 #include "fpgautils.h"
 #include "fpgautils.h"
 #include "avalon.h"
 #include "avalon.h"
 
 
-// The serial I/O speed - Linux uses a define 'B115200' in bits/termios.h
-#define AVALON_IO_SPEED 115200
-
-// The size of a successful nonce read
-#define AVALON_READ_SIZE 4	/* Should be 48 */
-
-#define TIME_FACTOR 10
-
-// Ensure the sizes are correct for the Serial read
+/* Ensure the sizes are correct for the Serial read */
 #define ASSERT1(condition) __maybe_unused static char sizeof_uint32_t_must_be_4[(condition)?1:-1]
 #define ASSERT1(condition) __maybe_unused static char sizeof_uint32_t_must_be_4[(condition)?1:-1]
 ASSERT1(sizeof(uint32_t) == 4);
 ASSERT1(sizeof(uint32_t) == 4);
 
 
-#define AVALON_READ_FAULT_DECISECONDS 1
-
-// One for each possible device
+/* One for each possible device */
 struct device_api avalon_api;
 struct device_api avalon_api;
 
 
-static void rev(unsigned char *s, size_t l)
+static inline void rev(unsigned char *s, size_t l)
 {
 {
 	size_t i, j;
 	size_t i, j;
 	unsigned char t;
 	unsigned char t;
@@ -60,14 +50,6 @@ static void rev(unsigned char *s, size_t l)
 	}
 	}
 }
 }
 
 
-#define avalon_open2(devpath, baud, purge)  serial_open(devpath, baud, AVALON_READ_FAULT_DECISECONDS, purge)
-#define avalon_open(devpath, baud)  avalon_open2(devpath, baud, false)
-
-#define AVA_GETS_ERROR -1
-#define AVA_GETS_OK 0
-#define AVA_GETS_RESTART 1
-#define AVA_GETS_TIMEOUT 2
-
 /* TODO: this should be a avalon_read_thread
 /* TODO: this should be a avalon_read_thread
  * 1. receive data from avalon
  * 1. receive data from avalon
  * 2. match the data to avalon_send_buffer
  * 2. match the data to avalon_send_buffer
@@ -134,8 +116,6 @@ static int avalon_write(int fd, const void *buf, size_t bufLen)
 	return 0;
 	return 0;
 }
 }
 
 
-#define avalon_close(fd) close(fd)
-
 static void do_avalon_close(struct thr_info *thr)
 static void do_avalon_close(struct thr_info *thr)
 {
 {
 	struct cgpu_info *avalon = thr->cgpu;
 	struct cgpu_info *avalon = thr->cgpu;