Browse Source

bitfury: Move Slot and fasync RPC info to details instead of status

Luke Dashjr 12 years ago
parent
commit
cc2314c725
4 changed files with 30 additions and 8 deletions
  1. 4 3
      driver-bfsb.c
  2. 11 2
      driver-bitfury.c
  3. 2 1
      driver-bitfury.h
  4. 13 2
      driver-metabank.c

+ 4 - 3
driver-bfsb.c

@@ -184,10 +184,10 @@ static void bfsb_shutdown(struct thr_info *thr)
 	spi_bfsb_select_bank(-1);
 	spi_bfsb_select_bank(-1);
 }
 }
 
 
-static struct api_data *bfsb_api_device_status(struct cgpu_info *cgpu)
+static struct api_data *bfsb_api_device_detail(struct cgpu_info *cgpu)
 {
 {
 	struct bitfury_device * const bitfury = cgpu->device_data;
 	struct bitfury_device * const bitfury = cgpu->device_data;
-	struct api_data *root = bitfury_api_device_status(cgpu);
+	struct api_data *root = bitfury_api_device_detail(cgpu);
 	
 	
 	root = api_add_uint(root, "Slot", &(bitfury->slot), false);
 	root = api_add_uint(root, "Slot", &(bitfury->slot), false);
 	
 	
@@ -204,7 +204,8 @@ struct device_drv bfsb_drv = {
 	.poll = bitfury_do_io,
 	.poll = bitfury_do_io,
 	.job_start = bitfury_noop_job_start,
 	.job_start = bitfury_noop_job_start,
 	.job_process_results = bitfury_job_process_results,
 	.job_process_results = bitfury_job_process_results,
-	.get_api_extra_device_status = bfsb_api_device_status,
+	.get_api_extra_device_detail = bfsb_api_device_detail,
+	.get_api_extra_device_status = bitfury_api_device_status,
 	.set_device = bitfury_set_device,
 	.set_device = bitfury_set_device,
 	.thread_disable = bfsb_disable,
 	.thread_disable = bfsb_disable,
 	.thread_enable = bfsb_enable,
 	.thread_enable = bfsb_enable,

+ 11 - 2
driver-bitfury.c

@@ -660,14 +660,23 @@ int64_t bitfury_job_process_results(struct thr_info *thr, struct work *work, boo
 	return 0xbd000000;
 	return 0xbd000000;
 }
 }
 
 
-struct api_data *bitfury_api_device_status(const struct cgpu_info * const cgpu)
+struct api_data *bitfury_api_device_detail(struct cgpu_info * const cgpu)
+{
+	struct bitfury_device * const bitfury = cgpu->device_data;
+	struct api_data *root = NULL;
+	
+	root = api_add_uint(root, "fasync", &bitfury->fasync, false);
+	
+	return root;
+}
+
+struct api_data *bitfury_api_device_status(struct cgpu_info * const cgpu)
 {
 {
 	struct bitfury_device * const bitfury = cgpu->device_data;
 	struct bitfury_device * const bitfury = cgpu->device_data;
 	struct api_data *root = NULL;
 	struct api_data *root = NULL;
 	int clock_bits = bitfury->osc6_bits;
 	int clock_bits = bitfury->osc6_bits;
 	
 	
 	root = api_add_int(root, "Clock Bits", &clock_bits, true);
 	root = api_add_int(root, "Clock Bits", &clock_bits, true);
-	root = api_add_uint(root, "fasync", &bitfury->fasync, false);
 	
 	
 	return root;
 	return root;
 }
 }

+ 2 - 1
driver-bitfury.h

@@ -15,7 +15,8 @@ extern bool bitfury_job_prepare(struct thr_info *, struct work *, uint64_t max_n
 extern void bitfury_noop_job_start(struct thr_info *);
 extern void bitfury_noop_job_start(struct thr_info *);
 extern void bitfury_do_io(struct thr_info *);
 extern void bitfury_do_io(struct thr_info *);
 extern int64_t bitfury_job_process_results(struct thr_info *, struct work *, bool stopping);
 extern int64_t bitfury_job_process_results(struct thr_info *, struct work *, bool stopping);
-extern struct api_data *bitfury_api_device_status(const struct cgpu_info *);
+extern struct api_data *bitfury_api_device_detail(struct cgpu_info *);
+extern struct api_data *bitfury_api_device_status(struct cgpu_info *);
 extern char *bitfury_set_device(struct cgpu_info *, char *, char *, char *);
 extern char *bitfury_set_device(struct cgpu_info *, char *, char *, char *);
 
 
 extern void bitfury_shutdown(struct thr_info *);
 extern void bitfury_shutdown(struct thr_info *);

+ 13 - 2
driver-metabank.c

@@ -189,6 +189,18 @@ static bool metabank_get_stats(struct cgpu_info *cgpu)
 	return true;
 	return true;
 }
 }
 
 
+static struct api_data *metabank_api_extra_device_detail(struct cgpu_info *cgpu)
+{
+	struct api_data *root = NULL;
+	struct bitfury_device * const bitfury = cgpu->device_data;
+	
+	root = bitfury_api_device_detail(cgpu);
+
+	root = api_add_uint(root, "Slot", &(bitfury->slot), false);
+
+	return root;
+}
+
 static struct api_data *metabank_api_extra_device_status(struct cgpu_info *cgpu)
 static struct api_data *metabank_api_extra_device_status(struct cgpu_info *cgpu)
 {
 {
 	struct api_data *root = NULL;
 	struct api_data *root = NULL;
@@ -197,8 +209,6 @@ static struct api_data *metabank_api_extra_device_status(struct cgpu_info *cgpu)
 	
 	
 	root = bitfury_api_device_status(cgpu);
 	root = bitfury_api_device_status(cgpu);
 
 
-	root = api_add_uint(root, "Slot", &(bitfury->slot), false);
-
 	vc0 = tm_i2c_getcore0(bitfury->slot);
 	vc0 = tm_i2c_getcore0(bitfury->slot);
 	vc1 = tm_i2c_getcore1(bitfury->slot);
 	vc1 = tm_i2c_getcore1(bitfury->slot);
 
 
@@ -226,6 +236,7 @@ struct device_drv metabank_drv = {
 	.job_process_results = bitfury_job_process_results,
 	.job_process_results = bitfury_job_process_results,
 	
 	
 	.thread_shutdown = metabank_shutdown,
 	.thread_shutdown = metabank_shutdown,
+	.get_api_extra_device_detail = metabank_api_extra_device_detail,
 	.get_api_extra_device_status = metabank_api_extra_device_status,
 	.get_api_extra_device_status = metabank_api_extra_device_status,
 	.get_stats = metabank_get_stats,
 	.get_stats = metabank_get_stats,
 	.set_device = bitfury_set_device,
 	.set_device = bitfury_set_device,