Merge pull request #39 from quartiq/feature/usb-device-bump

Updating driver to usb-device 0.3.0

CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Changed
+* `usb-device` version bumped to v0.3.0
+
+
+
+[Unreleased]: https://github.com/stm32-rs/synopsys-usb-otg/compare/v0.3.2...HEAD
+[0.3.2]: https://github.com/stm32-rs/synopsys-usb-otg/compare/v0.3.2...v0.3.1

Cargo.toml

@@ -14,7 +14,7 @@ riscv = { version = "0.6.0", optional = true }
 cortex-m = { version = "0.7.0", optional = true }
 embedded-hal = "0.2.4"
 vcell = "0.1.0"
-usb-device = "0.2.3"
+usb-device = "0.3"
 
 [package.metadata.docs.rs]
 features = ['cortex-m', 'fs']

src/endpoint.rs

@@ -89,7 +89,7 @@ impl EndpointIn {
             write_reg!(endpoint_in, regs, DIEPCTL,
                 SNAK: 1,
                 USBAEP: 1,
-                EPTYP: self.descriptor.ep_type as u32,
+                EPTYP: self.descriptor.ep_type.to_bm_attributes() as u32,
                 SD0PID_SEVNFRM: 1,
                 TXFNUM: self.index() as u32,
                 MPSIZ: self.descriptor.max_packet_size as u32
@@ -183,7 +183,7 @@ impl EndpointOut {
                 CNAK: 1,
                 EPENA: 1,
                 USBAEP: 1,
-                EPTYP: self.descriptor.ep_type as u32,
+                EPTYP: self.descriptor.ep_type.to_bm_attributes() as u32,
                 MPSIZ: self.descriptor.max_packet_size as u32
             );
         }