scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-11 18:35:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cr50: Clean up the GINTSTS USB macros

Browse Source 
This just replaces a few manually created macros in
chip/g/registers.h with a more programmatic version based on
names in chip/g/hw_regdefs.h.

BUG=chrome-os-partner:34893
BRANCH=none
TEST=make buildall; run it

No new functionality, just refactoring.

Change-Id: I73ee2ee1ee3f53a0939000822c552deace46f154
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/314937
Reviewed-by: Dominic Rizzo <domrizzo@google.com>
This commit is contained in:
Bill Richardson
2015-11-30 16:47:06 -08:00
committed by chrome-bot
parent d263fa5266
commit 78c2a7ebd8
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
chip/g/registers.h
View File

@@ -343,7 +343,9 @@ static inline int x_timehs_addr(unsigned int module, unsigned int timer,
#define GR_USB_GUSBCFG GR_USB_REG(GC_USB_GUSBCFG_OFFSET)
#define GR_USB_GRSTCTL GR_USB_REG(GC_USB_GRSTCTL_OFFSET)
#define GR_USB_GINTSTS GR_USB_REG(GC_USB_GINTSTS_OFFSET)
#define GINTSTS(bit) (1 << GC_USB_GINTSTS_ ## bit ## _LSB)
#define GR_USB_GINTMSK GR_USB_REG(GC_USB_GINTMSK_OFFSET)
#define GINTMSK(bit) (1 << GC_USB_GINTMSK_ ## bit ## MSK_LSB)
#define GR_USB_GRXSTSR GR_USB_REG(GC_USB_GRXSTSR_OFFSET)
#define GR_USB_GRXSTSP GR_USB_REG(GC_USB_GRXSTSP_OFFSET)
#define GR_USB_GRXFSIZ GR_USB_REG(GC_USB_GRXFSIZ_OFFSET)
@@ -442,15 +444,6 @@ static inline int x_timehs_addr(unsigned int module, unsigned int timer,
#define GRSTCTL_RXFFLSH (1 << GC_USB_GRSTCTL_RXFFLSH_LSB)
#define GRSTCTL_TXFNUM(n) (((n) << GC_USB_GRSTCTL_TXFNUM_LSB) & GC_USB_GRSTCTL_TXFNUM_MASK)
#define GINTSTS_RXFLVL (1 << GC_USB_GINTSTS_RXFLVL_LSB)
#define GINTSTS_SOF (1 << GC_USB_GINTSTS_SOF_LSB)
#define GINTSTS_GOUTNAKEFF (1 << GC_USB_GINTMSK_GOUTNAKEFFMSK_LSB)
#define GINTSTS_GINNAKEFF (1 << GC_USB_GINTMSK_GINNAKEFFMSK_LSB)
#define GINTSTS_USBRST (1 << GC_USB_GINTMSK_USBRSTMSK_LSB)
#define GINTSTS_ENUMDONE (1 << GC_USB_GINTMSK_ENUMDONEMSK_LSB)
#define GINTSTS_IEPINT (1 << GC_USB_GINTSTS_IEPINT_LSB)
#define GINTSTS_OEPINT (1 << GC_USB_GINTSTS_OEPINT_LSB)
#define DCFG_DEVSPD_FS (1 << GC_USB_DCFG_DEVSPD_LSB)
#define DCFG_DEVSPD_FS48 (3 << GC_USB_DCFG_DEVSPD_LSB)
#define DCFG_DEVADDR(a) (((a) << GC_USB_DCFG_DEVADDR_LSB) & GC_USB_DCFG_DEVADDR_MASK)

14
chip/g/usb.c
View File

@@ -429,10 +429,10 @@ void usb_interrupt(void)
{
uint32_t status = GR_USB_GINTSTS;
if (status & GINTSTS_USBRST)
if (status & GINTSTS(USBRST))
usb_reset();
if (status & (GINTSTS_OEPINT | GINTSTS_IEPINT)) {
if (status & (GINTSTS(OEPINT) | GINTSTS(IEPINT))) {
uint32_t daint = GR_USB_DAINT;
int ep;
for (ep = 0; ep < USB_EP_COUNT && daint; ep++, daint >>= 1) {
@@ -443,10 +443,10 @@ void usb_interrupt(void)
}
}
if (status & GINTSTS_GOUTNAKEFF)
if (status & GINTSTS(GOUTNAKEFF))
GR_USB_DCTL = DCTL_CGOUTNAK;
if (status & GINTSTS_GINNAKEFF)
if (status & GINTSTS(GINNAKEFF))
GR_USB_DCTL = DCTL_CGNPINNAK;
/* ack interrupts */
@@ -588,9 +588,9 @@ void usb_init(void)
/* Enable interrupt handlers */
task_enable_irq(GC_IRQNUM_USB0_USBINTR);
/* set interrupts mask : reset/correct tranfer/errors */
GR_USB_GINTMSK = GINTSTS_GOUTNAKEFF | GINTSTS_GINNAKEFF |
GINTSTS_USBRST | GINTSTS_ENUMDONE |
GINTSTS_OEPINT | GINTSTS_IEPINT;
GR_USB_GINTMSK = GINTSTS(GOUTNAKEFF) | GINTSTS(GINNAKEFF) |
GINTSTS(USBRST) | GINTSTS(ENUMDONE) |
GINTSTS(OEPINT) | GINTSTS(IEPINT);
#ifndef CONFIG_USB_INHIBIT_CONNECT
usb_connect();