From 779b3e312901d4ef533d5cc13f551bab2823de08 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 10 Nov 2008 15:43:37 +0000 Subject: Merge some parts of the i945 review (trivial): * fix \r\n occurence in i945 code * drop early TOLUD write * fix 16bit BCTRL1 access Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3741 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/intel/i945/rcven.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/northbridge/intel/i945/rcven.c') diff --git a/src/northbridge/intel/i945/rcven.c b/src/northbridge/intel/i945/rcven.c index e7eea611f2..47b4da7c8a 100644 --- a/src/northbridge/intel/i945/rcven.c +++ b/src/northbridge/intel/i945/rcven.c @@ -67,7 +67,7 @@ static void set_receive_enable(int channel_offset, u8 medium, u8 coarse) { u32 reg32; - printk_spew(" set_receive_enable() medium=0x%x, coarse=0x%x\r\n", medium, coarse); + printk_spew(" set_receive_enable() medium=0x%x, coarse=0x%x\n", medium, coarse); reg32 = MCHBAR32(C0DRT1 + channel_offset); reg32 &= 0xf0ffffff; @@ -101,7 +101,7 @@ static void set_receive_enable(int channel_offset, u8 medium, u8 coarse) static int normalize(int channel_offset, u8 * mediumcoarse, u8 * fine) { - printk_spew(" normalize()\r\n"); + printk_spew(" normalize()\n"); if (*fine < 0x80) return 0; @@ -110,7 +110,7 @@ static int normalize(int channel_offset, u8 * mediumcoarse, u8 * fine) *mediumcoarse += 1; if (*mediumcoarse >= 0x40) { - printk_debug("Normalize Error\r\n"); + printk_debug("Normalize Error\n"); return -1; } @@ -128,12 +128,12 @@ static int find_preamble(int channel_offset, u8 * mediumcoarse, /* find start of the data phase */ u32 reg32; - printk_spew(" find_preamble()\r\n"); + printk_spew(" find_preamble()\n"); do { if (*mediumcoarse < 4) { - printk_debug("No Preamble found.\r\n"); + printk_debug("No Preamble found.\n"); return -1; } *mediumcoarse -= 4; @@ -147,7 +147,7 @@ static int find_preamble(int channel_offset, u8 * mediumcoarse, if (!(reg32 & (1 << 18))) { - printk_debug("No Preamble found (neither high nor low).\r\n"); + printk_debug("No Preamble found (neither high nor low).\n"); return -1; } @@ -160,14 +160,14 @@ static int find_preamble(int channel_offset, u8 * mediumcoarse, static int add_quarter_clock(int channel_offset, u8 * mediumcoarse, u8 * fine) { - printk_spew(" add_quarter_clock() mediumcoarse=%02x fine=%02x\r\n", + printk_spew(" add_quarter_clock() mediumcoarse=%02x fine=%02x\n", *mediumcoarse, *fine); if (*fine >= 0x80) { *fine -= 0x80; *mediumcoarse += 2; if (*mediumcoarse >= 0x40) { - printk_debug("clocks at max.\r\n"); + printk_debug("clocks at max.\n"); return -1; } @@ -187,7 +187,7 @@ static int find_strobes_low(int channel_offset, u8 * mediumcoarse, u8 * fine, { u32 rcvenmt; - printk_spew(" find_strobes_low()\r\n"); + printk_spew(" find_strobes_low()\n"); for (;;) { MCHBAR8(C0WL0REOST + channel_offset) = *fine; @@ -213,7 +213,7 @@ static int find_strobes_low(int channel_offset, u8 * mediumcoarse, u8 * fine, } - printk_debug("Could not find low strobe\r\n"); + printk_debug("Could not find low strobe\n"); return 0; } @@ -223,7 +223,7 @@ static int find_strobes_edge(int channel_offset, u8 * mediumcoarse, u8 * fine, int counter; u32 rcvenmt; - printk_spew(" find_strobes_edge()\r\n"); + printk_spew(" find_strobes_edge()\n"); counter = 8; set_receive_enable(channel_offset, *mediumcoarse & 3, @@ -258,7 +258,7 @@ static int find_strobes_edge(int channel_offset, u8 * mediumcoarse, u8 * fine, continue; } - printk_debug("could not find rising edge.\r\n"); + printk_debug("could not find rising edge.\n"); return -1; } @@ -287,7 +287,7 @@ static int receive_enable_autoconfig(int channel_offset, u8 mediumcoarse; u8 fine; - printk_spew("receive_enable_autoconfig() for channel %d\r\n", + printk_spew("receive_enable_autoconfig() for channel %d\n", channel_offset ? 1 : 0); /* Set initial values */ -- cgit v1.2.3