<p>laforge would like tsaitgaist to <strong>review</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/16415">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">minor: move USB debug output from info to debug level<br><br>else it's too nosy while debugging other components, not often<br>used, and break the flow since it does not and a line.<br><br>Change-Id: I8920ff7c33b4c9fb174bb31a29334a63fcbede43<br>---<br>M firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c<br>1 file changed, 24 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/15/16415/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c</span><br><span>index 22889cf..c6cf6e0 100644</span><br><span>--- a/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c</span><br><span>+++ b/firmware/atmel_softpack_libraries/usb/device/core/USBDDriver.c</span><br><span>@@ -251,7 +251,7 @@</span><br><span> switch (type) {</span><br><span> </span><br><span> case USBGenericDescriptor_DEVICE:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Dev ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Dev ");</span><br><span> </span><br><span> /* Adjust length and send descriptor */</span><br><span> </span><br><span>@@ -263,7 +263,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericDescriptor_CONFIGURATION:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Cfg ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Cfg ");</span><br><span> </span><br><span> /* Adjust length and send descriptor */</span><br><span> </span><br><span>@@ -280,7 +280,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericDescriptor_DEVICEQUALIFIER:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Qua ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Qua ");</span><br><span> </span><br><span> /* Check if descriptor exists */</span><br><span> </span><br><span>@@ -301,7 +301,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericDescriptor_OTHERSPEEDCONFIGURATION:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("OSC ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("OSC ");</span><br><span> </span><br><span> /* Check if descriptor exists */</span><br><span> </span><br><span>@@ -327,7 +327,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericDescriptor_STRING:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Str%d ", indexRDesc);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Str%d ", indexRDesc);</span><br><span> </span><br><span> /* Check if descriptor exists */</span><br><span> </span><br><span>@@ -504,13 +504,13 @@</span><br><span> uint32_t length;</span><br><span> uint32_t address;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Std ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Std ");</span><br><span> </span><br><span> /* Check request code */</span><br><span> switch (USBGenericRequest_GetRequest(pRequest)) {</span><br><span> </span><br><span> case USBGenericRequest_GETDESCRIPTOR:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("gDesc ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("gDesc ");</span><br><span> </span><br><span> /* Send the requested descriptor */</span><br><span> type = USBGetDescriptorRequest_GetDescriptorType(pRequest);</span><br><span>@@ -520,7 +520,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_SETADDRESS:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("sAddr ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("sAddr ");</span><br><span> </span><br><span> /* Sends a zero-length packet and then set the device address */</span><br><span> address = USBSetAddressRequest_GetAddress(pRequest);</span><br><span>@@ -528,7 +528,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_SETCONFIGURATION:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("sCfg ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("sCfg ");</span><br><span> </span><br><span> /* Set the requested configuration */</span><br><span> cfgnum = USBSetConfigurationRequest_GetConfiguration(pRequest);</span><br><span>@@ -536,27 +536,27 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_GETCONFIGURATION:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("gCfg ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("gCfg ");</span><br><span> </span><br><span> /* Send the current configuration number */</span><br><span> GetConfiguration(pDriver);</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_GETSTATUS:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("gSta ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("gSta ");</span><br><span> </span><br><span> /* Check who is the recipient */</span><br><span> switch (USBGenericRequest_GetRecipient(pRequest)) {</span><br><span> </span><br><span> case USBGenericRequest_DEVICE:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Dev ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Dev ");</span><br><span> </span><br><span> /* Send the device status */</span><br><span> GetDeviceStatus(pDriver);</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_ENDPOINT:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Ept ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Ept ");</span><br><span> </span><br><span> /* Send the endpoint status */</span><br><span> eptnum = USBGenericRequest_GetEndpointNumber(pRequest);</span><br><span>@@ -572,13 +572,13 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_CLEARFEATURE:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("cFeat ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("cFeat ");</span><br><span> </span><br><span> /* Check which is the requested feature */</span><br><span> switch (USBFeatureRequest_GetFeatureSelector(pRequest)) {</span><br><span> </span><br><span> case USBFeatureRequest_ENDPOINTHALT:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Hlt ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Hlt ");</span><br><span> </span><br><span> /* Unhalt endpoint and send a zero-length packet */</span><br><span> USBD_Unhalt(USBGenericRequest_GetEndpointNumber(pRequest));</span><br><span>@@ -586,7 +586,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBFeatureRequest_DEVICEREMOTEWAKEUP:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("RmWU ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("RmWU ");</span><br><span> </span><br><span> /* Disable remote wake-up and send a zero-length packet */</span><br><span> pDriver->isRemoteWakeUpEnabled = 0;</span><br><span>@@ -602,13 +602,13 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_SETFEATURE:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("sFeat ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("sFeat ");</span><br><span> </span><br><span> /* Check which is the selected feature */</span><br><span> switch (USBFeatureRequest_GetFeatureSelector(pRequest)) {</span><br><span> </span><br><span> case USBFeatureRequest_DEVICEREMOTEWAKEUP:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("RmWU ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("RmWU ");</span><br><span> </span><br><span> /* Enable remote wake-up and send a ZLP */</span><br><span> pDriver->isRemoteWakeUpEnabled = 1;</span><br><span>@@ -616,25 +616,25 @@</span><br><span> break;</span><br><span> </span><br><span> case USBFeatureRequest_ENDPOINTHALT:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("Halt ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("Halt ");</span><br><span> /* Halt endpoint */</span><br><span> USBD_Halt(USBGenericRequest_GetEndpointNumber(pRequest));</span><br><span> USBD_Write(0, 0, 0, 0, 0);</span><br><span> break;</span><br><span> case USBFeatureRequest_OTG_B_HNP_ENABLE:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("OTG_B_HNP_ENABLE ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("OTG_B_HNP_ENABLE ");</span><br><span> pDriver->otg_features_supported |=</span><br><span> 1<<USBFeatureRequest_OTG_B_HNP_ENABLE;</span><br><span> USBD_Write(0, 0, 0, 0, 0);</span><br><span> break;</span><br><span> case USBFeatureRequest_OTG_A_HNP_SUPPORT:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("OTG_A_HNP_SUPPORT ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("OTG_A_HNP_SUPPORT ");</span><br><span> pDriver->otg_features_supported |=</span><br><span> 1<<USBFeatureRequest_OTG_A_HNP_SUPPORT;</span><br><span> USBD_Write(0, 0, 0, 0, 0);</span><br><span> break;</span><br><span> case USBFeatureRequest_OTG_A_ALT_HNP_SUPPORT:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("OTG_A_ALT_HNP_SUPPORT ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("OTG_A_ALT_HNP_SUPPORT ");</span><br><span> pDriver->otg_features_supported |=</span><br><span> 1<<USBFeatureRequest_OTG_A_ALT_HNP_SUPPORT;</span><br><span> USBD_Write(0, 0, 0, 0, 0);</span><br><span>@@ -649,7 +649,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_SETINTERFACE:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("sInterface ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("sInterface ");</span><br><span> </span><br><span> infnum = USBInterfaceRequest_GetInterface(pRequest);</span><br><span> setting = USBInterfaceRequest_GetAlternateSetting(pRequest);</span><br><span>@@ -657,7 +657,7 @@</span><br><span> break;</span><br><span> </span><br><span> case USBGenericRequest_GETINTERFACE:</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO_WP("gInterface ");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_DEBUG_WP("gInterface ");</span><br><span> </span><br><span> infnum = USBInterfaceRequest_GetInterface(pRequest);</span><br><span> GetInterface(pDriver, infnum);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/16415">change 16415</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/simtrace2/+/16415"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8920ff7c33b4c9fb174bb31a29334a63fcbede43 </div>
<div style="display:none"> Gerrit-Change-Number: 16415 </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-Reviewer: tsaitgaist <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>