*** usbtmc.c_orig   2010-05-25 16:50:37.000000000 +0200
--- usbtmc.c    2010-05-25 17:02:46.000000000 +0200
***************
*** 393,402 ****
--- 393,407 ----
    done = 0;

    while (remaining > 0) {
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / %zd remaining", __LINE__, remaining);
        if (remaining > USBTMC_SIZE_IOBUFFER - 12 - 3)
            this_part = USBTMC_SIZE_IOBUFFER - 12 - 3;
        else
            this_part = remaining;
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / this_part = %zd", __LINE__, this_part);

        /* Setup IO buffer for DEV_DEP_MSG_IN message
         * Refer to class specs for details
***************
*** 414,433 ****
--- 419,450 ----
        buffer[9] = data->TermChar;
        buffer[10] = 0; /* Reserved */
        buffer[11] = 0; /* Reserved */
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / bTag = 0x%x, TermCharEnabled = %d, TermChar = 0x%x", __LINE__, data->bTag, data->TermCharEnabled, data->TermChar);

        /* Send bulk URB */
        retval = usb_bulk_msg(data->usb_dev,
                      usb_sndbulkpipe(data->usb_dev,
                              data->bulk_out),
                      buffer, 12, &actual, USBTMC_TIMEOUT);
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / send result %d", __LINE__, retval);

        /* Store bTag (in case we need to abort) */
        data->bTag_last_write = data->bTag;
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / send stored bTag = 0x%x", __LINE__, data->bTag_last_write);

        /* Increment bTag -- and increment again if zero */
        data->bTag++;
        if (!data->bTag)
            (data->bTag)++;
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / new bTag = 0x%x", __LINE__, data->bTag);

        if (retval < 0) {
            dev_err(dev, "usb_bulk_msg returned %d\n", retval);
***************
*** 442,450 ****
--- 459,472 ----
                              data->bulk_in),
                      buffer, USBTMC_SIZE_IOBUFFER, &actual,
                      USBTMC_TIMEOUT);
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / recv result %d", __LINE__, retval);

        /* Store bTag (in case we need to abort) */
        data->bTag_last_read = data->bTag;
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / recv stored bTag = 0x%x", __LINE__, data->bTag_last_write);

        if (retval < 0) {
            dev_err(dev, "Unable to read data, error %d\n", retval);
***************
*** 458,463 ****
--- 480,488 ----
                   (buffer[5] << 8) +
                   (buffer[6] << 16) +
                   (buffer[7] << 24);
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / recv instrument returned %d bytes", __LINE__, n_characters);

        /* Ensure the instrument doesn't lie about it */
        if(n_characters > actual - 12) {
***************
*** 474,479 ****
--- 499,507 ----
        /* Bound amount of data received by amount of data requested */
        if (n_characters > this_part)
            n_characters = this_part;
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / recv instrument returned processed: %d bytes", __LINE__, n_characters);

        /* Copy buffer to user space */
        if (copy_to_user(buf + done, &buffer[12], n_characters)) {
***************
*** 484,493 ****

        done += n_characters;
        /* Terminate if end-of-message bit recieved from device */
!       if ((buffer[8] &  0x01) && (actual >= n_characters + 12))
            remaining = 0;
!       else
            remaining -= n_characters;
    }

    /* Update file position value */
--- 512,527 ----

        done += n_characters;
        /* Terminate if end-of-message bit recieved from device */
!       if ((buffer[8] &  0x01) && (actual >= n_characters + 12)) {
!           printk(KERN_INFO KBUILD_MODNAME
!               ": %d / recv EOM buffer[8] = 0x%x, actual = %d, n_characters + 12 = %d", __LINE__, buffer[8], actual, n_characters + 12);
            remaining = 0;
!       } else {
            remaining -= n_characters;
+       }
+
+       printk(KERN_INFO KBUILD_MODNAME
+           ": %d / after recv still remaining = %zd", __LINE__, remaining);
    }

    /* Update file position value */