From 859317842837095a406a0ff7866091c012e1923e Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Sat, 22 Sep 2012 16:08:41 +0200 Subject: Use strongly typed enumeration for EPType to avoid name conflicts. --- usb/f1_usb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usb/f1_usb.h') diff --git a/usb/f1_usb.h b/usb/f1_usb.h index f59ccab..166c051 100644 --- a/usb/f1_usb.h +++ b/usb/f1_usb.h @@ -30,7 +30,7 @@ class USB_f1 : public USB_generic { uint32_t old_epr = usb.reg.EPR[ep]; //uint32_t new_epr = 0x3220; - uint32_t new_epr = 0x8080 | ((type == Bulk ? 0 : type == Control ? 1 : type == Isochronous ? 2 : 3) << 9) | ep; + uint32_t new_epr = 0x8080 | ((type == EPType::Bulk ? 0 : type == EPType::Control ? 1 : type == EPType::Isochronous ? 2 : 3) << 9) | ep; if(in || ep == 0) { usb.bufd[ep].ADDR_TX = buf_end; -- cgit v1.2.3