Mercurial > archived > louis > epitech > mq > rathaxes
changeset 73:c189b4b44060
Automated merge with https://www.kalessin.fr/projs/hg/epitech/mq/rathaxes/
author | Louis Opter <louis@lse.epita.fr> |
---|---|
date | Sun, 19 Feb 2012 12:08:54 +0100 |
parents | 3d37fa01b19c (current diff) 6e9dcbd120c5 (diff) |
children | ff90ee2fe1c4 |
files | rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch |
diffstat | 1 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch Sat Feb 18 20:20:37 2012 +0100 +++ b/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch Sun Feb 19 12:08:54 2012 +0100 @@ -176,9 +176,12 @@ } } -@@ -275,7 +293,7 @@ +@@ -273,9 +291,9 @@ + } + } - chunk ::CALL() +- chunk ::CALL() ++ chunk ::CALL { - rtx_e1000_register_read32(&${ctx}, ${reg_offset}); + rtx_e1000_register_read32(${ctx}, ${reg_offset}); @@ -193,17 +196,18 @@ + chunk ::CALL { - rtx_e1000_register_write32(&${ctx}, ${reg_offset}); -+ rtx_e1000_register_write32(${ctx}, ${reg_offset}); ++ rtx_e1000_register_write32(${ctx}, ${reg_offset}, ${value}); } } -@@ -315,17 +333,18 @@ +@@ -315,17 +333,19 @@ } } - chunk ::CALL() + chunk ::CALL { ++ rtx_e1000_register_set32(${ctx}, ${reg_offset}, ${value}); } } @@ -218,7 +222,7 @@ chunk LKM::prototypes() { static int e1000_setup_interrupt_handler(struct rtx_ethernet_dev *); -@@ -345,20 +364,20 @@ +@@ -345,20 +365,20 @@ if (error) { @@ -242,7 +246,7 @@ if (error) { return error; -@@ -367,7 +386,7 @@ +@@ -367,7 +387,7 @@ } } @@ -251,7 +255,7 @@ { chunk LKM::prototypes() { -@@ -378,22 +397,21 @@ +@@ -378,22 +398,21 @@ { static void e1000_free_interrupt_handler(struct rtx_ethernet_dev *ethernet_ctx) { @@ -279,7 +283,7 @@ E1000_INTR_TXDW | E1000_INTR_TXQE | E1000_INTR_LSC | -@@ -402,11 +420,11 @@ +@@ -402,11 +421,11 @@ } } @@ -294,7 +298,7 @@ E1000_CMD_ASDE | E1000_CMD_SLU | E1000_CMD_LRST | -@@ -414,20 +432,20 @@ +@@ -414,20 +433,20 @@ } } @@ -725,7 +729,7 @@ PCI::vendor_id = 0x8086; - PCI::product_id = 0x100f; -+ PCI::product_id = 0x100e; ++ PCI::product_id = 0x100e; /* e100f on vmware by default it seems */ PCI::set_master = true; Ethernet::ifname = "rtx%d";