Use usbd:: helper functions where available.

Author: jonathanpallant

nrf52-code/usb-app-solutions/src/bin/usb-3.rs

@@ -58,8 +58,8 @@ fn on_event(usbd: &Usbd, ep0in: &mut Ep0In, event: Event) {
         Event::UsbEp0DataDone => ep0in.end(usbd),
 
         Event::UsbEp0Setup => {
-            let bmrequesttype = usbd.bmrequesttype().read().0 as u8;
-            let brequest = usbd.brequest().read().brequest().to_bits();
+            let bmrequesttype = usbd::bmrequesttype(usbd);
+            let brequest = usbd::brequest(usbd);
             let wlength = usbd::wlength(usbd);
             let windex = usbd::windex(usbd);
             let wvalue = usbd::wvalue(usbd);

nrf52-code/usb-app-solutions/src/bin/usb-4.rs

@@ -79,8 +79,8 @@ fn on_event(usbd: &Usbd, ep0in: &mut Ep0In, state: &mut State, event: Event) {
 
 /// Handle a SETUP request on EP0
 fn ep0setup(usbd: &Usbd, ep0in: &mut Ep0In, state: &mut State) -> Result<(), ()> {
-    let bmrequesttype = usbd.bmrequesttype().read().0 as u8;
-    let brequest = usbd.brequest().read().brequest().to_bits();
+    let bmrequesttype = usbd::bmrequesttype(usbd);
+    let brequest = usbd::brequest(usbd);
     let wlength = usbd::wlength(usbd);
     let windex = usbd::windex(usbd);
     let wvalue = usbd::wvalue(usbd);

nrf52-code/usb-app-solutions/src/bin/usb-5.rs

@@ -79,8 +79,8 @@ fn on_event(usbd: &Usbd, ep0in: &mut Ep0In, state: &mut State, event: Event) {
 
 /// Handle a SETUP request on EP0
 fn ep0setup(usbd: &Usbd, ep0in: &mut Ep0In, state: &mut State) -> Result<(), ()> {
-    let bmrequesttype = usbd.bmrequesttype().read().0 as u8;
-    let brequest = usbd.brequest().read().brequest().to_bits();
+    let bmrequesttype = usbd::bmrequesttype(usbd);
+    let brequest = usbd::brequest(usbd);
     let wlength = usbd::wlength(usbd);
     let windex = usbd::windex(usbd);
     let wvalue = usbd::wvalue(usbd);

nrf52-code/usb-app/src/bin/usb-4.rs

@@ -80,8 +80,8 @@ fn on_event(usbd: &Usbd, ep0in: &mut Ep0In, state: &mut State, event: Event) {
 
 /// Handle a SETUP request on EP0
 fn ep0setup(usbd: &Usbd, ep0in: &mut Ep0In, _state: &mut State) -> Result<(), ()> {
-    let bmrequesttype = usbd.bmrequesttype().read().0 as u8;
-    let brequest = usbd.brequest().read().brequest() as u8;
+    let bmrequesttype = usbd::bmrequesttype(usbd);
+    let brequest = usbd::brequest(usbd);
     let wlength = usbd::wlength(usbd);
     let windex = usbd::windex(usbd);
     let wvalue = usbd::wvalue(usbd);