Use EndpointAddress for UsbClass too

Author: mvirkkunen

src/class.rs

@@ -3,6 +3,7 @@ use bus::StringIndex;
 use device::{ControlOutResult, ControlInResult};
 use descriptor::DescriptorWriter;
 use control;
+use endpoint::EndpointAddress;
 
 /// A trait implemented by USB class implementations.
 pub trait UsbClass {
@@ -77,23 +78,23 @@ pub trait UsbClass {
     ///
     /// Note: This method may be called for an endpoint address you didn't allocate, and in that
     /// case you should ignore the event.
-    fn endpoint_setup(&self, addr: u8) {
+    fn endpoint_setup(&self, addr: EndpointAddress) {
         let _ = addr;
     }
 
     /// Called when endpoint with address `addr` has received data (OUT packet).
     ///
     /// Note: This method may be called for an endpoint address you didn't allocate, and in that
     /// case you should ignore the event.
-    fn endpoint_out(&self, addr: u8) {
+    fn endpoint_out(&self, addr: EndpointAddress) {
         let _ = addr;
     }
 
     /// Called when endpoint with address `addr` has completed transmitting data (IN packet).
     ///
     /// Note: This method may be called for an endpoint address you didn't allocate, and in that
     /// case you should ignore the event.
-    fn endpoint_in_complete(&self, addr: u8) {
+    fn endpoint_in_complete(&self, addr: EndpointAddress) {
         let _ = addr;
     }
 

src/device.rs

@@ -4,7 +4,7 @@ use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use ::{Result, UsbError};
 use utils::AtomicMutex;
 use bus::{UsbBusWrapper, UsbBus, PollResult};
-use endpoint::{EndpointType, EndpointIn, EndpointOut};
+use endpoint::{EndpointType, EndpointIn, EndpointOut, EndpointAddress, EndpointDirection};
 use control;
 use class::UsbClass;
 pub use device_builder::{UsbDeviceBuilder, UsbVidPid};
@@ -201,20 +201,23 @@ impl<'a, B: UsbBus + 'a> UsbDevice<'a, B> {
                 // Pending events for other endpoints?
                 if (all & !1) != 0 {
                     let mut bit = 2u16;
-                    for i in 1..(MAX_ENDPOINTS as u8) {
+                    for i in 1..MAX_ENDPOINTS {
                         if (ep_setup & bit) != 0 {
                             for cls in self.classes() {
-                                cls.endpoint_setup(i);
+                                cls.endpoint_setup(
+                                    EndpointAddress::from_parts(i, EndpointDirection::Out));
                             }
                         } else if (ep_out & bit) != 0 {
                             for cls in self.classes() {
-                                cls.endpoint_out(i);
+                                cls.endpoint_out(
+                                    EndpointAddress::from_parts(i, EndpointDirection::Out));
                             }
                         }
 
                         if (ep_in_complete & bit) != 0 {
                             for cls in self.classes() {
-                                cls.endpoint_in_complete(i | 0x80);
+                                cls.endpoint_in_complete(
+                                    EndpointAddress::from_parts(i, EndpointDirection::In));
                             }
                         }
 

src/endpoint.rs

@@ -152,7 +152,7 @@ impl<'a, B: UsbBus> Endpoint<'a, B, Out> {
 }
 
 /// Type-safe endpoint address.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub struct EndpointAddress(u8);
 
 impl From<u8> for EndpointAddress {