From a4d31776b23a8517a7493390ab82a714a211f7f7 Mon Sep 17 00:00:00 2001
From: Vegard Storheil Eriksen <zyp@jvnv.net>
Date: Mon, 8 Oct 2012 17:53:43 +0200
Subject: Updated for newer laks.

---
 laks     |  2 +-
 main.cpp | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/laks b/laks
index 89baa2a..fca8655 160000
--- a/laks
+++ b/laks
@@ -1 +1 @@
-Subproject commit 89baa2a3f6a301a608507f4bf6cfc741e5e06aac
+Subproject commit fca86554077f380c639409331c10a3dd4680d8a9
diff --git a/main.cpp b/main.cpp
index 58cc167..1f4ea91 100644
--- a/main.cpp
+++ b/main.cpp
@@ -50,9 +50,14 @@ USB_otg usb(OTG_FS, dev_desc_p, conf_desc_p);
 
 class USB_CDC_ACM : public USB_class_driver {
 	private:
+		USB_generic& usb;
+		
 		uint32_t buf[16];
 	
 	public:
+		USB_CDC_ACM(USB_generic& usbd) : usb(usbd) {
+			usb.register_driver(this);
+		}
 	
 	protected:
 		virtual SetupStatus handle_setup(uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint16_t wLength) {
@@ -68,6 +73,14 @@ class USB_CDC_ACM : public USB_class_driver {
 			return SetupStatus::Unhandled;
 		}
 		
+		virtual void handle_set_configuration(uint8_t configuration) {
+			if(configuration) {
+				usb.register_out_handler(this, 1);
+				usb.hw_conf_ep(0x01, EPType::Bulk, 64);
+				usb.hw_conf_ep(0x81, EPType::Bulk, 64);
+			}
+		}
+		
 		virtual void handle_out(uint8_t ep, uint32_t len) {
 			if(ep == 0) {
 				usb.write(0, nullptr, 0);
@@ -81,7 +94,7 @@ class USB_CDC_ACM : public USB_class_driver {
 		}
 };
 
-USB_CDC_ACM usb_cdc_acm;
+USB_CDC_ACM usb_cdc_acm(usb);
 
 int main() {
 	#if defined(STM32F1)
@@ -120,8 +133,6 @@ int main() {
 	#endif
 	
 	usb.init();
-	usb.register_control_handler(&usb_cdc_acm);
-	usb.register_out_handler(&usb_cdc_acm, 1);
 	
 	while(1) {
 		usb.process();
-- 
cgit v1.2.3