[OpenBIOS] [PATCH V2 2/5] fix ide interrupts initialization

Amadeusz Sławiński amade at asmblr.net
Fri Mar 22 18:25:27 CET 2013


interrupts ans #interrupt-cells are newworld properties

also oldworld interrupts were not properly set, ie second one was always
set to 0 instead of correct value

Signed-off-by: Amadeusz Sławiński <amade at asmblr.net>
---
 drivers/ide.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/ide.c b/drivers/ide.c
index 90138ff..251db65 100644
--- a/drivers/ide.c
+++ b/drivers/ide.c
@@ -1611,9 +1611,11 @@ int macio_ide_init(const char *path, uint32_t addr, int nb_channels)
 		}
 		props[1] = 0x00000000; /* XXX level triggered on real hw */
 		props[3] = 0x00000000;
-		set_property(dnode, "interrupts",
-			     (char *)&props, 4*sizeof(props[0]));
-		set_int_property(dnode, "#interrupt-cells", 2);
+		NEWWORLD(set_property(dnode, "interrupts",
+			     (char *)&props, 4*sizeof(props[0])));
+		NEWWORLD(set_int_property(dnode, "#interrupt-cells", 2));
+
+		props[1] = props[2];
 		OLDWORLD(set_property(dnode, "AAPL,interrupts",
 				      (char *)&props, 2*sizeof(props[0])));
 
-- 
1.8.1.5




More information about the OpenBIOS mailing list