<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14059">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ccid: tie ccid_device implementation into ccid_descriptors.c<br><br>Change-Id: Iaf40e8e455f79f7db71de767c442ba9e98961e0f<br>---<br>M ccid/Makefile<br>M ccid/ccid_descriptors.c<br>2 files changed, 22 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid/Makefile b/ccid/Makefile</span><br><span>index 018b223..e23823a 100644</span><br><span>--- a/ccid/Makefile</span><br><span>+++ b/ccid/Makefile</span><br><span>@@ -1,6 +1,6 @@</span><br><span> CFLAGS=-Wall -g</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ccid_descriptors: ccid_descriptors.o ccid_proto.o</span><br><span style="color: hsl(120, 100%, 40%);">+ccid_descriptors: ccid_descriptors.o ccid_proto.o ccid_device.o</span><br><span> $(CC) $(CFLAGS) -lasan -losmocore -laio -o $@ $^</span><br><span> </span><br><span> %.o: %.c</span><br><span>diff --git a/ccid/ccid_descriptors.c b/ccid/ccid_descriptors.c</span><br><span>index 7117fbb..84eb70c 100644</span><br><span>--- a/ccid/ccid_descriptors.c</span><br><span>+++ b/ccid/ccid_descriptors.c</span><br><span>@@ -6,7 +6,6 @@</span><br><span> </span><br><span> #include "ccid_proto.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #if __BYTE_ORDER == __LITTLE_ENDIAN</span><br><span> #define cpu_to_le16(x) (x)</span><br><span> #define cpu_to_le32(x) (x)</span><br><span>@@ -132,11 +131,14 @@</span><br><span> #include <sys/stat.h></span><br><span> #include <osmocom/core/select.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "ccid_device.h"</span><br><span> </span><br><span> #ifndef FUNCTIONFS_SUPPORTS_POLL</span><br><span> #include <libaio.h></span><br><span> struct aio_help {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span> struct iocb *iocb;</span><br><span> };</span><br><span> #endif</span><br><span>@@ -154,6 +156,7 @@</span><br><span> struct aio_help aio_out;</span><br><span> struct aio_help aio_int;</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ccid_instance *ccid_handle;</span><br><span> };</span><br><span> </span><br><span> static int ep_int_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span>@@ -164,13 +167,20 @@</span><br><span> </span><br><span> static int ep_out_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf[64];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ufunc_handle *uh = (struct ufunc_handle *) ofd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc(512, "OUT-Rx");</span><br><span> int rc;</span><br><span> </span><br><span> printf("OUT\n");</span><br><span> if (what & BSC_FD_READ) {</span><br><span style="color: hsl(0, 100%, 40%);">- rc = read(ofd->fd, buf, sizeof(buf));</span><br><span style="color: hsl(0, 100%, 40%);">- ccid_handle_out(uh->ccid_handle, buf, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = read(ofd->fd, msgb_data(msg), msgb_tailroom(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put(msg, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ ccid_handle_out(uh->ccid_handle, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -238,7 +248,8 @@</span><br><span> {</span><br><span> int rc;</span><br><span> struct aio_help *ah = &uh->aio_out;</span><br><span style="color: hsl(0, 100%, 40%);">- io_prep_pread(ah->iocb, uh->ep_out.fd, ah->buf, sizeof(ah->buf), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_reset(ah->msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ io_prep_pread(ah->iocb, uh->ep_out.fd, msgb_data(ah->msg), msgb_tailroom(ah->msg), 0);</span><br><span> io_set_eventfd(ah->iocb, uh->aio_evfd.fd);</span><br><span> rc = io_submit(uh->aio_ctx, 1, &ah->iocb);</span><br><span> OSMO_ASSERT(rc >= 0);</span><br><span>@@ -270,7 +281,9 @@</span><br><span> /* IN endpoint AIO has completed. This means the host has sent us</span><br><span> * some OUT data */</span><br><span> //printf("\t%s\n", osmo_hexdump(uh->aio_out.buf, evt[i].res));</span><br><span style="color: hsl(0, 100%, 40%);">- ccid_handle_out(uh->ccid_handle, uh->aio_out.buf, evt[i].res);</span><br><span style="color: hsl(120, 100%, 40%);">+ //ccid_handle_out(uh->ccid_handle, uh->aio_out.buf, evt[i].res);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put(uh->aio_out.msg, evt[i].res);</span><br><span style="color: hsl(120, 100%, 40%);">+ ccid_handle_out(uh->ccid_handle, uh->aio_out.msg);</span><br><span> aio_refill_out(uh);</span><br><span> }</span><br><span> }</span><br><span>@@ -332,6 +345,7 @@</span><br><span> osmo_fd_setup(&uh->aio_evfd, rc, BSC_FD_READ, &evfd_cb, uh, 0);</span><br><span> osmo_fd_register(&uh->aio_evfd);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ uh->aio_out.msg = msgb_alloc(512, "OUT-Rx-AIO");</span><br><span> uh->aio_out.iocb = malloc(sizeof(struct iocb));</span><br><span> </span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14059">change 14059</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/14059"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iaf40e8e455f79f7db71de767c442ba9e98961e0f </div>
<div style="display:none"> Gerrit-Change-Number: 14059 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>