Max/djhackersdev_bemanitools
1
0
Fork 0
Code Issues 72 Pull Requests 15 Actions Packages Projects Releases 20 Wiki Activity

aciodrv: address review

Browse Source 
also some formatting fixes
This commit is contained in:
Will Xyen
2021-01-19 21:10:34 -08:00
parent 4b60cb6c6c
commit 8e1151ac02
16 changed files with 114 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/bio2drv/bi2a-iidx.c
+9 -2
View File
@@ -20,6 +20,8 @@ static bool bio2drv_bi2a_iidx_init_io(
{
struct ac_io_message msg;
log_assert(device);
msg.addr = node_id + 1;
msg.cmd.code = ac_io_u16(BIO2_BI2A_CMD_INIT);
msg.cmd.nbytes = 1;
@@ -42,6 +44,8 @@ static bool bio2drv_bi2a_iidx_watchdog_start(
struct aciodrv_device_ctx *device,
uint8_t node_id)
{
log_assert(device);
// exit early and don't actually call watchdog
// the watchdog call actually returns different sized packets depending on
// the state this results in an issue during packet processing (see: #68)
@@ -53,7 +57,6 @@ static bool bio2drv_bi2a_iidx_watchdog_start(
msg.addr = node_id + 1;
msg.cmd.code = ac_io_u16(AC_IO_CMD_KFCA_WATCHDOG);
msg.cmd.nbytes = 2;
msg.cmd.nbytes = 2;
// uint16_t: 6000
msg.cmd.raw[0] = 23;
@@ -74,6 +77,8 @@ static bool bio2drv_bi2a_iidx_watchdog_start(
bool bio2drv_bi2a_iidx_init(struct aciodrv_device_ctx *device, uint8_t node_id)
{
log_assert(device);
if (!bio2drv_bi2a_iidx_init_io(device, node_id)) {
return false;
}
@@ -93,6 +98,8 @@ bool bio2drv_bi2a_iidx_poll(
{
struct ac_io_message msg;
// log_assert(device);
msg.addr = node_id + 1;
msg.cmd.code = ac_io_u16(BIO2_BI2A_CMD_POLL);
msg.cmd.nbytes = sizeof(*pout);
@@ -103,7 +110,7 @@ bool bio2drv_bi2a_iidx_poll(
device,
&msg,
offsetof(struct ac_io_message, cmd.raw) + sizeof(*pin))) {
log_warning("Polling of node %d failed", node_id + 1);
log_warning("[%x] Polling of node %d failed", node_id + 1);
return false;
}
src/main/bio2drv/bi2a-sdvx.c
+11 -1
View File
@@ -16,6 +16,8 @@ static bool bio2drv_bi2a_sdvx_init_io(struct aciodrv_device_ctx *device, uint8_t
{
struct ac_io_message msg;
log_assert(device);
msg.addr = node_id + 1;
msg.cmd.code = ac_io_u16(BIO2_BI2A_CMD_INIT);
msg.cmd.nbytes = 1;
@@ -36,6 +38,8 @@ static bool bio2drv_bi2a_sdvx_init_io(struct aciodrv_device_ctx *device, uint8_t
static bool bio2drv_bi2a_sdvx_watchdog_start(struct aciodrv_device_ctx *device, uint8_t node_id)
{
log_assert(device);
// exit early and don't actually call watchdog
// the watchdog call actually returns different sized packets depending on
// the state this results in an issue during packet processing (see: #68)
@@ -54,7 +58,7 @@ static bool bio2drv_bi2a_sdvx_watchdog_start(struct aciodrv_device_ctx *device,
msg.cmd.raw[1] = 112;
if (!aciodrv_send_and_recv(
&msg, offsetof(struct ac_io_message, cmd.raw) + 2
device, &msg, offsetof(struct ac_io_message, cmd.raw) + 2
)) {
log_warning("Starting watchdog failed"); return false;
}
@@ -76,6 +80,8 @@ bool bio2drv_bi2a_sdvx_amp(
{
struct ac_io_message msg;
log_assert(device);
msg.addr = node_id + 1;
msg.cmd.code = ac_io_u16(AC_IO_CMD_KFCA_AMP_CONTROL);
msg.cmd.nbytes = 4;
@@ -103,6 +109,8 @@ bool bio2drv_bi2a_sdvx_amp(
bool bio2drv_bi2a_sdvx_init(struct aciodrv_device_ctx *device, uint8_t node_id)
{
log_assert(device);
if (!bio2drv_bi2a_sdvx_init_io(device, node_id)) {
return false;
}
@@ -126,6 +134,8 @@ bool bio2drv_bi2a_sdvx_poll(
{
struct ac_io_message msg;
// log_assert(device);
msg.addr = node_id + 1;
msg.cmd.code = ac_io_u16(AC_IO_CMD_KFCA_POLL);
msg.cmd.nbytes = sizeof(*pout);