Changeset acc0efb in mainline

Timestamp:

2012-10-15T13:33:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9727b92

Parents:

5b082ba9

Message:

libc: Implement pio tracing.

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• generic/ddi.c (modified) (6 diffs)
• generic/pio_trace.c (added)
• include/ddi.h (modified) (2 diffs)

uspace/lib/c/Makefile

@@ -140 +140 @@
         generic/sort.c \
         generic/stats.c \
-        generic/assert.c
+        generic/assert.c \
+        generic/pio_trace.c
 
 ifeq ($(CONFIG_RTLD),y)

uspace/lib/c/generic/ddi.c

@@ -34 +34 @@
 
 #include <assert.h>
+#include <atomic.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -46 +48 @@
 #include <libarch/config.h>
 #include "private/libc.h"
+
 
 /** Return unique device number.
@@ -171 +174 @@
 void pio_write_8(ioport8_t *reg, uint8_t val)
 {
+        pio_trace_log(reg, val, true);
         arch_pio_write_8(reg, val);
 }
@@ -176 +180 @@
 void pio_write_16(ioport16_t *reg, uint16_t val)
 {
+        pio_trace_log(reg, val, true);
         arch_pio_write_16(reg, val);
 }
@@ -181 +186 @@
 void pio_write_32(ioport32_t *reg, uint32_t val)
 {
+        pio_trace_log(reg, val, true);
         arch_pio_write_32(reg, val);
 }
@@ -186 +192 @@
 uint8_t pio_read_8(ioport8_t *reg)
 {
-        return arch_pio_read_8(reg);
+        const uint8_t val = arch_pio_read_8(reg);
+        pio_trace_log(reg, val, false);
+        return val;
 }
 
 uint16_t pio_read_16(ioport16_t *reg)
 {
-        return arch_pio_read_16(reg);
+        const uint16_t val = arch_pio_read_16(reg);
+        pio_trace_log(reg, val, false);
+        return val;
 }
 
 uint32_t pio_read_32(ioport32_t *reg)
 {
-        return arch_pio_read_32(reg);
+        const uint32_t val = arch_pio_read_32(reg);
+        pio_trace_log(reg, val, false);
+        return val;
 }
 

uspace/lib/c/include/ddi.h

@@ -36 +36 @@
 #define LIBC_DDI_H_
 
+#include <bool.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -52 +53 @@
 
 extern int pio_enable(void *, size_t, void **);
+
+typedef void (*trace_fnc)(volatile void *place, uint32_t val,
+    volatile void* base, size_t size, void *data, bool write);
+
+extern int pio_trace_enable(void *, size_t, trace_fnc, void *);
+extern void pio_trace_log(volatile void *, uint32_t val, bool write);
+extern void pio_trace_disable(void *);
 
 extern void pio_write_8(ioport8_t *, uint8_t);