clkdiv: added clkdiv

[ecpprog.git] / ecpprog / mpsse.c

diff --git a/ecpprog/mpsse.c b/ecpprog/mpsse.c
index df93e19a4919e98cfe6f78a4b57d4fa75d065b62..339df7e4b4389148ee3e5ea951223d2c21b7a420 100644 (file)
--- a/ecpprog/mpsse.c
+++ b/ecpprog/mpsse.c
@@ -140,7 +140,7 @@ void mpsse_xfer(uint8_t* data_buffer, uint16_t send_length, uint16_t receive_len
        }
 }
 
-void mpsse_init(int ifnum, const char *devstr, bool slow_clock)
+void mpsse_init(int ifnum, const char *devstr, int clkdiv)
 {
        enum ftdi_interface ftdi_ifnum = INTERFACE_A;
 
@@ -216,17 +216,10 @@ void mpsse_init(int ifnum, const char *devstr, bool slow_clock)
 
        mpsse_send_byte(MC_TCK_X5);
 
-       if (slow_clock) {
-               // set 50 kHz clock
-               mpsse_send_byte(MC_SET_CLK_DIV);
-               mpsse_send_byte(29);
-               mpsse_send_byte(0x00);
-       } else {
-               // set 6 MHz clock
-               mpsse_send_byte(MC_SET_CLK_DIV);
-               mpsse_send_byte(1);
-               mpsse_send_byte(0x00);
-       }
+        // set clock - actual clock is 6MHz/(clkdiv)
+        mpsse_send_byte(MC_SET_CLK_DIV);
+        mpsse_send_byte((clkdiv-1) & 0xff);
+        mpsse_send_byte((clkdiv-1) >> 8);
 
        mpsse_send_byte(MC_SETB_LOW);
        mpsse_send_byte(0x08); /* Value */
@@ -239,4 +232,4 @@ void mpsse_close(void)
        ftdi_disable_bitbang(&mpsse_ftdic);
        ftdi_usb_close(&mpsse_ftdic);
        ftdi_deinit(&mpsse_ftdic);
-}
\ No newline at end of file
+}