Mercurial > archived > louis > epitech > mq > rathaxes

comparison rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch @ 68:ef460b936b5f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge + remove patch from David
author Louis Opter <louis@lse.epitech.net>
date Sat, 18 Feb 2012 16:04:02 +0100
parents b916396fc577
children 8bb53638585b
comparison
equal deleted inserted replaced
67:b916396fc577 68:ef460b936b5f
506 provided pointcut Ethernet::destroy_device; 506 provided pointcut Ethernet::destroy_device;
507 } 507 }
508 diff --git a/rathaxes/samples/e1000/lkm.rtx b/rathaxes/samples/e1000/lkm.rtx 508 diff --git a/rathaxes/samples/e1000/lkm.rtx b/rathaxes/samples/e1000/lkm.rtx
509 --- a/rathaxes/samples/e1000/lkm.rtx 509 --- a/rathaxes/samples/e1000/lkm.rtx
510 +++ b/rathaxes/samples/e1000/lkm.rtx 510 +++ b/rathaxes/samples/e1000/lkm.rtx
511 @@ -2,44 +2,44 @@ 511 @@ -2,50 +2,50 @@
512 { 512 {
513 Ethernet::open(Ethernet::Device dev) 513 Ethernet::open(Ethernet::Device dev)
514 { 514 {
515 - Log::info("Open the device"); 515 - Log::info("Open the device");
516 - e1000::setup_interrupt_handler(); 516 - e1000::setup_interrupt_handler();
560 - LKM::name = "hello"; 560 - LKM::name = "hello";
561 + LKM::name = "rtx_e1k"; 561 + LKM::name = "rtx_e1k";
562 LKM::author = "Rathaxes"; 562 LKM::author = "Rathaxes";
563 LKM::description = "Hello World Loadable Kernel Module (LKM)"; 563 LKM::description = "Hello World Loadable Kernel Module (LKM)";
564 LKM::license = "GPL"; 564 LKM::license = "GPL";
565
566 PCI::vendor_id = 0x8086;
567 - PCI::product_id = 0x100f;
568 + PCI::product_id = 0x100e;
569 PCI::set_master = true;
570
571 Ethernet::ifname = "rtx%d";
565 diff --git a/rathaxes/samples/e1000/log.blt b/rathaxes/samples/e1000/log.blt 572 diff --git a/rathaxes/samples/e1000/log.blt b/rathaxes/samples/e1000/log.blt
566 --- a/rathaxes/samples/e1000/log.blt 573 --- a/rathaxes/samples/e1000/log.blt
567 +++ b/rathaxes/samples/e1000/log.blt 574 +++ b/rathaxes/samples/e1000/log.blt
568 @@ -4,7 +4,7 @@ 575 @@ -4,7 +4,7 @@
569 { 576 {