<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19041">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">introduce notion of 'driver'<br><br>Change-Id: Ic168e25f2622b397bac2c133ec35f4a0a38f859b<br>---<br>M src/e1d.h<br>M src/intf_line.c<br>M src/usb.c<br>M src/vty.c<br>4 files changed, 14 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/41/19041/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1d.h b/src/e1d.h</span><br><span>index ed5414b..e93d0e5 100644</span><br><span>--- a/src/e1d.h</span><br><span>+++ b/src/e1d.h</span><br><span>@@ -65,12 +65,19 @@</span><br><span>      struct e1_ts ts[32];</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum e1_driver {</span><br><span style="color: hsl(120, 100%, 40%);">+      E1_DRIVER_USB,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string e1_driver_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct e1_intf {</span><br><span>      struct llist_head list;</span><br><span> </span><br><span>  struct e1_daemon *e1d;</span><br><span>       uint8_t id;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+       enum e1_driver drv;</span><br><span>  void *drv_data;</span><br><span> </span><br><span>  struct llist_head lines;</span><br><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index a2a623a..83e629f 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -34,6 +34,10 @@</span><br><span> #include "e1d.h"</span><br><span> #include "log.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string e1_driver_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+       { E1_DRIVER_USB, "usb" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span> // ---------------------------------------------------------------------------</span><br><span> // e1d structures</span><br><span>diff --git a/src/usb.c b/src/usb.c</span><br><span>index f35f548..8938a78 100644</span><br><span>--- a/src/usb.c</span><br><span>+++ b/src/usb.c</span><br><span>@@ -366,6 +366,7 @@</span><br><span>    intf_data->devh = devh;</span><br><span> </span><br><span>       intf = _e1_intf_new(e1d, intf_data);</span><br><span style="color: hsl(120, 100%, 40%);">+  intf->drv = E1_DRIVER_USB;</span><br><span> </span><br><span>    ret = libusb_get_active_config_descriptor(dev, &cd);</span><br><span>     if (ret) {</span><br><span>diff --git a/src/vty.c b/src/vty.c</span><br><span>index 2c7fa81..753a8ad 100644</span><br><span>--- a/src/vty.c</span><br><span>+++ b/src/vty.c</span><br><span>@@ -49,7 +49,8 @@</span><br><span> </span><br><span> static void vty_dump_intf(struct vty *vty, const struct e1_intf *intf)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-      vty_out(vty, "Interface #%u, Driver: FIXME%s", intf->id, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+   vty_out(vty, "Interface #%u, Driver: %s%s", intf->id,</span><br><span style="color: hsl(120, 100%, 40%);">+            get_value_string(e1_driver_names, intf->drv), VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span> DEFUN(show_intf, show_intf_cmd, "show interface [<0-255>]",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19041">change 19041</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-e1d/+/19041"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic168e25f2622b397bac2c133ec35f4a0a38f859b </div>
<div style="display:none"> Gerrit-Change-Number: 19041 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>