<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/20767">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use osmo_fd_*_{disable,enable}<br><br>Change-Id: I65d37821873767e61a7eca029f9b30938a299683<br>Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d<br>---<br>M src/host/osmocon/osmocon.c<br>1 file changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/osmocon/osmocon.c b/src/host/osmocon/osmocon.c</span><br><span>index 66b2ea0..d49c3fd 100644</span><br><span>--- a/src/host/osmocon/osmocon.c</span><br><span>+++ b/src/host/osmocon/osmocon.c</span><br><span>@@ -500,7 +500,7 @@</span><br><span> dnload.block_ptr = dnload.block;</span><br><span> </span><br><span> dnload.block_number++;</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ | OSMO_FD_WRITE);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>@@ -586,7 +586,7 @@</span><br><span> printf("Progress: %i%%\r", progress);</span><br><span> fflush(stdout);</span><br><span> dnload.write_ptr = dnload.data;</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(&dnload.serial_fd);</span><br><span> if (dnload.romload_state == SENDING_LAST_BLOCK) {</span><br><span> dnload.romload_state = LAST_BLOCK_SENT;</span><br><span> printf("Finished, sent %i blocks in total\n",</span><br><span>@@ -638,7 +638,7 @@</span><br><span> } else if (dnload.write_ptr >= dnload.data + dnload.data_len) { </span><br><span> printf("finished\n");</span><br><span> dnload.write_ptr = dnload.data;</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(&dnload.serial_fd);</span><br><span> return 1;</span><br><span> }</span><br><span> </span><br><span>@@ -682,7 +682,7 @@</span><br><span> }</span><br><span> </span><br><span> if (end)</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when &= ~OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_disable(&dnload.serial_fd);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -751,7 +751,7 @@</span><br><span> </span><br><span> sercomm_sendmsg(dlci, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when |= OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_write_enable(&dnload.serial_fd);</span><br><span> }</span><br><span> </span><br><span> static void hdlc_console_cb(uint8_t dlci, struct msgb *msg)</span><br><span>@@ -842,12 +842,12 @@</span><br><span> }</span><br><span> } else if (!memcmp(buffer, phone_prompt2, sizeof(phone_prompt2))) {</span><br><span> printf("Received PROMPT2 from phone, starting download\n");</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ | OSMO_FD_WRITE);</span><br><span> dnload.state = DOWNLOADING;</span><br><span> } else if (!memcmp(buffer, phone_ack, sizeof(phone_ack))) {</span><br><span> printf("Received DOWNLOAD ACK from phone, your code is"</span><br><span> " running now!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);</span><br><span> dnload.state = WAITING_PROMPT1;</span><br><span> dnload.write_ptr = dnload.data;</span><br><span> dnload.expect_hdlc = 1;</span><br><span>@@ -868,18 +868,18 @@</span><br><span> } else if (!memcmp(buffer, phone_nack, sizeof(phone_nack))) {</span><br><span> printf("Received DOWNLOAD NACK from phone, something went"</span><br><span> " wrong :(\n");</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);</span><br><span> dnload.state = WAITING_PROMPT1;</span><br><span> dnload.write_ptr = dnload.data;</span><br><span> } else if (!memcmp(buffer, phone_nack_magic, sizeof(phone_nack_magic))) {</span><br><span> printf("Received MAGIC NACK from phone, you need to"</span><br><span> " have \"1003\" at 0x803ce0\n");</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);</span><br><span> dnload.state = WAITING_PROMPT1;</span><br><span> dnload.write_ptr = dnload.data;</span><br><span> } else if (!memcmp(buffer, ftmtool, sizeof(ftmtool))) {</span><br><span> printf("Received FTMTOOL from phone, ramloader has aborted\n");</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);</span><br><span> dnload.state = WAITING_PROMPT1;</span><br><span> dnload.write_ptr = dnload.data;</span><br><span> }</span><br><span>@@ -1000,7 +1000,7 @@</span><br><span> if (!memcmp(buffer, romload_branch_ack,</span><br><span> sizeof(romload_branch_ack))) {</span><br><span> printf("Received branch ack, your code is running now!\n");</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);</span><br><span> dnload.romload_state = FINISHED;</span><br><span> dnload.write_ptr = dnload.data;</span><br><span> dnload.expect_hdlc = 1;</span><br><span>@@ -1116,7 +1116,7 @@</span><br><span> printf("Received size ack\n");</span><br><span> dnload.expect_hdlc = 1;</span><br><span> dnload.mtk_state = MTK_SENDING_BLOCKS;</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ | OSMO_FD_WRITE);</span><br><span> bufptr -= 3;</span><br><span> break;</span><br><span> case MTK_SENDING_BLOCKS:</span><br><span>@@ -1138,7 +1138,7 @@</span><br><span> printf("Received Block %i preparing next block\n",</span><br><span> dnload.block_number);</span><br><span> mtk_prepare_block();</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ | OSMO_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ | OSMO_FD_WRITE);</span><br><span> }</span><br><span> break;</span><br><span> case MTK_WAIT_BRANCH_CMD_ACK:</span><br><span>@@ -1156,7 +1156,7 @@</span><br><span> break;</span><br><span> printf("Received branch address ack, code should run now\n");</span><br><span> osmo_serial_set_baudrate(dnload.serial_fd.fd, MODEM_BAUDRATE);</span><br><span style="color: hsl(0, 100%, 40%);">- dnload.serial_fd.when = OSMO_FD_READ;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_update_when(&dnload.serial_fd, 0, OSMO_FD_READ);</span><br><span> dnload.mtk_state = MTK_FINISHED;</span><br><span> dnload.write_ptr = dnload.data;</span><br><span> dnload.expect_hdlc = 1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/20767">change 20767</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmocom-bb/+/20767"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I65d37821873767e61a7eca029f9b30938a299683 </div>
<div style="display:none"> Gerrit-Change-Number: 20767 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>