Merge branch 'remotes/lorenzo/pci/misc' (31d5a608) · Commits · 戴 / test

tools/pci/Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ ALL_TARGETS := pcitest
		ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))

		SCRIPTS := pcitest.sh
		ALL_SCRIPTS := $(patsubst %,$(OUTPUT)%,$(SCRIPTS))

		all: $(ALL_PROGRAMS)

		@@ -47,10 +46,10 @@ clean:

		install: $(ALL_PROGRAMS)
		install -d -m 755 $(DESTDIR)$(bindir); \
		for program in $(ALL_PROGRAMS) pcitest.sh; do \
		for program in $(ALL_PROGRAMS); do \
		install $$program $(DESTDIR)$(bindir); \
		done; \
		for script in $(ALL_SCRIPTS); do \
		for script in $(SCRIPTS); do \
		install $$script $(DESTDIR)$(bindir); \
		done

+4 −4

Original line number	Diff line number	Diff line
		@@ -47,15 +47,15 @@ struct pci_test {
		unsigned long size;
		};

		static void run_test(struct pci_test *test)
		static int run_test(struct pci_test *test)
		{
		long ret;
		int ret = -EINVAL;
		int fd;

		fd = open(test->device, O_RDWR);
		if (fd < 0) {
		perror("can't open PCI Endpoint Test device");
		return;
		return -ENODEV;
		}

		if (test->barnum >= 0 && test->barnum <= 5) {
		@@ -223,7 +223,7 @@ usage:
		"\t-r Read buffer test\n"
		"\t-w Write buffer test\n"
		"\t-c Copy buffer test\n"
		"\t-s <size> Size of buffer {default: 100KB}\n",
		"\t-s <size> Size of buffer {default: 100KB}\n"
		"\t-h Print this help message\n",
		argv[0]);
		return -EINVAL;