<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20739">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">migrate from BSC_FD_* to OSMO_FD_*<br><br>Change-Id: I9d341d24527ca739424a68059126a7f789206c42<br>---<br>M ccid_host/ccid_main_functionfs.c<br>M ccid_host/cuart_driver_tty.c<br>M ccid_host/hub_main_functionfs.c<br>3 files changed, 13 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c</span><br><span>index b538e12..dd1e274 100644</span><br><span>--- a/ccid_host/ccid_main_functionfs.c</span><br><span>+++ b/ccid_host/ccid_main_functionfs.c</span><br><span>@@ -214,7 +214,7 @@</span><br><span> int rc;</span><br><span> </span><br><span> LOGP(DUSB, LOGL_DEBUG, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ) {</span><br><span> rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg));</span><br><span> if (rc <= 0) {</span><br><span> msgb_free(msg);</span><br><span>@@ -229,7 +229,7 @@</span><br><span> static int ep_in_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span> LOGP(DUSB, LOGL_DEBUG, "%s\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_WRITE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_WRITE) {</span><br><span> /* write what we have to write */</span><br><span> }</span><br><span> return 0;</span><br><span>@@ -287,7 +287,7 @@</span><br><span> struct ufunc_handle *uh = (struct ufunc_handle *) ofd->data;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ) {</span><br><span> struct usb_functionfs_event evt;</span><br><span> rc = read(ofd->fd, (uint8_t *)&evt, sizeof(evt));</span><br><span> if (rc < sizeof(evt))</span><br><span>@@ -427,7 +427,7 @@</span><br><span> /* open control endpoint and write descriptors to it */</span><br><span> rc = open("ep0", O_RDWR);</span><br><span> assert(rc >= 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&uh->ep0, rc, BSC_FD_READ, &ep_0_cb, uh, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&uh->ep0, rc, OSMO_FD_READ, &ep_0_cb, uh, 0);</span><br><span> osmo_fd_register(&uh->ep0);</span><br><span> rc = write(uh->ep0.fd, &descriptors, sizeof(descriptors));</span><br><span> if (rc != sizeof(descriptors)) {</span><br><span>@@ -451,7 +451,7 @@</span><br><span> </span><br><span> rc = open("ep2", O_RDWR);</span><br><span> assert(rc >= 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&uh->ep_out, rc, BSC_FD_READ, &ep_out_cb, uh, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&uh->ep_out, rc, OSMO_FD_READ, &ep_out_cb, uh, 2);</span><br><span> #ifdef FUNCTIONFS_SUPPORTS_POLL</span><br><span> osmo_fd_register(&uh->ep_out);</span><br><span> #endif</span><br><span>@@ -477,7 +477,7 @@</span><br><span> /* create an eventfd, which will be marked readable once some AIO completes */</span><br><span> rc = eventfd(0, 0);</span><br><span> OSMO_ASSERT(rc >= 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&uh->aio_evfd, rc, BSC_FD_READ, &evfd_cb, uh, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&uh->aio_evfd, rc, OSMO_FD_READ, &evfd_cb, uh, 0);</span><br><span> osmo_fd_register(&uh->aio_evfd);</span><br><span> </span><br><span> uh->aio_out.iocb = malloc(sizeof(struct iocb));</span><br><span>@@ -499,7 +499,7 @@</span><br><span> #ifndef FUNCTIONFS_SUPPORTS_POLL</span><br><span> dequeue_aio_write_in(uh);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- uh->ep_in.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ uh->ep_in.when |= OSMO_FD_WRITE;</span><br><span> #endif</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -515,7 +515,7 @@</span><br><span> #ifndef FUNCTIONFS_SUPPORTS_POLL</span><br><span> dequeue_aio_write_int(uh);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">- uh->ep_int.when |= BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ uh->ep_int.when |= OSMO_FD_WRITE;</span><br><span> #endif</span><br><span> return 0;</span><br><span> }</span><br><span>diff --git a/ccid_host/cuart_driver_tty.c b/ccid_host/cuart_driver_tty.c</span><br><span>index 38a6504..f8a1438 100644</span><br><span>--- a/ccid_host/cuart_driver_tty.c</span><br><span>+++ b/ccid_host/cuart_driver_tty.c</span><br><span>@@ -184,7 +184,7 @@</span><br><span> </span><br><span> /* if no more bytes to transmit, disable OSMO_FD_WRITE */</span><br><span> if (cuart->u.tty.tx_index >= cuart->u.tty.tx_buf_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- ofd->when &= ~BSC_FD_WRITE;</span><br><span style="color: hsl(120, 100%, 40%);">+ ofd->when &= ~OSMO_FD_WRITE;</span><br><span> #ifndef CREAD_ACTUALLY_WORKS</span><br><span> /* don't immediately notify user; first wait for characters to be received */</span><br><span> #else</span><br><span>@@ -212,7 +212,7 @@</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&cuart->u.tty.ofd, rc, BSC_FD_READ, tty_uart_fd_cb, cuart, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&cuart->u.tty.ofd, rc, OSMO_FD_READ, tty_uart_fd_cb, cuart, 0);</span><br><span> cuart->u.tty.baudrate = B9600;</span><br><span> </span><br><span> rc = _init_uart(cuart->u.tty.ofd.fd);</span><br><span>diff --git a/ccid_host/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c</span><br><span>index 1776c94..93363a6 100644</span><br><span>--- a/ccid_host/hub_main_functionfs.c</span><br><span>+++ b/ccid_host/hub_main_functionfs.c</span><br><span>@@ -342,7 +342,7 @@</span><br><span> struct ufunc_handle *uh = (struct ufunc_handle *) ofd->data;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (what & BSC_FD_READ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & OSMO_FD_READ) {</span><br><span> struct usb_functionfs_event evt;</span><br><span> rc = read(ofd->fd, (uint8_t *)&evt, sizeof(evt));</span><br><span> if (rc < sizeof(evt))</span><br><span>@@ -425,7 +425,7 @@</span><br><span> /* open control endpoint and write descriptors to it */</span><br><span> rc = open("ep0", O_RDWR);</span><br><span> assert(rc >= 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&uh->ep0, rc, BSC_FD_READ, &ep_0_cb, uh, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&uh->ep0, rc, OSMO_FD_READ, &ep_0_cb, uh, 0);</span><br><span> osmo_fd_register(&uh->ep0);</span><br><span> rc = write(uh->ep0.fd, &descriptors, sizeof(descriptors));</span><br><span> if (rc != sizeof(descriptors)) {</span><br><span>@@ -460,7 +460,7 @@</span><br><span> /* create an eventfd, which will be marked readable once some AIO completes */</span><br><span> rc = eventfd(0, 0);</span><br><span> OSMO_ASSERT(rc >= 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_setup(&uh->aio_evfd, rc, BSC_FD_READ, &evfd_cb, uh, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&uh->aio_evfd, rc, OSMO_FD_READ, &evfd_cb, uh, 0);</span><br><span> osmo_fd_register(&uh->aio_evfd);</span><br><span> </span><br><span> uh->aio_int.iocb = malloc(sizeof(struct iocb));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/20739">change 20739</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/osmo-ccid-firmware/+/20739"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9d341d24527ca739424a68059126a7f789206c42 </div>
<div style="display:none"> Gerrit-Change-Number: 20739 </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-MessageType: merged </div>