Changeset 50

Timestamp:

Dec 3, 2010, 6:56:33 PM (15 years ago)

Author:

markus

Message:

started rewrite of lbatest (old version is limited to 2GB...)

File:

• trunk/src/lbatest/lbatest.c (modified) (6 diffs)

trunk/src/lbatest/lbatest.c

@@ -47 +47 @@
 
 #define SECTOR_SIZE        512
-#define SECTORS_PER_WRITE  200
+#define SECTORS_PER_WRITE  32
 
 
@@ -62 +62 @@
 /*--- global data -----------------------------------------------------------*/
 
-unsigned long lba_pos;
-unsigned long first_wrong_sector = 0xffffffff;
-char mode;
+DEVICEPARAMETERBLOCK dev_parms;
+
 
 /*--- start of code ---------------------------------------------------------*/
@@ -95 +94 @@
   }
 
+  /* determine physical drive layout */
+  get_drive_layout(drv);
+
   if (mode == 'W') {
     return write_test(drv);
@@ -104 +106 @@
   return 0;
 }
+
+/******************************************************************************
+ * determine CHS layout of the drive we're running on
+ */
+void get_drive_layout(char *disk)
+{
+  
+
+}
+
 
 /******************************************************************************
@@ -120 +132 @@
   unsigned char *wbuf;
   char buf[100];
+  unsigned long cbtake = SECTOR_SIZE * SECTORS_PER_WRITE;
+  unsigned long cb;
 
   /* ask for confirmation, we destroy the drive's contents */
@@ -156 +170 @@
     /* prepare buffer; set the first 4 bytes of each sector
      * to its LBA */
-      for (i = 0; i < SECTORS_PER_WRITE; i++) {
-        *((unsigned long *)(wbuf + i * SECTOR_SIZE)) = lba + i;
+    for (i = 0; i < SECTORS_PER_WRITE; i++) {
+      *((unsigned long *)(wbuf + i * SECTOR_SIZE)) = lba + i;
+    }
+
+    /* write buffer to disk */
+    cb = cbtake;
+    while (cb) {
+      ret = DosWrite(hf_disk, wbuf + cbtake - cb, cb, &cb_written);
+      if (ret != NO_ERROR) {
+        fprintf(stderr, "\nFailed to write to disk %s, code %d\n", drv, ret);
+        rc = -1;
+        goto cleanup;
       }
-
-    /* write buffer to disk */
-    ret = DosWrite(hf_disk, wbuf, SECTOR_SIZE * SECTORS_PER_WRITE, &cb_written);
-    if (cb_written < SECTOR_SIZE * SECTORS_PER_WRITE) {
-      /* done?! */
-      goto cleanup;
-    }
-    if (ret != NO_ERROR) {
-      fprintf(stderr, "\nFailed to write to disk %s, code %d\n", drv, ret);
-      rc = -1;
-      goto cleanup;
+      if (cb_written >= cb) {
+        break;
+      }
+
+      if (cb_written == 0) {
+        /* what the heck... */
+        fprintf(stderr, "\nWrote 0 bytes of %u, no error return code\n",
+                cb);
+        ret = DosSetFilePtr(hf_disk, lba * SECTOR_SIZE + cbtake - cb,
+                            FILE_BEGIN, &action);
+        if (ret != NO_ERROR) {
+          fprintf(stderr, "Failed to set file pointer after writing "
+                  "0 bytes: %d\n", ret);
+          goto cleanup;
+        }
+      }
+      cb -= cb_written;
     }