phone-side
/
osmocom-bb
mirror of https://gerrit.osmocom.org/osmocom-bb
9
0
Fork 0
Code Issues Releases Wiki Activity

Use osmo_fd_*_{disable,enable} 

Change-Id: I65d37821873767e61a7eca029f9b30938a299683
Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d
This commit is contained in:
Harald Welte 2020-10-19 12:16:32 +02:00 committed by laforge
parent 082b618ea4
commit 00d1223d05
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/host/osmocon/osmocon.c
View File

@ -500,7 +500,7 @@ static int romload_prepare_block(void)
dnload.block_ptr = dnload.block;
dnload.block_number++;
dnload.serial_fd.when = OSMO_FD_READ | OSMO_FD_WRITE;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ | OSMO_FD_WRITE);
return 0;
}
@ -586,7 +586,7 @@ static int handle_write_block(void)
printf("Progress: %i%%\r", progress);
fflush(stdout);
dnload.write_ptr = dnload.data;
dnload.serial_fd.when &= ~OSMO_FD_WRITE;
osmo_fd_write_disable(&dnload.serial_fd);
if (dnload.romload_state == SENDING_LAST_BLOCK) {
dnload.romload_state = LAST_BLOCK_SENT;
printf("Finished, sent %i blocks in total\n",
@ -638,7 +638,7 @@ static int handle_write_dnload(void)
} else if (dnload.write_ptr >= dnload.data + dnload.data_len) {
printf("finished\n");
dnload.write_ptr = dnload.data;
dnload.serial_fd.when &= ~OSMO_FD_WRITE;
osmo_fd_write_disable(&dnload.serial_fd);
return 1;
}
@ -682,7 +682,7 @@ static int handle_sercomm_write(void)
}
if (end)
dnload.serial_fd.when &= ~OSMO_FD_WRITE;
osmo_fd_write_disable(&dnload.serial_fd);
return 0;
}
@ -751,7 +751,7 @@ static void hdlc_send_to_phone(uint8_t dlci, uint8_t *data, int len)
sercomm_sendmsg(dlci, msg);
dnload.serial_fd.when |= OSMO_FD_WRITE;
osmo_fd_write_enable(&dnload.serial_fd);
}
static void hdlc_console_cb(uint8_t dlci, struct msgb *msg)
@ -842,12 +842,12 @@ static int handle_read(void)
}
} else if (!memcmp(buffer, phone_prompt2, sizeof(phone_prompt2))) {
printf("Received PROMPT2 from phone, starting download\n");
dnload.serial_fd.when = OSMO_FD_READ | OSMO_FD_WRITE;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ | OSMO_FD_WRITE);
dnload.state = DOWNLOADING;
} else if (!memcmp(buffer, phone_ack, sizeof(phone_ack))) {
printf("Received DOWNLOAD ACK from phone, your code is"
" running now!\n");
dnload.serial_fd.when = OSMO_FD_READ;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);
dnload.state = WAITING_PROMPT1;
dnload.write_ptr = dnload.data;
dnload.expect_hdlc = 1;
@ -868,18 +868,18 @@ static int handle_read(void)
} else if (!memcmp(buffer, phone_nack, sizeof(phone_nack))) {
printf("Received DOWNLOAD NACK from phone, something went"
" wrong :(\n");
dnload.serial_fd.when = OSMO_FD_READ;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);
dnload.state = WAITING_PROMPT1;
dnload.write_ptr = dnload.data;
} else if (!memcmp(buffer, phone_nack_magic, sizeof(phone_nack_magic))) {
printf("Received MAGIC NACK from phone, you need to"
" have \"1003\" at 0x803ce0\n");
dnload.serial_fd.when = OSMO_FD_READ;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);
dnload.state = WAITING_PROMPT1;
dnload.write_ptr = dnload.data;
} else if (!memcmp(buffer, ftmtool, sizeof(ftmtool))) {
printf("Received FTMTOOL from phone, ramloader has aborted\n");
dnload.serial_fd.when = OSMO_FD_READ;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);
dnload.state = WAITING_PROMPT1;
dnload.write_ptr = dnload.data;
}
@ -1000,7 +1000,7 @@ static int handle_read_romload(void)
if (!memcmp(buffer, romload_branch_ack,
sizeof(romload_branch_ack))) {
printf("Received branch ack, your code is running now!\n");
dnload.serial_fd.when = OSMO_FD_READ;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);
dnload.romload_state = FINISHED;
dnload.write_ptr = dnload.data;
dnload.expect_hdlc = 1;
@ -1116,7 +1116,7 @@ static int handle_read_mtk(void)
printf("Received size ack\n");
dnload.expect_hdlc = 1;
dnload.mtk_state = MTK_SENDING_BLOCKS;
dnload.serial_fd.when = OSMO_FD_READ | OSMO_FD_WRITE;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ | OSMO_FD_WRITE);
bufptr -= 3;
break;
case MTK_SENDING_BLOCKS:
@ -1138,7 +1138,7 @@ static int handle_read_mtk(void)
printf("Received Block %i preparing next block\n",
dnload.block_number);
mtk_prepare_block();
dnload.serial_fd.when = OSMO_FD_READ | OSMO_FD_WRITE;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ | OSMO_FD_WRITE);
}
break;
case MTK_WAIT_BRANCH_CMD_ACK:
@ -1156,7 +1156,7 @@ static int handle_read_mtk(void)
break;
printf("Received branch address ack, code should run now\n");
osmo_serial_set_baudrate(dnload.serial_fd.fd, MODEM_BAUDRATE);
dnload.serial_fd.when = OSMO_FD_READ;
osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);
dnload.mtk_state = MTK_FINISHED;
dnload.write_ptr = dnload.data;
dnload.expect_hdlc = 1;