Changeset 1456 for trunk

Timestamp:

10/22/11 23:45:27 (7 months ago)

Author:

stefanct

Message:

serprog: small improvements

• rename serprog_delay parameter to usecs
• fix code style, (output) formatting issues and comments
• sp_docommand: remove unnecessary malloc+memcpy and fix formatting

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Uwe Hermann <uwe@…>

Location:

trunk

Files:

• programmer.h (modified) (1 diff)
• serprog-protocol.txt (modified) (1 diff)
• serprog.c (modified) (12 diffs)

trunk/programmer.h

@@ -608 +608 @@
 uint8_t serprog_chip_readb(const chipaddr addr);
 void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len);
-void serprog_delay(int delay);
+void serprog_delay(int usecs);
 int serprog_spi_send_command(unsigned int writecnt, unsigned int readcnt,
-                        const unsigned char *writearr, unsigned char *readarr);
+                             const unsigned char *writearr,
+                             unsigned char *readarr);
 int serprog_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len);
 #endif

trunk/serprog-protocol.txt

@@ -20 +20 @@
 0x06    Query connected address lines   none                            ACK + 8bit line count / NAK
 0x07    Query operation buffer size     none                            ACK + 16bit size / NAK
-0x08    Query write-n maximum data len  none                            ACK + 24bit maximum length / NAK
+0x08    Query maximum write-n length    none                            ACK + 24bit length (0==2^24) / NAK
 0x09    Read byte                       24-bit addr                     ACK + BYTE / NAK
 0x0A    Read n bytes                    24-bit addr + 24-bit length     ACK + length bytes / NAK

trunk/serprog.c

@@ -39 +39 @@
 #include "chipdrivers.h"
 
-#define MSGHEADER "serprog:"
+#define MSGHEADER "serprog: "
 
 /*
@@ -205 +205 @@
                 }
         }
-        msg_perr("Error: cannot synchronize protocol\n"
+        msg_perr("Error: cannot synchronize protocol "
                 "- check communications and reset device?\n");
         exit(1);
@@ -221 +221 @@
 {
         if ((sp_check_avail_automatic) && (sp_check_commandavail(cmd) == 0)) {
-                msg_pdbg("Warning: Automatic command availability check"
-                                " failed for cmd %d - wont execute cmd\n",cmd);
+                msg_pdbg("Warning: Automatic command availability check failed "
+                         "for cmd 0x%x - won't execute cmd\n", cmd);
                 return 1;
                 }
@@ -229 +229 @@
 
 static int sp_docommand(uint8_t command, uint32_t parmlen,
-                             uint8_t * params, uint32_t retlen, void *retparms)
-{
-        unsigned char *sendpacket;
+                        uint8_t *params, uint32_t retlen, void *retparms)
+{
         unsigned char c;
         if (sp_automatic_cmdcheck(command))
                 return 1;
-        sendpacket = malloc(1 + parmlen);
-        if (!sendpacket)
-                sp_die("Error: cannot malloc command buffer");
-        sendpacket[0] = command;
-        memcpy(&(sendpacket[1]), params, parmlen);
-        if (write(sp_fd, sendpacket, 1 + parmlen) != (1 + parmlen)) {
-                sp_die("Error: cannot write command");
-        }
-        free(sendpacket);
+        if (write(sp_fd, &command, 1) != 1)
+                sp_die("Error: cannot write op code");
+        if (write(sp_fd, params, parmlen) != (parmlen))
+                sp_die("Error: cannot write parameters");
         if (read(sp_fd, &c, 1) != 1)
                 sp_die("Error: cannot read from device");
-        if (c == S_NAK) return 1;
+        if (c == S_NAK)
+                return 1;
         if (c != S_ACK) {
                 msg_perr("Error: invalid response 0x%02X from device\n",c);
@@ -257 +252 @@
                         r = read(sp_fd, retparms + rd_bytes,
                                  retlen - rd_bytes);
-                        if (r <= 0) sp_die
-                                    ("Error: cannot read return parameters");
+                        if (r <= 0)
+                                sp_die("Error: cannot read return parameters");
                         rd_bytes += r;
                 } while (rd_bytes != retlen);
@@ -405 +400 @@
 
         if (sp_docommand(S_CMD_Q_IFACE, 0, NULL, 2, &iface)) {
-                msg_perr("Error: NAK to Query Interface version\n");
+                msg_perr("Error: NAK to query interface version\n");
                 exit(1);
         }
 
         if (iface != 1) {
-                msg_perr("Error: Unknown interface version %d\n", iface);
+                msg_perr("Error: Unknown interface version: %d\n", iface);
                 exit(1);
         }
@@ -429 +424 @@
         }
         buses_supported = c;
+        msg_pdbg(MSGHEADER "Bus support: parallel=%s, LPC=%s, FWH=%s, SPI=%s\n",
+                 (c & BUS_PARALLEL) ? "on" : "off",
+                 (c & BUS_LPC) ? "on" : "off",
+                 (c & BUS_FWH) ? "on" : "off",
+                 (c & BUS_SPI) ? "on" : "off");
         /* Check for the minimum operational set of commands. */
         if (buses_supported & BUS_SPI) {
@@ -539 +539 @@
         }
         pgmname[16] = 0;
