software: remove redundant clk_frequency

m-labs · Nov 22, 2011 · 028c9f6 · 028c9f6
1 parent 0f65527
commit 028c9f6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/software/bios/main.c b/software/bios/main.c
@@ -476,7 +476,7 @@ static int test_user_abort()
 
 	puts("I: Press Q or ESC to abort boot");
 	CSR_TIMER0_COUNTER = 0;
-	CSR_TIMER0_COMPARE = 2*brd_desc->clk_frequency;
+	CSR_TIMER0_COMPARE = 2*CSR_FREQUENCY;
 	CSR_TIMER0_CONTROL = TIMER_ENABLE;
 	while(CSR_TIMER0_CONTROL & TIMER_ENABLE) {
 		if(readchar_nonblock()) {
@@ -596,7 +596,7 @@ static void readstr(char *s, int size)
 static void ethreset_delay()
 {
 	CSR_TIMER0_COUNTER = 0;
-	CSR_TIMER0_COMPARE = brd_desc->clk_frequency >> 2;
+	CSR_TIMER0_COMPARE = CSR_FREQUENCY >> 2;
 	CSR_TIMER0_CONTROL = TIMER_ENABLE;
 	while(CSR_TIMER0_CONTROL & TIMER_ENABLE);
 }

diff --git a/software/demo/memstats.c b/software/demo/memstats.c
@@ -1,6 +1,6 @@
 /*
  * Milkymist SoC (Software)
- * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq
+ * Copyright (C) 2007, 2008, 2009, 2010, 2011 Sebastien Bourdeauducq
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,8 @@
 
 #include <board.h>
 
-#include <hal/brd.h>
-
 #include <hw/fmlmeter.h>
+#include <hw/sysctl.h>
 
 static unsigned int last_stb_count;
 static unsigned int last_ack_count;
@@ -41,7 +40,7 @@ void memstats_tick()
 
 unsigned int memstat_occupancy()
 {
-	return last_stb_count/(brd_desc->clk_frequency/100);
+	return last_stb_count/(CSR_FREQUENCY/100);
 }
 
 unsigned int memstat_net_bandwidth()

diff --git a/software/include/base/board.h b/software/include/base/board.h
@@ -1,6 +1,6 @@
 /*
  * Milkymist SoC (Software)
- * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq
+ * Copyright (C) 2007, 2008, 2009, 2010, 2011 Sebastien Bourdeauducq
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 struct board_desc {
 	unsigned short int id;
 	char name[BOARD_NAME_LEN];
-	unsigned int clk_frequency;
 	unsigned int ethernet_phyadr;
 };
 

diff --git a/software/libbase/board.c b/software/libbase/board.c
@@ -1,6 +1,6 @@
 /*
  * Milkymist SoC (Software)
- * Copyright (C) 2007, 2008, 2009 Sebastien Bourdeauducq
+ * Copyright (C) 2007, 2008, 2009, 2011 Sebastien Bourdeauducq
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ static const struct board_desc boards[1] = {
 	{
 		.id = 0x4D31, /* M1 */
 		.name = "Milkymist One",
-		.clk_frequency = 80000000,
 		.ethernet_phyadr = 1
 	},
 };

diff --git a/software/libhal/time.c b/software/libhal/time.c
@@ -23,7 +23,6 @@
 #include <hw/sysctl.h>
 #include <hw/interrupts.h>
 
-#include <hal/brd.h>
 #include <hal/time.h>
 
 static int sec;
@@ -33,7 +32,7 @@ void time_init()
 	unsigned int mask;
 
 	CSR_TIMER0_COUNTER = 0;
-	CSR_TIMER0_COMPARE = brd_desc->clk_frequency;
+	CSR_TIMER0_COMPARE = CSR_FREQUENCY;
 	CSR_TIMER0_CONTROL = TIMER_AUTORESTART|TIMER_ENABLE;
 	irq_ack(IRQ_TIMER0);
 
@@ -64,15 +63,15 @@ void time_get(struct timestamp *ts)
 	irq_setmask(oldmask);
 
 	ts->sec = sec2;
-	ts->usec = counter/(brd_desc->clk_frequency/1000000);
+	ts->usec = counter/(CSR_FREQUENCY/1000000);
 
 	/*
 	 * If the counter is less than half a second, we consider that
 	 * the overflow was already present when we read the counter
 	 * value.
 	 */
 	if(pending) {
-		if(counter < (brd_desc->clk_frequency/2))
+		if(counter < (CSR_FREQUENCY/2))
 			ts->sec++;
 	}
 }