Module Name: src
Committed By: jmcneill
Date: Sat Oct 21 02:21:30 UTC 2017
Modified Files:
src/sys/arch/arm/sunxi: sunxi_platform.c
Log Message:
Fix sun4i platform delay to sleep the requested number of microseconds
instead of the requested number of clock ticks.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sunxi_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.11 src/sys/arch/arm/sunxi/sunxi_platform.c:1.12
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.11 Wed Oct 11 10:52:54 2017
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Sat Oct 21 02:21:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.11 2017/10/11 10:52:54 jmcneill Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.12 2017/10/21 02:21:30 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.11 2017/10/11 10:52:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.12 2017/10/21 02:21:30 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -194,8 +194,9 @@ sun4i_platform_delay(u_int n)
{
static bus_space_tag_t bst = &armv7_generic_bs_tag;
static bus_space_handle_t bsh = 0;
+ const long incs_per_us = SUNXI_REF_FREQ / 1000000;
+ long ticks = n * incs_per_us;
uint32_t cur, prev;
- long ticks = n;
if (bsh == 0)
bus_space_map(bst, SUN4I_TIMER_BASE, SUN4I_TIMER_SIZE, 0, &bsh);
