From 21a6c44ee354b7e0a9bbe4850d4bab58baeed171 Mon Sep 17 00:00:00 2001
From: joerg_wunsch <joerg_wunsch@81a1dc3b-b13d-400b-aceb-764788c761c2>
Date: Wed, 21 Sep 2005 15:02:02 +0000
Subject: [PATCH] Add the forgotten -B option (JTAG bit clock) to the getopt()
 option string.  Actually evaluate that number as microseconds then, as the
 documentation used to state already.

While being there, re-sort the -s option into alphabetical order.


git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@527 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 ChangeLog | 5 +++++
 main.c    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5f0fc00..3c810ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-21  Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* main.c: Add the forgotten -B option to the option string in
+	getopt(); sort the -s option into order.
+
 2005/09/21  Brian S. Dean  <bsd@bsdhome.com>
 
 	* avr.c:
diff --git a/main.c b/main.c
index 98dcd5fa..29d20742 100644
--- a/main.c
+++ b/main.c
@@ -835,7 +835,7 @@ int main(int argc, char * argv [])
   /*
    * process command line arguments
    */
-  while ((ch = getopt(argc,argv,"?b:c:C:DeE:Fnp:P:qtU:suvVyY:")) != -1) {
+  while ((ch = getopt(argc,argv,"?b:B:c:C:DeE:Fnp:P:qstU:uvVyY:")) != -1) {
 
     switch (ch) {
       case 'b': /* override default programmer baud rate */
@@ -1163,7 +1163,7 @@ int main(int argc, char * argv [])
     if (verbose) {
       fprintf(stderr, "%sSetting bit clk period: %.1f\n", progbuf, bitclock);
     }
-    pgm->bitclock = bitclock;
+    pgm->bitclock = bitclock * 1e-6;
   }
 
   rc = pgm->open(pgm, port);