Mercurial > archived > louis > epitech > mq > rathaxes
diff rathaxes_start_to_implement_pci_stuff_in_the_lkm.patch @ 21:052f9209ca09
rathaxes:: add the ifs
author | Thomas Sanchez <thomas.sanchz@gmail.com> |
---|---|
date | Sat, 07 Jan 2012 18:30:20 +0100 |
parents | 80cfe40c1136 |
children | 65523c345b40 |
line wrap: on
line diff
--- a/rathaxes_start_to_implement_pci_stuff_in_the_lkm.patch Sat Jan 07 12:46:45 2012 +0100 +++ b/rathaxes_start_to_implement_pci_stuff_in_the_lkm.patch Sat Jan 07 18:30:20 2012 +0100 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 873b66890128280637d97a24221258bb297a1ac8 +# Parent c08fffb84a93af26c6155c9776c5628fd556064b rathaxes: start to implement the PCI registration part in the 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 c08fffb84a93 rathaxes/samples/lkm/CMakeLists.txt +--- a/rathaxes/samples/lkm/CMakeLists.txt Sat Jan 07 18:10:31 2012 +0100 ++++ b/rathaxes/samples/lkm/CMakeLists.txt Sat Jan 07 18:13:48 2012 +0100 @@ -1,3 +1,7 @@ ADD_RATHAXES_SOURCES(lkm lkm.rtx - RTI log.rti lkm.rti @@ -15,9 +15,9 @@ +# We can't name lkm since it's already used as the target name to generate the +# source (with ADD_RATHAXES_SOURCES). +ADD_RATHAXES_LKM(lkm_hello lkm) -diff --git a/rathaxes/samples/lkm/lkm.blt b/rathaxes/samples/lkm/lkm.blt ---- a/rathaxes/samples/lkm/lkm.blt -+++ b/rathaxes/samples/lkm/lkm.blt +diff -r c08fffb84a93 rathaxes/samples/lkm/lkm.blt +--- a/rathaxes/samples/lkm/lkm.blt Sat Jan 07 18:10:31 2012 +0100 ++++ b/rathaxes/samples/lkm/lkm.blt Sat Jan 07 18:13:48 2012 +0100 @@ -1,8 +1,10 @@ with LKM { @@ -82,9 +82,9 @@ } } } -diff --git a/rathaxes/samples/lkm/lkm.rti b/rathaxes/samples/lkm/lkm.rti ---- a/rathaxes/samples/lkm/lkm.rti -+++ b/rathaxes/samples/lkm/lkm.rti +diff -r c08fffb84a93 rathaxes/samples/lkm/lkm.rti +--- a/rathaxes/samples/lkm/lkm.rti Sat Jan 07 18:10:31 2012 +0100 ++++ b/rathaxes/samples/lkm/lkm.rti Sat Jan 07 18:13:48 2012 +0100 @@ -1,8 +1,10 @@ interface LKM { @@ -112,9 +112,9 @@ + provided chunk LKM::code; } } -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 c08fffb84a93 rathaxes/samples/lkm/lkm.rtx +--- a/rathaxes/samples/lkm/lkm.rtx Sat Jan 07 18:10:31 2012 +0100 ++++ b/rathaxes/samples/lkm/lkm.rtx Sat Jan 07 18:13:48 2012 +0100 @@ -1,19 +1,35 @@ -device LKM use LKM, Log +device LKM use LKM, PCI, Log @@ -152,11 +152,10 @@ + PCI::vendor_id = 0x8086; + PCI::product_id = 0x100f; } -diff --git a/rathaxes/samples/lkm/pci.blt b/rathaxes/samples/lkm/pci.blt -new file mode 100644 ---- /dev/null -+++ b/rathaxes/samples/lkm/pci.blt -@@ -0,0 +1,129 @@ +diff -r c08fffb84a93 rathaxes/samples/lkm/pci.blt +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/rathaxes/samples/lkm/pci.blt Sat Jan 07 18:13:48 2012 +0100 +@@ -0,0 +1,124 @@ +with PCI, LKM, Log +{ + template type PCI::Device() @@ -206,8 +205,8 @@ + ${PCI::Device} *dev = NULL; + + err = pci_enable_device(pdev); -+// if (err < 0) /* `if' doesn't work */ -+// goto fail; ++ if (err < 0) ++ goto fail; + + ${pointcut ::IMPLEMENTATION}; + @@ -266,15 +265,10 @@ + * So how do we use the return value in the parent context? + */ + pci_register_driver(&rtx_pci_driver); -+ /* -+ * if (pci_register_driver(&rtx_pci_driver)) -+ * { -+ * `if' still doesn't work. -+ * -+ * Also, can I call the Log interface from here? -+ * ${Log::info("Message")}; doesn't seem to work. -+ * } -+ */ ++ if (pci_register_driver(&rtx_pci_driver)) ++ { ++ ${Log::info("Message")}; ++ } + } + } + @@ -286,10 +280,9 @@ + } + } +} -diff --git a/rathaxes/samples/lkm/pci.rti b/rathaxes/samples/lkm/pci.rti -new file mode 100644 ---- /dev/null -+++ b/rathaxes/samples/lkm/pci.rti +diff -r c08fffb84a93 rathaxes/samples/lkm/pci.rti +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/rathaxes/samples/lkm/pci.rti Sat Jan 07 18:13:48 2012 +0100 @@ -0,0 +1,30 @@ +interface PCI : LKM +{