<p>Kévin Redon <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13038">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Kévin Redon: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ncn8025: Add support for reading SIMx_INT status<br><br>Change-Id: Iab9edc1214bb22ee304daa834fd9e2376d42c97c<br>---<br>M sysmoOCTSIM/ncn8025.c<br>M sysmoOCTSIM/ncn8025.h<br>2 files changed, 22 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/ncn8025.c b/sysmoOCTSIM/ncn8025.c</span><br><span>index 5f9b03d..61509bc 100644</span><br><span>--- a/sysmoOCTSIM/ncn8025.c</span><br><span>+++ b/sysmoOCTSIM/ncn8025.c</span><br><span>@@ -11,6 +11,7 @@</span><br><span> #include <stdio.h></span><br><span> #include <utils_assert.h></span><br><span> #include <utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include "atmel_start_pins.h"</span><br><span> #include "octsim_i2c.h"</span><br><span> #include "ncn8025.h"</span><br><span> </span><br><span>@@ -86,6 +87,20 @@</span><br><span>          return 0x03;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t slot2int_pin(unsigned int slot)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        static const uint8_t slot2pin[8] = { SIM0_INT, SIM1_INT, SIM2_INT, SIM3_INT,</span><br><span style="color: hsl(120, 100%, 40%);">+                                       SIM4_INT, SIM5_INT, SIM6_INT, SIM7_INT };</span><br><span style="color: hsl(120, 100%, 40%);">+        ASSERT(slot < ARRAY_SIZE(slot2pin));</span><br><span style="color: hsl(120, 100%, 40%);">+       return slot2pin[slot];</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%);">+bool ncn8025_interrupt_active(uint8_t slot)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+   uint8_t pin = slot2int_pin(slot);</span><br><span style="color: hsl(120, 100%, 40%);">+     return !gpio_get_pin_level(pin);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /*! Set a given NCN8025 as described in 'set'.</span><br><span>  *  \param[in] slot Slot number (0..7)</span><br><span>@@ -111,7 +126,9 @@</span><br><span>  rc = i2c_read_reg(adap, SX1503_ADDR, reg);</span><br><span>   if (rc < 0)</span><br><span>               return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-      return ncn8025_decode(rc, set);</span><br><span style="color: hsl(120, 100%, 40%);">+       rc = ncn8025_decode(rc, set);</span><br><span style="color: hsl(120, 100%, 40%);">+ set->interrupt = ncn8025_interrupt_active(slot);</span><br><span style="color: hsl(120, 100%, 40%);">+   return rc;</span><br><span> }</span><br><span> </span><br><span> /*! default settings we use at start-up: powered off, in reset, slowest clock, 3V */</span><br><span>@@ -156,6 +173,8 @@</span><br><span>            printf(", RST");</span><br><span>   if (set->cmdvcc)</span><br><span>          printf(", VCC");</span><br><span style="color: hsl(120, 100%, 40%);">+    if (set->interrupt)</span><br><span style="color: hsl(120, 100%, 40%);">+                printf(", INT");</span><br><span>   if (set->simpres)</span><br><span>                 printf(", SIMPRES");</span><br><span>       if (set->led)</span><br><span>diff --git a/sysmoOCTSIM/ncn8025.h b/sysmoOCTSIM/ncn8025.h</span><br><span>index 79e8b60..89b7f86 100644</span><br><span>--- a/sysmoOCTSIM/ncn8025.h</span><br><span>+++ b/sysmoOCTSIM/ncn8025.h</span><br><span>@@ -19,11 +19,13 @@</span><br><span>      bool cmdvcc;    /* high: active */</span><br><span>   bool simpres;   /* high: active */</span><br><span>   bool led;       /* high: active */</span><br><span style="color: hsl(120, 100%, 40%);">+    bool interrupt; /* high: active */</span><br><span>   enum ncn8025_sim_clkdiv clkdiv; /* raw 2bit value */</span><br><span>         enum ncn8025_sim_voltage vsel;  /* raw 2bit value */</span><br><span> };</span><br><span> </span><br><span> int ncn8025_set(uint8_t slot, const struct ncn8025_settings *set);</span><br><span> int ncn8025_get(uint8_t slot, struct ncn8025_settings *set);</span><br><span style="color: hsl(120, 100%, 40%);">+bool ncn8025_interrupt_active(uint8_t slot);</span><br><span> int ncn8025_init(unsigned int slot);</span><br><span> void ncn8025_dump(const struct ncn8025_settings *set);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13038">change 13038</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/13038"/><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: Iab9edc1214bb22ee304daa834fd9e2376d42c97c </div>
<div style="display:none"> Gerrit-Change-Number: 13038 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Kévin Redon <kredon@sysmocom.de> </div>