highperfocused/ESP-Miner
1
0
Fork 0
mirror of https://github.com/skot/ESP-Miner.git synced 2025-10-05 19:22:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #151 from WantClue/uint-fix

Browse Source 
uint fix
This commit is contained in:
WantClue
2024-03-22 15:38:07 +01:00
committed by GitHub
parent a5daff7b01 3c15a050a3
commit 0bbf99b88c
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bm1397/bm1397.c
View File

@@ -209,7 +209,7 @@ void BM1397_send_hash_frequency(float frequency)
ESP_LOGI(TAG, "Setting Frequency to %.2fMHz (%.2f)", frequency, newf); ESP_LOGI(TAG, "Setting Frequency to %.2fMHz (%.2f)", frequency, newf);
} }
static void _send_init(u_int64_t frequency) static void _send_init(uint64_t frequency)
{ {
// send serial data // send serial data
@@ -266,7 +266,7 @@ static void _send_read_address(void)
_send_BM1397((TYPE_CMD | GROUP_ALL | CMD_READ), read_address, 2, false); _send_BM1397((TYPE_CMD | GROUP_ALL | CMD_READ), read_address, 2, false);
} }
void BM1397_init(u_int64_t frequency) void BM1397_init(uint64_t frequency)
{ {
ESP_LOGI(TAG, "Initializing BM1397"); ESP_LOGI(TAG, "Initializing BM1397");

10
components/bm1397/include/bm1366.h
View File

@@ -7,11 +7,11 @@
#define CRC5_MASK 0x1F #define CRC5_MASK 0x1F
// static const u_int64_t BM1366_FREQUENCY = CONFIG_ASIC_FREQUENCY; // static const uint64_t BM1366_FREQUENCY = CONFIG_ASIC_FREQUENCY;
static const u_int64_t BM1366_CORE_COUNT = 672; static const uint64_t BM1366_CORE_COUNT = 672;
// static const u_int64_t BM1366_HASHRATE_S = BM1366_FREQUENCY * BM1366_CORE_COUNT * 1000000; // static const uint64_t BM1366_HASHRATE_S = BM1366_FREQUENCY * BM1366_CORE_COUNT * 1000000;
// 2^32 // 2^32
// static const u_int64_t NONCE_SPACE = 4294967296; // static const uint64_t NONCE_SPACE = 4294967296;
static const double BM1366_FULLSCAN_MS = 2140; static const double BM1366_FULLSCAN_MS = 2140;
typedef struct typedef struct
@@ -31,7 +31,7 @@ typedef struct __attribute__((__packed__))
uint8_t version[4]; uint8_t version[4];
} BM1366_job; } BM1366_job;
uint8_t BM1366_init(u_int64_t frequency); uint8_t BM1366_init(uint64_t frequency);
void BM1366_send_init(void); void BM1366_send_init(void);
void BM1366_send_work(void * GLOBAL_STATE, bm_job * next_bm_job); void BM1366_send_work(void * GLOBAL_STATE, bm_job * next_bm_job);

10
components/bm1397/include/bm1368.h
View File

@@ -7,11 +7,11 @@
#define CRC5_MASK 0x1F #define CRC5_MASK 0x1F
// static const u_int64_t BM1368_FREQUENCY = CONFIG_ASIC_FREQUENCY; // static const uint64_t BM1368_FREQUENCY = CONFIG_ASIC_FREQUENCY;
static const u_int64_t BM1368_CORE_COUNT = 672; static const uint64_t BM1368_CORE_COUNT = 672;
// static const u_int64_t BM1368_HASHRATE_S = BM1368_FREQUENCY * BM1368_CORE_COUNT * 1000000; // static const uint64_t BM1368_HASHRATE_S = BM1368_FREQUENCY * BM1368_CORE_COUNT * 1000000;
// 2^32 // 2^32
// static const u_int64_t NONCE_SPACE = 4294967296; // static const uint64_t NONCE_SPACE = 4294967296;
static const double BM1368_FULLSCAN_MS = 2140; static const double BM1368_FULLSCAN_MS = 2140;
typedef struct typedef struct
@@ -31,7 +31,7 @@ typedef struct __attribute__((__packed__))
uint8_t version[4]; uint8_t version[4];
} BM1368_job; } BM1368_job;
uint8_t BM1368_init(u_int64_t frequency); uint8_t BM1368_init(uint64_t frequency);
uint8_t BM1368_send_init(void); uint8_t BM1368_send_init(void);
void BM1368_send_work(void * GLOBAL_STATE, bm_job * next_bm_job); void BM1368_send_work(void * GLOBAL_STATE, bm_job * next_bm_job);

10
components/bm1397/include/bm1397.h
View File

@@ -7,11 +7,11 @@
#define CRC5_MASK 0x1F #define CRC5_MASK 0x1F
// static const u_int64_t ASIC_FREQUENCY = CONFIG_ASIC_FREQUENCY; // static const uint64_t ASIC_FREQUENCY = CONFIG_ASIC_FREQUENCY;
static const u_int64_t BM1397_CORE_COUNT = 672; static const uint64_t BM1397_CORE_COUNT = 672;
// static const u_int64_t BM1397_HASHRATE_S = ASIC_FREQUENCY * BM1397_CORE_COUNT * 1000000; // static const uint64_t BM1397_HASHRATE_S = ASIC_FREQUENCY * BM1397_CORE_COUNT * 1000000;
// 2^32 // 2^32
static const u_int64_t NONCE_SPACE = 4294967296; static const uint64_t NONCE_SPACE = 4294967296;
// static const double BM1397_FULLSCAN_MS = ((double) NONCE_SPACE / (double) BM1397_HASHRATE_S) * 1000; // static const double BM1397_FULLSCAN_MS = ((double) NONCE_SPACE / (double) BM1397_HASHRATE_S) * 1000;
typedef struct typedef struct
@@ -45,7 +45,7 @@ typedef struct __attribute__((__packed__))
uint8_t midstate3[32]; uint8_t midstate3[32];
} job_packet; } job_packet;
void BM1397_init(u_int64_t frequency); void BM1397_init(uint64_t frequency);
void BM1397_send_work(void * GLOBAL_STATE, bm_job * next_bm_job); void BM1397_send_work(void * GLOBAL_STATE, bm_job * next_bm_job);
void BM1397_set_job_difficulty_mask(int); void BM1397_set_job_difficulty_mask(int);