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/dwc_otg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usb/dwc_otg.h') diff --git a/usb/dwc_otg.h b/usb/dwc_otg.h index 673d418..ccfaf03 100644 --- a/usb/dwc_otg.h +++ b/usb/dwc_otg.h @@ -73,7 +73,7 @@ class USB_otg : public USB_generic { uint8_t in = ep & 0x80; ep &= 0x7f; - uint32_t epctl = ((type == Control ? 0 : type == Isochronous ? 1 : type == Bulk ? 2 : 3) << 18); + uint32_t epctl = ((type == EPType::Control ? 0 : type == EPType::Isochronous ? 1 : type == EPType::Bulk ? 2 : 3) << 18); epctl |= (1 << 31) | (1 << 28) | (1 << 15) | (ep == 0 ? 64 : size); // EPENA, USBAEP, SD0PID if(ep == 0) { -- cgit v1.2.3