Mercurial > archived > louis > epitech > mq > rathaxes
changeset 17:efe054f0989b
Fix typo
| author | Thomas Sanchez <thomas.sanchz@gmail.com> |
|---|---|
| date | Sat, 07 Jan 2012 11:26:57 +0100 |
| parents | 41a434b0676b |
| children | 01f7686e4a33 |
| files | rathaxes_start_to_implement_the_ethernet_subsystem_in_the_lkm.patch |
| diffstat | 1 files changed, 17 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/rathaxes_start_to_implement_the_ethernet_subsystem_in_the_lkm.patch Sat Jan 07 11:22:10 2012 +0100 +++ b/rathaxes_start_to_implement_the_ethernet_subsystem_in_the_lkm.patch Sat Jan 07 11:26:57 2012 +0100 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent dd0e6d18bdef3c6ef7df3b0ed8bdbbea00406508 +# Parent 5c8a128a8804aa592e3ccc74e86e109d0b577896 rathaxes: start to implement the Ethernet subsystem in linux LKM sample -diff --git a/rathaxes/samples/lkm/CMakeLists.txt b/rathaxes/samples/lkm/CMakeLists.txt ---- a/rathaxes/samples/lkm/CMakeLists.txt -+++ b/rathaxes/samples/lkm/CMakeLists.txt +diff -r 5c8a128a8804 rathaxes/samples/lkm/CMakeLists.txt +--- a/rathaxes/samples/lkm/CMakeLists.txt Sat Jan 07 11:23:27 2012 +0100 ++++ b/rathaxes/samples/lkm/CMakeLists.txt Sat Jan 07 11:26:55 2012 +0100 @@ -1,6 +1,6 @@ ADD_RATHAXES_SOURCES(lkm lkm.rtx - RTI log.rti lkm.rti pci.rti @@ -14,10 +14,9 @@ # We can't name lkm since it's already used as the target name to generate the # source (with ADD_RATHAXES_SOURCES). -diff --git a/rathaxes/samples/lkm/ethernet.blt b/rathaxes/samples/lkm/ethernet.blt -new file mode 100644 ---- /dev/null -+++ b/rathaxes/samples/lkm/ethernet.blt +diff -r 5c8a128a8804 rathaxes/samples/lkm/ethernet.blt +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/rathaxes/samples/lkm/ethernet.blt Sat Jan 07 11:26:55 2012 +0100 @@ -0,0 +1,164 @@ +with Ethernet, PCI, LKM +{ @@ -139,7 +138,7 @@ + //if (net_dev == NULL) + // How should we raise the error in the parent context? + strlcpy(net_dev->name, ${config.ifname}, sizeof(net_dev->name)); -+ dev->irq = pdev->irq; ++ net_dev->irq = pdev->irq; + // Maybe we should try ${rtx_ether_ctx.init()} here: + rtx_ether_ctx = netdev_priv(net_dev); + //rtx_ether_ctx->pci_dev = ${pdev}; @@ -183,10 +182,9 @@ + } + } +} -diff --git a/rathaxes/samples/lkm/ethernet.rti b/rathaxes/samples/lkm/ethernet.rti -new file mode 100644 ---- /dev/null -+++ b/rathaxes/samples/lkm/ethernet.rti +diff -r 5c8a128a8804 rathaxes/samples/lkm/ethernet.rti +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/rathaxes/samples/lkm/ethernet.rti Sat Jan 07 11:26:55 2012 +0100 @@ -0,0 +1,37 @@ +interface Ethernet : PCI, LKM +{ @@ -225,9 +223,9 @@ + provided chunk ::CALL; + } +} -diff --git a/rathaxes/samples/lkm/lkm.rtx b/rathaxes/samples/lkm/lkm.rtx ---- a/rathaxes/samples/lkm/lkm.rtx -+++ b/rathaxes/samples/lkm/lkm.rtx +diff -r 5c8a128a8804 rathaxes/samples/lkm/lkm.rtx +--- a/rathaxes/samples/lkm/lkm.rtx Sat Jan 07 11:23:27 2012 +0100 ++++ b/rathaxes/samples/lkm/lkm.rtx Sat Jan 07 11:26:55 2012 +0100 @@ -1,13 +1,25 @@ device LKM use LKM, PCI, Log { @@ -263,9 +261,9 @@ + + Ethernet::ifname = "rtx"; } -diff --git a/rathaxes/samples/lkm/pci.blt b/rathaxes/samples/lkm/pci.blt ---- a/rathaxes/samples/lkm/pci.blt -+++ b/rathaxes/samples/lkm/pci.blt +diff -r 5c8a128a8804 rathaxes/samples/lkm/pci.blt +--- a/rathaxes/samples/lkm/pci.blt Sat Jan 07 11:23:27 2012 +0100 ++++ b/rathaxes/samples/lkm/pci.blt Sat Jan 07 11:26:55 2012 +0100 @@ -11,15 +11,12 @@ chunk ::decl()