-        msg_pinfo(MSGHEADER "Programmer name \"%s\"\n", pgmname);
+        msg_pinfo(MSGHEADER "Programmer name is \"%s\"\n", pgmname);
 
         if (sp_docommand(S_CMD_Q_SERBUF, 0, NULL, 2, &sp_device_serbuf_size)) {
                 msg_perr("Warning: NAK to query serial buffer size\n");
         }
-        msg_pdbg(MSGHEADER "serial buffer size %d\n",
+        msg_pdbg(MSGHEADER "Serial buffer size is %d\n",
                      sp_device_serbuf_size);
 
@@ -565 +565 @@
                                  "size\n");
                 }
-                msg_pdbg(MSGHEADER "operation buffer size %d\n",
+                msg_pdbg(MSGHEADER "operation buffer size is %d\n",
                          sp_device_opbuf_size);
         }
@@ -582 +582 @@
         unsigned char header[7];
         msg_pspew(MSGHEADER "Passing write-n bytes=%d addr=0x%x\n",
-                     sp_write_n_bytes, sp_write_n_addr);
+                  sp_write_n_bytes, sp_write_n_addr);
         if (sp_streamed_transmit_bytes >=
             (7 + sp_write_n_bytes + sp_device_serbuf_size))
@@ -736 +736 @@
         size_t lenm = len;
         chipaddr addrm = addr;
-        while ((sp_max_read_n)&&(lenm > sp_max_read_n)) {
-                sp_do_read_n(&(buf[addrm-addr]),addrm,sp_max_read_n);
+        while ((sp_max_read_n != 0) && (lenm > sp_max_read_n)) {
+                sp_do_read_n(&(buf[addrm-addr]), addrm, sp_max_read_n);
                 addrm += sp_max_read_n;
                 lenm -= sp_max_read_n;
         }
-        if (lenm) sp_do_read_n(&(buf[addrm-addr]),addrm,lenm);
-}
-
-void serprog_delay(int delay)
+        if (lenm)
+                sp_do_read_n(&(buf[addrm-addr]), addrm, lenm);
+}
+
+void serprog_delay(int usecs)
 {
         unsigned char buf[4];
-        msg_pspew("%s\n", __func__);
+        msg_pspew("%s usecs=%d\n", __func__, usecs);
         if (!sp_check_commandavail(S_CMD_O_DELAY)) {
-                internal_delay(delay);
                 msg_pdbg("Note: serprog_delay used, but the programmer doesn't "
                          "support delay\n");
+                internal_delay(usecs);
                 return;
         }
@@ -757 +758 @@
                 sp_pass_writen();
         sp_check_opbuf_usage(5);
-        buf[0] = ((delay >> 0) & 0xFF);
-        buf[1] = ((delay >> 8) & 0xFF);
-        buf[2] = ((delay >> 16) & 0xFF);
-        buf[3] = ((delay >> 24) & 0xFF);
+        buf[0] = ((usecs >> 0) & 0xFF);
+        buf[1] = ((usecs >> 8) & 0xFF);
+        buf[2] = ((usecs >> 16) & 0xFF);
+        buf[3] = ((usecs >> 24) & 0xFF);
         sp_stream_buffer_op(S_CMD_O_DELAY, 4, buf);
         sp_opbuf_usage += 5;