put the formatting fixes back into devtime

util/ccdrv/devtime.c:
    put the formatting fixes back.  no tabs.

--HG--
extra : convert_revision : 541e91294ee5383f3b321dd084876ae7c353cce9
This commit is contained in:
Nathan Binkert 2004-07-12 23:01:53 -04:00
parent 13f8dc981f
commit 195768d476

View file

@ -54,18 +54,16 @@ static inline uint32_t cycleCounter(uint32_t dep);
static int __init devtime_start(void) static int __init devtime_start(void)
{ {
uint64_t addr; uint64_t addr;
uint32_t t1, t2; uint32_t t1, t2;
uint32_t trash; uint32_t trash;
int x; int x;
uint32_t *times; uint32_t *times;
uint32_t num = 0; uint32_t num = 0;
struct net_device *dev; struct net_device *dev;
printk("Devtime Driver Version %s Loaded...\n", DRIVER_VER); 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 = simple_strtoull(dataAddr, NULL, 0);
addr = ioremap(addr, PAGE_SIZE); addr = ioremap(addr, PAGE_SIZE);
@ -75,19 +73,16 @@ static int __init devtime_start(void)
* if physical memory is mapped to this address. * if physical memory is mapped to this address.
*/ */
times = kmalloc(sizeof(uint32_t) * count, GFP_USER); times = kmalloc(sizeof(uint32_t) * count, GFP_USER);
if (!times) if (!times) {
{
printk("Could not allocate memory... Try again later.\n"); printk("Could not allocate memory... Try again later.\n");
return -1; return -1;
} }
if (addr) if (addr) {
{
printk("Preparing to read %#llx %d times.\n", addr, count); printk("Preparing to read %#llx %d times.\n", addr, count);
t1 = cycleCounter(trash); t1 = cycleCounter(trash);
for (x=0; x < count; x++) for (x = 0; x < count; x++) {
{
trash = readl(addr); trash = readl(addr);
t2 = cycleCounter(trash); t2 = cycleCounter(trash);
times[num++] = t2 - t1; times[num++] = t2 - t1;
@ -100,36 +95,30 @@ static int __init devtime_start(void)
iounmap(addr); iounmap(addr);
printk("Measurements:\n"); printk("Measurements:\n");
for (x = 0; x < count; x++) for (x = 0; x < count; x++) {
{
printk("%d ", times[x]); printk("%d ", times[x]);
if (((x+1) % 10) == 0) if (((x + 1) % 10) == 0)
printk("\n"); printk("\n");
} }
printk("\nDone.\n"); printk("\nDone.\n");
} else {
}
else
printk("Unable to remap address. Please try again later.\n"); printk("Unable to remap address. Please try again later.\n");
}
} else { } else {
dev = dev_get_by_name("eth0"); dev = dev_get_by_name("eth0");
if (dev) if (dev) {
{ printk("Eth0: MemStart: %#lx MemEnd: %#lx I/O Addr: %#lx\n",
printk("Eth0: MemStart: %#lx MemEnd: %#lx I/O Addr: %#lx\n", dev->mem_start, dev->mem_start, dev->mem_end, dev->base_addr);
dev->mem_end, dev->base_addr);
dev_put(dev); dev_put(dev);
} }
dev = 0; dev = 0;
dev = dev_get_by_name("eth1"); dev = dev_get_by_name("eth1");
if (dev) if (dev) {
{ printk("Eth1: MemStart: %#lx MemEnd: %#lx I/O Addr: %#lx\n",
printk("Eth1: MemStart: %#lx MemEnd: %#lx I/O Addr: %#lx\n", dev->mem_start, dev->mem_start, dev->mem_end, dev->base_addr);
dev->mem_end, dev->base_addr);
dev_put(dev); dev_put(dev);
} }
printk("Required information not supplied.\n"); printk("Required information not supplied.\n");
} }
@ -159,7 +148,8 @@ inline uint32_t cycleCounter(uint32_t dep)
#error Architecture NOT SUPPORTE #error Architecture NOT SUPPORTE
#endif #endif
static void __exit devtime_end(void) { static void __exit devtime_end(void)
{
printk("Devtime Driver Version %s Unloaded...\n", DRIVER_VER); printk("Devtime Driver Version %s Unloaded...\n", DRIVER_VER);
} }