diff options
| -rw-r--r-- | util/getpir/Makefile | 12 | ||||
| -rw-r--r-- | util/getpir/checkpir.c | 7 | ||||
| -rw-r--r-- | util/getpir/getpir.c | 9 |
3 files changed, 8 insertions, 20 deletions
diff --git a/util/getpir/Makefile b/util/getpir/Makefile index dab85d21f2..fffb13872a 100644 --- a/util/getpir/Makefile +++ b/util/getpir/Makefile @@ -2,25 +2,23 @@ #LINUXBIOSROOT=/home/rminnich/src//freebios/ LINUXBIOSROOT=../.. -INCLUDEPATH=$(LINUXBIOSROOT)/src/arch/i386/include/arch +INCLUDEPATH=$(LINUXBIOSROOT)/src/arch/i386/include INCLUDE2=$(LINUXBIOSROOT)/src/include -INCLUDE3=$(LINUXBIOSROOT)/src/arch/i386/include - getpir: getpir.c gcc -o getpir -I$(INCLUDEPATH) -I$(INCLUDE2) getpir.c +all: getpir checkpir + checkpir: checkpir.c irq_tables.o gcc -o checkpir -I$(INCLUDEPATH) -I$(INCLUDE2) irq_tables.o checkpir.c -assignirq: assignirq.c irq_tables.o - gcc -g -o assignirq -I$(INCLUDEPATH) -I$(INCLUDE2) assignirq.c -lpci irq_tables.o: irq_tables.c - gcc -c -I$(INCLUDEPATH) -I$(INCLUDE2) -I$(INCLUDE3) irq_tables.c + gcc -c -I$(INCLUDEPATH) -I$(INCLUDE2) irq_tables.c clean: - rm -f irq_tables.o getpir checkpir assignirq *~ + rm -f irq_tables.o getpir checkpir *~ cleantable: rm -f irq_table.o diff --git a/util/getpir/checkpir.c b/util/getpir/checkpir.c index e86af49215..efcc9182cc 100644 --- a/util/getpir/checkpir.c +++ b/util/getpir/checkpir.c @@ -3,15 +3,10 @@ Aug 26 2001 , Nikolai Vladychevski, <niko@isl.net.mx> */ -#include <unistd.h> #include <stdio.h> -#include <string.h> #include <device/pci.h> -#include <pirq_routing.h> - -#define PIRQ_SIGNATURE (('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24)) -#define PIRQ_VERS 0x0100 +#include <arch/pirq_routing.h> struct irq_info se_arr[50]; struct irq_routing_table *rt; diff --git a/util/getpir/getpir.c b/util/getpir/getpir.c index 8c868fe028..110eef9645 100644 --- a/util/getpir/getpir.c +++ b/util/getpir/getpir.c @@ -3,15 +3,10 @@ Aug 26 2001 , Nikolai Vladychevski, <niko@isl.net.mx> */ -#include <unistd.h> #include <stdio.h> -#include <string.h> #include <device/pci.h> -#include <pirq_routing.h> - -#define PIRQ_SIGNATURE (('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24)) -#define PIRQ_VERS 0x0100 +#include <arch/pirq_routing.h> struct irq_info se_arr[50]; struct irq_routing_table rt; @@ -65,7 +60,7 @@ main() count = count + rcount; printf("Version is:%d Table size:%d\n", rt.version, rt.size); - if (rt.version != PIRQ_VERS) { + if (rt.version != PIRQ_VERSION) { printf("Invalid version\n"); valid = 0; } |