# HG changeset patch
# User mru
# Date 1238626586 0
# Node ID faf384df4bd74e0c14c9188703bbedbcf1099d23
# Parent  fa8c9944568f1faba36572282a269b48e3e89af7
ARM: START/STOP_TIMER support for ARMv7

diff -r fa8c9944568f -r faf384df4bd7 arm/timer.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/arm/timer.h	Wed Apr 01 22:56:26 2009 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_ARM_TIMER_H
+#define AVUTIL_ARM_TIMER_H
+
+#include <stdint.h>
+
+#if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__)
+
+#define AV_READ_TIME read_time
+
+static inline uint64_t read_time(void)
+{
+    unsigned cc;
+    __asm__ volatile ("mrc p15, 0, %0, c9, c13, 0" : "=r"(cc));
+    return cc;
+}
+
+#endif /* HAVE_INLINE_ASM && __ARM_ARCH_7A__ */
+
+#endif /* AVUTIL_ARM_TIMER_H */
diff -r fa8c9944568f -r faf384df4bd7 timer.h
--- a/timer.h	Wed Apr 01 22:56:22 2009 +0000
+++ b/timer.h	Wed Apr 01 22:56:26 2009 +0000
@@ -28,7 +28,9 @@
 #include <stdint.h>
 #include "config.h"
 
-#if   ARCH_BFIN
+#if   ARCH_ARM
+#   include "arm/timer.h"
+#elif ARCH_BFIN
 #   include "bfin/timer.h"
 #elif ARCH_PPC
 #   include "ppc/timer.h"