From 1df60c1063748ada898ec38a947b2e8e0d082a5f Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 19 Oct 2020 12:16:32 +0200 Subject: Use osmo_fd_*_{disable,enable} Change-Id: I65d37821873767e61a7eca029f9b30938a299683 Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d --- src/host/layer23/src/mobile/mncc_sock.c | 12 ++++++------ src/host/osmocon/osmocon.c | 28 ++++++++++++++-------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c index 14adf071..5ea6feba 100644 --- a/src/host/layer23/src/mobile/mncc_sock.c +++ b/src/host/layer23/src/mobile/mncc_sock.c @@ -72,13 +72,13 @@ int mncc_sock_from_cc(struct mncc_sock_state *state, struct msgb *msg) /* Actually enqueue the message and mark socket write need */ msgb_enqueue(&state->upqueue, msg); - state->conn_bfd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&state->conn_bfd); return 0; } void mncc_sock_write_pending(struct mncc_sock_state *state) { - state->conn_bfd.when |= OSMO_FD_WRITE; + osmo_fd_write_enable(&state->conn_bfd); } static void mncc_sock_close(struct mncc_sock_state *state) @@ -92,7 +92,7 @@ static void mncc_sock_close(struct mncc_sock_state *state) osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ - state->listen_bfd.when |= OSMO_FD_READ; + osmo_fd_read_enable(&state->listen_bfd); /* FIXME: make sure we don't enqueue anymore */ @@ -156,7 +156,7 @@ static int mncc_sock_write(struct osmo_fd *bfd) msg = llist_entry(state->upqueue.next, struct msgb, list); mncc_prim = (struct gsm_mncc *)msg->data; - bfd->when &= ~OSMO_FD_WRITE; + osmo_fd_write_disable(bfd); /* bug hunter 8-): maybe someone forgot msgb_put(...) ? */ if (!msgb_length(msg)) { @@ -171,7 +171,7 @@ static int mncc_sock_write(struct osmo_fd *bfd) goto close; if (rc < 0) { if (errno == EAGAIN) { - bfd->when |= OSMO_FD_WRITE; + osmo_fd_write_enable(bfd); break; } goto close; @@ -226,7 +226,7 @@ static int mncc_sock_accept(struct osmo_fd *bfd, unsigned int flags) LOGP(DMNCC, LOGL_NOTICE, "MNCC app connects but we already have " "another active connection ?!?\n"); /* We already have one MNCC app connected, this is all we support */ - state->listen_bfd.when &= ~OSMO_FD_READ; + osmo_fd_read_disable(&state->listen_bfd); close(rc); return 0; } diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c index 66b2ea08..d49c3fdf 100644 --- a/src/host/osmocon/osmocon.c +++ b/src/host/osmocon/osmocon.c @@ -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; -- cgit v1.2.3