X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=setpci.c;h=fc10c1de8459c72c59b1c4e07b83079890139a36;hb=9ff67879d0d4f2421c376825bf0aa3d7ff924e78;hp=ce324735477365d6c66cea2f3b12be49672be2cf;hpb=4284af587a271584985bc69e7511fa75ea3d7d3d;p=pciutils.git

diff --git a/setpci.c b/setpci.c
index ce32473..fc10c1d 100644
--- a/setpci.c
+++ b/setpci.c
@@ -1,7 +1,7 @@
 /*
  *	The PCI Utilities -- Manipulate PCI Configuration Registers
  *
- *	Copyright (c) 1998--2003 Martin Mares <mj@ucw.cz>
+ *	Copyright (c) 1998--2006 Martin Mares <mj@ucw.cz>
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -18,6 +18,8 @@ static int force;			/* Don't complain if no devices match */
 static int verbose;			/* Verbosity level */
 static int demo_mode;			/* Only show */
 
+const char program_name[] = "setpci";
+
 static struct pci_access *pacc;
 
 struct value {
@@ -256,12 +258,12 @@ usage(char *msg, ...)
       fprintf(stderr, "\n\n");
     }
   fprintf(stderr,
-"Usage: setpci [<options>] (<device>+ <reg>[=<values>]*)*\n\
--f\t\tDon't complain if there's nothing to do\n\
--v\t\tBe verbose\n\
--D\t\tList changes, don't commit them\n"
+"Usage: setpci [<options>] (<device>+ <reg>[=<values>]*)*\n"
+"-f\t\tDon't complain if there's nothing to do\n"
+"-v\t\tBe verbose\n"
+"-D\t\tList changes, don't commit them\n"
 GENERIC_HELP
-"<device>:\t-s [[<bus>]:][<slot>][.[<func>]]\n"
+"<device>:\t-s [[[<domain>]:][<bus>]:][<slot>][.[<func>]]\n"
 "\t|\t-d [<vendor>]:[<device>]\n"
 "<reg>:\t\t<number>[.(B|W|L)]\n"
 "     |\t\t<name>\n"
@@ -435,7 +437,7 @@ next:
 		case 'L':
 		  op->width = 4; break;
 		default:
-		  usage("Invalid width \"%s\"", *e);
+		  usage("Invalid width \"%c\"", *e);
 		}
 	    }
 	  else
@@ -454,7 +456,7 @@ next:
 	      ll = r->offset;
 	      op->width = r->width;
 	    }
-	  if (ll > 0x100 || ll + op->width*((n < 0) ? 1 : n) > 0x100)
+	  if (ll > 0x1000 || ll + op->width*((n < 0) ? 1 : n) > 0x1000)
 	    die("Register number out of range!");
 	  if (ll & (op->width - 1))
 	    die("Unaligned register address!");