[SerialICE] New patch to review for serialice: 15ee1c0 Fix output from superio filter

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2594

-gerrit

commit 15ee1c0e544e82b825abc018d744b9f19ee8a290
Author: Kyösti Mälkki 
Date:   Wed Mar 6 07:40:16 2013 +0200

Fix output from superio filter

Do not use printf() directly, it could create orphaned lines
    without processed flags [RH..] or CS:EIP.

Change-Id: I7c720792564d64790987814c600bb2e3830a5332
    Signed-off-by: Kyösti Mälkki 
---
 SerialICE/simba/superio.lua | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/SerialICE/simba/superio.lua b/SerialICE/simba/superio.lua
index 14df145..7d6252c 100644
--- a/SerialICE/simba/superio.lua
+++ b/SerialICE/simba/superio.lua
@@ -32,23 +32,27 @@ function superio_pnpdev(f)
    return string.format("%s %02x:%02x", f.name, f.base, f.pnp.active_ldn)
 end

-function superio_dev_post(f, action)
+function superio_string(f)
    if f.pnp.reg < 0x30 then
-		printk(f, action, "%02x: ", f.base)
+		return string.format("%02x: ", f.base)
    else
-		printk(f, action, "%02x:%02x ", f.base, f.pnp.active_ldn)
+		return string.format("%02x:%02x ", f.base, f.pnp.active_ldn)
    end
 end

function superio_register_post(f, action)
-	superio_dev_post(f, action)
+	local str = superio_string(f)
    if action.write then
-		printf("[%02x] <= %02x\n", f.pnp.reg, action.data)
+		printk(f, action, "%s [%02x] <= %02x\n", str, f.pnp.reg, action.data)
    else
-		printf("[%02x] => %02x\n", f.pnp.reg, action.data)
+		printk(f, action, "%s [%02x] => %02x\n", str, f.pnp.reg, action.data)
    end
 end

+function superio_string_post(f, action, str2)
+	printk(f, action, "%s %s\n", superio_string(f), str2)
+end
+
 function superio_try_enable_io(f, idx)

local ldn = f.ldn[f.pnp.active_ldn]
@@ -89,11 +93,9 @@ function superio_try_enable_ldn(f, action)
    local ldn = f.ldn[f.pnp.active_ldn]

if ldn.set[0x30] and ldn.data[0x30] == 0x0 then
-		superio_dev_post(f, action)
-		printf("disabled\n")
+		superio_string_post(f, action, "disabled")
    else
-		superio_dev_post(f, action)
-		printf("enabled\n")
+		superio_string_post(f, action, "enabled")
    end
 end

@@ -165,13 +167,11 @@ function superio_post(f, action)
    end

if f.pnp.reg == 0x70 then
-		superio_dev_post(f, action)
-		printf("irq = %d\n", ldn.data[0x70])
+		superio_string_post(f, action, string.format("irq = %d", ldn.data[0x70]))
    	return true
    end
    if f.pnp.reg == 0x72 then
-		superio_dev_post(f, action)
-		printf("irq2 = %d\n", ldn.data[0x72])
+		superio_string_post(f, action, string.format("irq2 = %d", ldn.data[0x72]))
    	return true
    end