RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

leon, grspw_router: Clear only error bits defined by clear mask

Browse Source
This commit is contained in:
Javier Jalle
2017-06-20 17:39:21 +02:00
committed by Daniel Hellstrom
parent 56cf340f10
commit 2727bc7f80
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
c/src/lib/libbsp/sparc/shared/include/grspw_router.h
View File

@@ -328,7 +328,7 @@ extern int router_port_maxplen_set(void *d, int port, uint32_t length);
#define PSTS_PE_BIT 0 #define PSTS_PE_BIT 0
/* Check Port Status register and clear errors if there are */ /* Check Port Status register and clear errors if there are */
extern int router_port_status(void *d, int port, uint32_t *sts); extern int router_port_status(void *d, int port, uint32_t *sts, uint32_t clrmsk);
#define ROUTER_LINK_STATUS_ERROR_RESET 0 #define ROUTER_LINK_STATUS_ERROR_RESET 0
#define ROUTER_LINK_STATUS_ERROR_WAIT 1 #define ROUTER_LINK_STATUS_ERROR_WAIT 1

4
c/src/lib/libbsp/sparc/shared/spw/grspw_router.c
View File

@@ -1331,7 +1331,7 @@ int router_port_ctrl_get(void *d, int port, uint32_t *ctrl)
} }
/* Read Port Status register and clear errors if there are */ /* Read Port Status register and clear errors if there are */
int router_port_status(void *d, int port, uint32_t *sts, uint32_t clrmsk) /* review clrmsks */ int router_port_status(void *d, int port, uint32_t *sts, uint32_t clrmsk)
{ {
struct router_priv *priv = d; struct router_priv *priv = d;
int error = router_check_port(d, port); int error = router_check_port(d, port);
@@ -1350,7 +1350,7 @@ int router_port_status(void *d, int port, uint32_t *sts, uint32_t clrmsk) /* rev
if (port == 0) { if (port == 0) {
REG_WRITE(&priv->regs->psts[port], ((*sts) & (PSTSCFG_WCLEAR & clrmsk)) | (PSTSCFG_WCLEAR2 & clrmsk)); REG_WRITE(&priv->regs->psts[port], ((*sts) & (PSTSCFG_WCLEAR & clrmsk)) | (PSTSCFG_WCLEAR2 & clrmsk));
}else{ }else{
REG_WRITE(&priv->regs->psts[port], (*sts) & PSTS_WCLEAR); REG_WRITE(&priv->regs->psts[port], (*sts) & (PSTS_WCLEAR & clrmsk));
} }
SPIN_UNLOCK_IRQ(&priv->plock[port], irqflags); SPIN_UNLOCK_IRQ(&priv->plock[port], irqflags);
return ROUTER_ERR_OK; return ROUTER_ERR_OK;