hide pci inside io.h Reference: /n/atom/patch/applied2013/fspcipriv Date: Tue Sep 17 19:43:50 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/amd64/arch.c Tue Sep 17 19:43:50 2013 +++ /sys/src/fs/amd64/arch.c Tue Sep 17 19:43:50 2013 @@ -331,6 +331,12 @@ cmd_install("e820", "-- print e820 scan results", cmd_e820); } +static void +cmd_pcihinv(int, char**) +{ + pcihinv(nil); +} + extern void cmd_vec(int, char**); extern void cmd_machvec(int, char**); @@ -353,6 +359,7 @@ cmd_install("vec", "-- vectors", cmd_vec); /* move to trap.c */ cmd_install("machvec", "-- vectors cnt", cmd_machvec); /* move to trap.c */ + cmd_install("pcihinv", "-- pci inventory", cmd_pcihinv); } void --- /sys/src/fs/amd64/archdat.h Tue Sep 17 19:43:50 2013 +++ /sys/src/fs/amd64/archdat.h Tue Sep 17 19:43:50 2013 @@ -13,7 +13,6 @@ typedef struct MMMU MMMU; typedef u64int Mpl; typedef struct Page Page; -typedef struct Pcidev Pcidev; typedef struct Perf Perf; typedef u64int PTE; typedef struct Sys Sys; @@ -21,7 +20,6 @@ /* fully declared elsewhere */ #pragma incomplete Page -#pragma incomplete Pcidev #pragma varargck type "P" uintmem #pragma varargck type "T" int --- /sys/src/fs/amd64/ioapic.c Tue Sep 17 19:43:50 2013 +++ /sys/src/fs/amd64/ioapic.c Tue Sep 17 19:43:50 2013 @@ -1,7 +1,7 @@ #include "all.h" -#include "apic.h" #include "io.h" +#include "apic.h" //#include "adr.h" #define DBGFLG 0 --- /sys/src/fs/amd64/lapic.c Tue Sep 17 19:43:50 2013 +++ /sys/src/fs/amd64/lapic.c Tue Sep 17 19:43:50 2013 @@ -1,7 +1,7 @@ #include "all.h" -#include "apic.h" #include "io.h" +#include "apic.h" #include "ureg.h" #define DBGFLG 0 @@ -406,7 +406,7 @@ lapicrput(Ichi, lapicno<<24); lapicrput(Iclo, DSnone|TMedge|Lassert|MTf|IdtIPI); while(lapicrget(Iclo) & Ds) - ; + pause(); } void --- /sys/src/fs/amd64/sipi.c Tue Sep 17 19:43:50 2013 +++ /sys/src/fs/amd64/sipi.c Tue Sep 17 19:43:50 2013 @@ -1,4 +1,5 @@ #include "all.h" +#include "io.h" #include "apic.h" #include "sipi.h"