summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2004-07-12 23:01:53 -0400
committerNathan Binkert <binkertn@umich.edu>2004-07-12 23:01:53 -0400
commit195768d4768e43da451729efb6a445eee2b1462c (patch)
treec3b2686b5416d66941bab3c13b292d20ea427db1 /util
parent13f8dc981fc898e6e200689d305b39f0718f8c83 (diff)
downloadgem5-195768d4768e43da451729efb6a445eee2b1462c.tar.xz
put the formatting fixes back into devtime
util/ccdrv/devtime.c: put the formatting fixes back. no tabs. --HG-- extra : convert_revision : 541e91294ee5383f3b321dd084876ae7c353cce9
Diffstat (limited to 'util')
-rw-r--r--util/ccdrv/devtime.c44
1 files changed, 17 insertions, 27 deletions
diff --git a/util/ccdrv/devtime.c b/util/ccdrv/devtime.c
index c3897e597..e487f2fe7 100644
--- a/util/ccdrv/devtime.c
+++ b/util/ccdrv/devtime.c
@@ -54,18 +54,16 @@ static inline uint32_t cycleCounter(uint32_t dep);
static int __init devtime_start(void)
{
uint64_t addr;
- uint32_t t1, t2;
+ uint32_t t1, t2;
uint32_t trash;
int x;
uint32_t *times;
uint32_t num = 0;
struct net_device *dev;
-
printk("Devtime Driver Version %s Loaded...\n", DRIVER_VER);
- if ((dataAddr != 0) && (count != 0))
- {
+ if (dataAddr != 0 && count != 0) {
addr = simple_strtoull(dataAddr, NULL, 0);
addr = ioremap(addr, PAGE_SIZE);
@@ -75,19 +73,16 @@ static int __init devtime_start(void)
* if physical memory is mapped to this address.
*/
times = kmalloc(sizeof(uint32_t) * count, GFP_USER);
- if (!times)
- {
+ if (!times) {
printk("Could not allocate memory... Try again later.\n");
return -1;
}
- if (addr)
- {
+ if (addr) {
printk("Preparing to read %#llx %d times.\n", addr, count);
t1 = cycleCounter(trash);
- for (x=0; x < count; x++)
- {
+ for (x = 0; x < count; x++) {
trash = readl(addr);
t2 = cycleCounter(trash);
times[num++] = t2 - t1;
@@ -100,36 +95,30 @@ static int __init devtime_start(void)
iounmap(addr);
printk("Measurements:\n");
- for (x = 0; x < count; x++)
- {
+ for (x = 0; x < count; x++) {
printk("%d ", times[x]);
- if (((x+1) % 10) == 0)
+ if (((x + 1) % 10) == 0)
printk("\n");
}
printk("\nDone.\n");
-
-
- }
- else
+ } else {
printk("Unable to remap address. Please try again later.\n");
+ }
} else {
dev = dev_get_by_name("eth0");
- if (dev)
- {
- printk("Eth0: MemStart: %#lx MemEnd: %#lx I/O Addr: %#lx\n", dev->mem_start,
- dev->mem_end, dev->base_addr);
+ if (dev) {
+ printk("Eth0: MemStart: %#lx MemEnd: %#lx I/O Addr: %#lx\n",
+ dev->mem_start, dev->mem_end, dev->base_addr);
dev_put(dev);
}
dev = 0;
dev = dev_get_by_name("eth1");
- if (dev)
- {
- printk("Eth1: MemStart: %#lx MemEnd: %#lx I/O Addr: %#lx\n", dev->mem_start,
- dev->mem_end, dev->base_addr);
+ if (dev) {
+ printk("Eth1: MemStart: %#lx MemEnd: %#lx I/O Addr: %#lx\n",
+ dev->mem_start, dev->mem_end, dev->base_addr);
dev_put(dev);
}
-
printk("Required information not supplied.\n");
}
@@ -159,7 +148,8 @@ inline uint32_t cycleCounter(uint32_t dep)
#error Architecture NOT SUPPORTE
#endif
-static void __exit devtime_end(void) {
+static void __exit devtime_end(void)
+{
printk("Devtime Driver Version %s Unloaded...\n", DRIVER_VER);
}