Skip to contentSkip to conversation

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

PATCH New Hugo Villeneuve 3 participants 5 messages Sep 1, 2008 – Sep 2, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

---

Remove duplicate code in a if/else block in
cpu/arm926ejs/davinci/dp83848.c.

 cpu/arm926ejs/config.mk         |    2 +-
 cpu/arm926ejs/davinci/dp83848.c |   32 +++++++++-----------------------
 2 files changed, 10 insertions(+), 24 deletions(-)
cpu/arm926ejs/config.mk +1 -1
index 8db4adb..fc54845 100644
@@ -30,5 +30,5 @@ PLATFORM_CPPFLAGS += -march=armv4
 # Supply options according to compiler version
 #
 # =========================================================================
-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)
 PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
cpu/arm926ejs/davinci/dp83848.c +9 -23
index 2aa9ef1..ef77ecb 100644
@@ -64,29 +64,15 @@ int dp83848_get_link_speed(int phy_addr)
 		return(0);
 
 	/* Speed doesn't matter, there is no setting for it in EMAC... */
-	if (tmp & DP83848_SPEED) {
-		if (tmp & DP83848_DUPLEX) {
-			/* set DM644x EMAC for Full Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
-		} else {
-			/*set DM644x EMAC for Half Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
-		}
-
-		return(1);
-	} else {
-		if (tmp & DP83848_DUPLEX) {
-			/* set DM644x EMAC for Full Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
-		} else {
-			/*set DM644x EMAC for Half Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
-		}
-
-		return(1);
-	}
-
-	return(0);
+	if (tmp & DP83848_DUPLEX)
+		/* Set DM644x EMAC for Full Duplex */
+		emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE |
+			EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
+	else
+		/* Set DM644x EMAC for Half Duplex */
+		emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
+
+	return(1);
 }
 
 
#1 lore raw

PATCH 1/1 ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

On Mon, 1 Sep 2008, Hugo Villeneuve wrote:

Quoted 74 lines

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

---

Remove duplicate code in a if/else block in
cpu/arm926ejs/davinci/dp83848.c.

cpu/arm926ejs/config.mk | 2 +-
cpu/arm926ejs/davinci/dp83848.c | 32 +++++++++-----------------------

2 files changed, 10 insertions(+), 24 deletions(-)
cpu/arm926ejs/config.mk +0 -0
index 8db4adb..fc54845 100644
@@ -30,5 +30,5 @@ PLATFORM_CPPFLAGS += -march=armv4
 # Supply options according to compiler version
 #
 #

========================================================================
=

cpu/arm926ejs/config.mk +1 -1
-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)

PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))

cpu/arm926ejs/davinci/dp83848.c +9 -23
index 2aa9ef1..ef77ecb 100644
@@ -64,29 +64,15 @@ int dp83848_get_link_speed(int phy_addr)
 		return(0);
 
 	/* Speed doesn't matter, there is no setting for it in EMAC...
 */
-	if (tmp & DP83848_SPEED) {
-		if (tmp & DP83848_DUPLEX) {
-			/* set DM644x EMAC for Full Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE
 | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
-		} else {
-			/*set DM644x EMAC for Half Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
-		}
-
-		return(1);
-	} else {
-		if (tmp & DP83848_DUPLEX) {
-			/* set DM644x EMAC for Full Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE
 | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
-		} else {
-			/*set DM644x EMAC for Half Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
-		}
-
-		return(1);
-	}
-
-	return(0);
+	if (tmp & DP83848_DUPLEX)
+		/* Set DM644x EMAC for Full Duplex */
+		emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE |
+			EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
+	else
+		/* Set DM644x EMAC for Half Duplex */
+		emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
+
+	return(1);

}

Quoted 5 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

---
******************************************************************
* KSI at home KOI8 Net < > The impossible we do immediately. *
* Las Vegas NV, USA < > Miracles require 24-hour notice. *
******************************************************************

#2 lore raw

PATCH 1/1 ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

In reply to Hugo Villeneuve
Quoted 18 lines · Hugo Villeneuve

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

---

Remove duplicate code in a if/else block in
cpu/arm926ejs/davinci/dp83848.c.

 cpu/arm926ejs/config.mk         |    2 +-
 cpu/arm926ejs/davinci/dp83848.c |   32 +++++++++-----------------------
 2 files changed, 10 insertions(+), 24 deletions(-)
cpu/arm926ejs/config.mk +0 -0
index 8db4adb..fc54845 100644

cpu/arm926ejs/config.mk PLATFORM_CPPFLAGS += -march=armv4 · line 33

Quoted 5 lines
cpu/arm926ejs/config.mk +1 -1
@@ -30,5 +30,5 @@ PLATFORM_CPPFLAGS += -march=armv4
 # Supply options according to compiler version
 #
 # =========================================================================
-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)

why do you remove -mabi=apcs-gnu

which is unrelated to the commit comment

Best Regards,
J.

#3 lore raw

PATCH 1/1 ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

Quoted 27 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 18 lines · Hugo Villeneuve

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

---

Remove duplicate code in a if/else block in
cpu/arm926ejs/davinci/dp83848.c.

 cpu/arm926ejs/config.mk         |    2 +-
 cpu/arm926ejs/davinci/dp83848.c |   32 +++++++++-----------------------
 2 files changed, 10 insertions(+), 24 deletions(-)
cpu/arm926ejs/config.mk +0 -0
index 8db4adb..fc54845 100644

cpu/arm926ejs/config.mk PLATFORM_CPPFLAGS += -march=armv4 · line 33

Quoted 5 lines
cpu/arm926ejs/config.mk +1 -1
@@ -30,5 +30,5 @@ PLATFORM_CPPFLAGS += -march=armv4
 # Supply options according to compiler version
 #
 # =========================================================================
-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32)

why do you remove -mabi=apcs-gnu

Quoted 1 line

which is unrelated to the commit comment

Sorry about that,
you can forget it, it was some temporary workaround for an old toolchain :)

Hugo V.

#4 lore raw

PATCH v2 1/1 ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

In reply to Jean-Christophe PLAGNIOL-VILLARD

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

---

Remove duplicate code in a if/else block in
cpu/arm926ejs/davinci/dp83848.c.

 cpu/arm926ejs/davinci/dp83848.c |   27 +++++++--------------------
 1 files changed, 7 insertions(+), 20 deletions(-)
cpu/arm926ejs/davinci/dp83848.c +7 -20
index 59f039b..c71c685 100644
@@ -64,29 +64,16 @@ int dp83848_get_link_speed(int phy_addr)
 		return(0);
 
 	/* Speed doesn't matter, there is no setting for it in EMAC... */
-	if (tmp & DP83848_SPEED) {
-		if (tmp & DP83848_DUPLEX) {
-			/* set DM644x EMAC for Full Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
-		} else {
-			/*set DM644x EMAC for Half Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
-		}
-
-		return(1);
+	if (tmp & DP83848_DUPLEX) {
+		/* set DM644x EMAC for Full Duplex  */
+		emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE |
+			EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
 	} else {
-		if (tmp & DP83848_DUPLEX) {
-			/* set DM644x EMAC for Full Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
-		} else {
-			/*set DM644x EMAC for Half Duplex  */
-			emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
-		}
-
-		return(1);
+		/*set DM644x EMAC for Half Duplex  */
+		emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
 	}
 
-	return(0);
+	return(1);
 }