diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-07-24 11:27:52 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-07-30 09:30:15 +0100 |
| commit | 354305c3cf14c429832f09b5246a7dffdec23f2d (patch) | |
| tree | 8cdcb000cefc5b31173ca7f5ea6be648be63cfa2 | |
| parent | e7b9886c7cbfac488b766b24379249853f78a040 (diff) | |
| download | platform_external_arm-trusted-firmware-354305c3cf14c429832f09b5246a7dffdec23f2d.tar.gz platform_external_arm-trusted-firmware-354305c3cf14c429832f09b5246a7dffdec23f2d.tar.bz2 platform_external_arm-trusted-firmware-354305c3cf14c429832f09b5246a7dffdec23f2d.zip | |
Fix MISRA defects in SP805 driver
Fix violations of MISRA C-2012 Rules 10.1, 10.3 and 10.4.
Change-Id: I13c6acda798c1666892f630f097a23e68748f9e4
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
| -rw-r--r-- | drivers/arm/sp805/sp805.c | 18 | ||||
| -rw-r--r-- | include/drivers/arm/sp805.h | 26 |
2 files changed, 23 insertions, 21 deletions
diff --git a/drivers/arm/sp805/sp805.c b/drivers/arm/sp805/sp805.c index 98df7e215..aee90164a 100644 --- a/drivers/arm/sp805/sp805.c +++ b/drivers/arm/sp805/sp805.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -10,17 +10,17 @@ /* Inline register access functions */ -static inline void sp805_write_wdog_load(uintptr_t base, unsigned long value) +static inline void sp805_write_wdog_load(uintptr_t base, uint32_t value) { mmio_write_32(base + SP805_WDOG_LOAD_OFF, value); } -static inline void sp805_write_wdog_ctrl(uintptr_t base, unsigned long value) +static inline void sp805_write_wdog_ctrl(uintptr_t base, uint32_t value) { mmio_write_32(base + SP805_WDOG_CTR_OFF, value); } -static inline void sp805_write_wdog_lock(uintptr_t base, unsigned long value) +static inline void sp805_write_wdog_lock(uintptr_t base, uint32_t value) { mmio_write_32(base + SP805_WDOG_LOCK_OFF, value); } @@ -28,23 +28,23 @@ static inline void sp805_write_wdog_lock(uintptr_t base, unsigned long value) /* Public API implementation */ -void sp805_start(uintptr_t base, unsigned long ticks) +void sp805_start(uintptr_t base, unsigned int ticks) { sp805_write_wdog_load(base, ticks); sp805_write_wdog_ctrl(base, SP805_CTR_RESEN | SP805_CTR_INTEN); /* Lock registers access */ - sp805_write_wdog_lock(base, 0); + sp805_write_wdog_lock(base, 0U); } void sp805_stop(uintptr_t base) { sp805_write_wdog_lock(base, WDOG_UNLOCK_KEY); - sp805_write_wdog_ctrl(base, 0); + sp805_write_wdog_ctrl(base, 0U); } -void sp805_refresh(uintptr_t base, unsigned long ticks) +void sp805_refresh(uintptr_t base, unsigned int ticks) { sp805_write_wdog_lock(base, WDOG_UNLOCK_KEY); sp805_write_wdog_load(base, ticks); - sp805_write_wdog_lock(base, 0); + sp805_write_wdog_lock(base, 0U); } diff --git a/include/drivers/arm/sp805.h b/include/drivers/arm/sp805.h index f00bcbac2..e7714a393 100644 --- a/include/drivers/arm/sp805.h +++ b/include/drivers/arm/sp805.h @@ -1,23 +1,25 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __SP805_H__ -#define __SP805_H__ +#ifndef SP805_H +#define SP805_H + +#include <utils_def.h> /* SP805 register offset */ -#define SP805_WDOG_LOAD_OFF 0x000 -#define SP805_WDOG_CTR_OFF 0x008 -#define SP805_WDOG_LOCK_OFF 0xc00 +#define SP805_WDOG_LOAD_OFF UL(0x000) +#define SP805_WDOG_CTR_OFF UL(0x008) +#define SP805_WDOG_LOCK_OFF UL(0xc00) /* Magic word to unlock the wd registers */ -#define WDOG_UNLOCK_KEY 0x1ACCE551 +#define WDOG_UNLOCK_KEY U(0x1ACCE551) /* Register field definitions */ -#define SP805_CTR_RESEN (1 << 1) -#define SP805_CTR_INTEN (1 << 0) +#define SP805_CTR_RESEN (U(1) << 1) +#define SP805_CTR_INTEN (U(1) << 0) #ifndef __ASSEMBLY__ @@ -25,10 +27,10 @@ /* Public high level API */ -void sp805_start(uintptr_t base, unsigned long ticks); +void sp805_start(uintptr_t base, unsigned int ticks); void sp805_stop(uintptr_t base); -void sp805_refresh(uintptr_t base, unsigned long ticks); +void sp805_refresh(uintptr_t base, unsigned int ticks); #endif /* __ASSEMBLY__ */ -#endif /* __SP805_H__ */ +#endif /* SP805_H */ |