Changeset 1432 for trunk

Timestamp:

09/07/11 22:48:34 (9 months ago)

Author:

uwe

Message:

Small fixes for the linux_spi programmer code.

Signed-off-by: Sven Schnelle <svens@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/linux_spi.c (modified) (4 diffs)

trunk/linux_spi.c

@@ -55 +55 @@
 {
         char *p, *endp, *dev;
-        int speed = 0;
+        uint32_t speed = 0;
 
         dev = extract_programmer_param("dev");
@@ -66 +66 @@
         p = extract_programmer_param("speed");
         if (p && strlen(p)) {
-                speed = strtoul(p, &endp, 10) * 1024;
+                speed = (uint32_t)strtoul(p, &endp, 10) * 1024;
                 if (p == endp) {
                         msg_perr("%s: invalid clock: %s kHz\n", __func__, p);
@@ -73 +73 @@
         }
 
+        msg_pdbg("Using device %s\n", dev);
         if ((fd = open(dev, O_RDWR)) == -1) {
                 msg_perr("%s: failed to open %s: %s\n", __func__,
@@ -79 +80 @@
         }
 
-        if (speed > 0 && ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) {
-                msg_perr("%s: failed to set speed %dHz: %s\n",
-                         __func__, speed, strerror(errno));
-                close(fd);
-                return 1;
+        if (speed > 0) {
+                if (ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed) == -1) {
+                        msg_perr("%s: failed to set speed %dHz: %s\n",
+                                 __func__, speed, strerror(errno));
+                        close(fd);
+                        return 1;
+                }
+
+                msg_pdbg("Using %d kHz clock\n", speed);
         }