From 1f1871040436d26770320d2d29909f3a99cd70a3 Mon Sep 17 00:00:00 2001
From: Philippe Simons <loki_666@fastmail.fm>
Date: Thu, 7 Jul 2005 21:20:38 +0000
Subject: 2005-07-07	Philippe Simons <loki_666@fastmail.fm>

	* Makefile.am: Remove s3c2400/lcd/lcd.c
	* s3c2400/lcd/lcd.c: Remove.
	* s3c2400/clock/support.c: file "rewrote" to avoid GPL.
---
 c/src/lib/libcpu/arm/ChangeLog               |  6 ++++
 c/src/lib/libcpu/arm/Makefile.am             |  6 ----
 c/src/lib/libcpu/arm/s3c2400/clock/support.c | 44 +++++++++++++---------------
 3 files changed, 27 insertions(+), 29 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libcpu/arm/ChangeLog b/c/src/lib/libcpu/arm/ChangeLog
index 7d97ead044..2723682ba5 100644
--- a/c/src/lib/libcpu/arm/ChangeLog
+++ b/c/src/lib/libcpu/arm/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-07	Philippe Simons <loki_666@fastmail.fm>
+
+	* Makefile.am: Remove s3c2400/lcd/lcd.c
+	* s3c2400/lcd/lcd.c: Remove.
+	* s3c2400/clock/support.c: file "rewrote" to avoid GPL.
+
 2005-06-01	Philippe Simons <loki_666@fastmail.fm>
 
 	* Makefile.am: Add s3c2400/lcd/lcd.c, s3c2400/clock/support.c
diff --git a/c/src/lib/libcpu/arm/Makefile.am b/c/src/lib/libcpu/arm/Makefile.am
index fb76474ff6..056397dbe2 100644
--- a/c/src/lib/libcpu/arm/Makefile.am
+++ b/c/src/lib/libcpu/arm/Makefile.am
@@ -106,12 +106,6 @@ s3c2400_timer_rel_SOURCES = s3c2400/timer/timer.c
 s3c2400_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
 s3c2400_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
-## s3c2400/lcd
-noinst_PROGRAMS += s3c2400/lcd.rel
-s3c2400_lcd_rel_SOURCES = s3c2400/lcd/lcd.c
-s3c2400_lcd_rel_CPPFLAGS = $(AM_CPPLAGS)
-s3c2400_lcd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
 ## s3c2400/interrupt
 include_HEADERS += s3c2400/irq/irq.h
 
diff --git a/c/src/lib/libcpu/arm/s3c2400/clock/support.c b/c/src/lib/libcpu/arm/s3c2400/clock/support.c
index a88710b797..7d85c1a9f4 100644
--- a/c/src/lib/libcpu/arm/s3c2400/clock/support.c
+++ b/c/src/lib/libcpu/arm/s3c2400/clock/support.c
@@ -2,9 +2,6 @@
 #include <bsp.h>
 #include <s3c2400.h>
 
-#define MPLL 0
-#define UPLL 1
-
 /* ------------------------------------------------------------------------- */
 /* NOTE: This describes the proper use of this file.
  *
@@ -15,17 +12,12 @@
  */
 /* ------------------------------------------------------------------------- */
 
-static uint32_t get_PLLCLK(int pllreg)
+/* return FCLK frequency */
+uint32_t get_FCLK(void)
 {
     uint32_t r, m, p, s;
 
-    if (pllreg == MPLL)
-	r = rMPLLCON;
-    else if (pllreg == UPLL)
-	r = rUPLLCON;
-    else
-	return 0;
-
+    r = rMPLLCON;
     m = ((r & 0xFF000) >> 12) + 8;
     p = ((r & 0x003F0) >> 4) + 2;
     s = r & 0x3;
@@ -33,27 +25,33 @@ static uint32_t get_PLLCLK(int pllreg)
     return((BSP_OSC_FREQ * m) / (p << s));
 }
 
-/* return FCLK frequency */
-uint32_t get_FCLK(void)
+/* return UCLK frequency */
+uint32_t get_UCLK(void)
 {
-    return(get_PLLCLK(MPLL));
+    uint32_t r, m, p, s;
+
+    r = rUPLLCON;
+    m = ((r & 0xFF000) >> 12) + 8;
+    p = ((r & 0x003F0) >> 4) + 2;
+    s = r & 0x3;
+
+    return((BSP_OSC_FREQ * m) / (p << s));
 }
 
 /* return HCLK frequency */
 uint32_t get_HCLK(void)
 {
-    return((rCLKDIVN & 0x2) ? get_FCLK()/2 : get_FCLK());
+    if (rCLKDIVN & 0x2) 
+	return get_FCLK()/2;
+    else
+	return get_FCLK();    
 }
 
 /* return PCLK frequency */
 uint32_t get_PCLK(void)
 {
-    return((rCLKDIVN & 0x1) ? get_HCLK()/2 : get_HCLK());
-}
-
-/* return UCLK frequency */
-uint32_t get_UCLK(void)
-{
-    return(get_PLLCLK(UPLL));
+    if (rCLKDIVN & 0x1)
+	return get_HCLK()/2;
+    else
+	return get_HCLK();
 }
-
-- 
cgit v1.2.3