Skip to content
This repository has been archived by the owner on May 27, 2020. It is now read-only.

Commit

Permalink
Trivial style changes to mg proto parser
Browse files Browse the repository at this point in the history
  • Loading branch information
ckolivas committed Apr 10, 2014
1 parent 2ade0b0 commit b53bdda
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 39 deletions.
4 changes: 3 additions & 1 deletion driver-spondoolies.h
@@ -1,4 +1,5 @@
/*
* Copyright 2014 Con Kolivas <kernel@kolivas.org>
* Copyright 2014 Zvi Shteingart - Spondoolies-tech.com
*
* This program is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -27,6 +28,7 @@ typedef enum spond_work_state {

#define MAX_JOBS_IN_MINERGATE MINERGATE_TOTAL_QUEUE // 1.5 sec worth of jobs
#define MAX_NROLES 50

typedef struct {
struct work *cgminer_work;
SPONDWORK_STATE state;
Expand All @@ -39,7 +41,7 @@ typedef struct {
struct spond_adapter {
pthread_mutex_t lock;
ADAPTER_STATE adapter_state;
void* cgpu;
void *cgpu;

// Statistics
int wins;
Expand Down
19 changes: 5 additions & 14 deletions mg_proto_parser.c
@@ -1,4 +1,5 @@
/*
* Copyright 2014 Con Kolivas <kernel@kolivas.org>
* Copyright 2014 Zvi (Zvisha) Shteingart - Spondoolies-tech.com
*
* This program is free software; you can redistribute it and/or modify it
Expand All @@ -18,12 +19,8 @@
#include "assert.h"
//#include "spond_debug.h"




minergate_req_packet *allocate_minergate_packet_req(
uint8_t requester_id,
uint8_t request_id) {
minergate_req_packet *allocate_minergate_packet_req(uint8_t requester_id, uint8_t request_id)
{
minergate_req_packet *p = (minergate_req_packet*)malloc(sizeof(minergate_req_packet));
p->requester_id = requester_id;
p->req_count = 0;
Expand All @@ -34,11 +31,8 @@ minergate_req_packet *allocate_minergate_packet_req(
return p;
}


minergate_rsp_packet *allocate_minergate_packet_rsp(
uint8_t requester_id,
uint8_t request_id) {

minergate_rsp_packet *allocate_minergate_packet_rsp(uint8_t requester_id, uint8_t request_id)
{
minergate_rsp_packet *p = (minergate_rsp_packet*)malloc(sizeof(minergate_rsp_packet));
p->requester_id = requester_id;
p->rsp_count = 0;
Expand All @@ -48,6 +42,3 @@ minergate_rsp_packet *allocate_minergate_packet_rsp(
p->gh_div_10_rate = 0;
return p;
}



35 changes: 11 additions & 24 deletions mg_proto_parser.h
@@ -1,4 +1,5 @@
/*
* Copyright 2014 Con Kolivas <kernel@kolivas.org>
* Copyright 2014 Zvi (Zvisha) Shteingart - Spondoolies-tech.com
*
* This program is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -28,45 +29,40 @@
#define passert assert
#endif



#define MINERGATE_PROTOCOL_VERSION 5
#define MINERGATE_SOCKET_FILE "/tmp/connection_pipe"


typedef enum {
//MINERGATE_DATA_ID_CONNECT = 1,
MINERGATE_DATA_ID_DO_JOB_REQ = 2,
MINERGATE_DATA_ID_DO_JOB_RSP = 3,

} MINERGATE_DATA_ID;


typedef struct {
uint32_t work_id_in_sw;
uint32_t difficulty;
uint32_t timestamp;
uint32_t mrkle_root;
uint32_t midstate[8];
uint8_t leading_zeroes;
uint8_t ntime_limit;
uint8_t ntime_offset;
uint8_t resr1;
uint8_t leading_zeroes;
uint8_t ntime_limit;
uint8_t ntime_offset;
uint8_t resr1;
} minergate_do_job_req;

#define MAX_REQUESTS 100
#define MAX_RESPONDS 300
#define MINERGATE_TOTAL_QUEUE 300


typedef struct {
uint32_t work_id_in_sw;
uint32_t mrkle_root; // to validate
uint32_t winner_nonce;
uint8_t ntime_offset;
uint8_t res; // 0 = done, 1 = overflow, 2 = dropped bist
uint8_t resrv1;
uint8_t resrv2;
uint8_t ntime_offset;
uint8_t res; // 0 = done, 1 = overflow, 2 = dropped bist
uint8_t resrv1;
uint8_t resrv2;
} minergate_do_job_rsp;


Expand All @@ -90,16 +86,7 @@ typedef struct {
minergate_do_job_rsp rsp[MAX_RESPONDS]; // array of responce
} minergate_rsp_packet;


minergate_req_packet *allocate_minergate_packet_req(
uint8_t requester_id,
uint8_t request_id) ;



minergate_rsp_packet *allocate_minergate_packet_rsp(
uint8_t requester_id,
uint8_t request_id);

minergate_req_packet *allocate_minergate_packet_req(uint8_t requester_id, uint8_t request_id);
minergate_rsp_packet *allocate_minergate_packet_rsp(uint8_t requester_id, uint8_t request_id);

#endif

0 comments on commit b53bdda

Please sign in to comment.