Changeset 51

Timestamp:

Dec 4, 2010, 9:38:12 PM (15 years ago)

Author:

markus

Message:

ported lbatest to unix

File:

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

trunk/src/lbatest/lbatest.c

@@ -5 +5 @@
   Writes the actual LBA to each sector on a hard disk. The purpose is to
   find out if the sector mapping of os2ahci.add is correct.
+  
+  THe program was written to run under Linux, since OS/2 physical disk
+  access IOCTLs support CHS addressing, only.
 
-  To run the test, attach a HD to an AHCI controller with os2ahci.add loaded
-  and run the test in write mode, then attach the disk to an IDE adapter
-  with an S506 driver and run lbatest in read mode.
+  The os2ahci.add driver provides a special operating mode that does nothing
+  but verifying that the tests drive's sector's are addressed in the correct
+  manner by verifying the sector numbers written under Linux.
 
   Author: Markus Thielen
 
-  Compilation (Watcom): wcl386 -bt=os2 lbatest.c
+  Compilation: gcc -o lbatest lbatest.c
 
   Copyright (c) 2010 by thi.guten Software development, www.thiguten.de
@@ -34 +37 @@
 /*---- includes -------------------------------------------------------------*/
 
-#define INCL_DOS
-#define INCL_ERRORS
-#define INCL_DOSDEVICES
-#define INCL_DOSDEVIOCTL
-#include <os2.h>
-#include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include <signal.h>
+#include <stdio.h>
 
 #define SECTOR_SIZE        512
-#define SECTORS_PER_WRITE  32
+#define SECTORS_PER_WRITE  256
 
 
@@ -54 +51 @@
 void          usage            (void);
 
-int           write_test       (char *drv);
-
-int           read_test        (char *drv);
-
-void          signal_handler   (int sig_no);
+void          write_test       (char *dev);
 
 /*--- global data -----------------------------------------------------------*/
-
-DEVICEPARAMETERBLOCK dev_parms;
 
 
@@ -72 +63 @@
 int main(int argc, char **argv)
 {
-  char *drv;
-  HFILE hf;
 
-  if (argc < 3) {
+  if (argc < 2) {
     usage();
     return -1;
   }
 
-  /* get arguments */
-  drv = argv[1];
-  mode = toupper(argv[2][0]);
-  if (mode != 'W' && mode != 'R') {
-    usage();
-    return -1;
-  }
-
-  if (drv[1] != ':' && drv[2] != '\0') {
-    /* we want a drive letter, which is a letter and a colon */
-    usage();
-    return -1;
-  }
-
-  /* determine physical drive layout */
-  get_drive_layout(drv);
-
-  if (mode == 'W') {
-    return write_test(drv);
-  }
-  if (mode == 'R') {
-    return read_test(drv);
-  }
+  write_test(argv[1]);
 
   return 0;
 }
 
-/******************************************************************************
- * determine CHS layout of the drive we're running on
- */
-void get_drive_layout(char *disk)
-{
-  
-
-}
 
 
@@ -120 +79 @@
  * write_test() - write each sector's address to the sector itself
  */
-int write_test(char *drv)
+void write_test(char *dev)
 {
   unsigned long lba;
-  unsigned long ret;
-  HFILE hf_disk;
-  unsigned long action;
-  unsigned long cb_written;
-  int rc = 0;
   float gbf = 1024.0 * 1024.0 * 1024.0 / 512.0;
-  unsigned long i;
+  size_t i;
   unsigned char *wbuf;
   char buf[100];
-  unsigned long cbtake = SECTOR_SIZE * SECTORS_PER_WRITE;
-  unsigned long cb;
+  size_t cbtake = SECTOR_SIZE * SECTORS_PER_WRITE;
+  size_t cb_written;
+  FILE *fp;
 
   /* ask for confirmation, we destroy the drive's contents */
   printf("I'm going to destroy ALL DATA on drive %s now.\n"
-         "type 'DESTROY' to continue, anything else to bail out.\n", drv);
-  if (gets(buf) == NULL || strcmp(buf, "DESTROY")) {
-    return -1;
+         "type 'DESTROY' to continue, anything else to bail out.\n", dev);
+  if (fgets(buf, sizeof(buf), stdin) == NULL || strcmp(buf, "DESTROY\n")) {
+    return;
   }
 
   /* open drive */
-  ret = DosOpen(drv, &hf_disk, &action, 0, 0, OPEN_ACTION_OPEN_IF_EXISTS,
-                OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR |
-                OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_NO_CACHE |
-                OPEN_SHARE_DENYREADWRITE | OPEN_ACCESS_WRITEONLY,
-                NULL);
-  if (ret != NO_ERROR) {
-    fprintf(stderr, "Failed to open disk %s for writing: %d\n", drv, ret);
-    return -1;
-  }
-
-  /* lock disk */
-  ret = DosDevIOCtl(hf_disk, IOCTL_DISK, DSK_LOCKDRIVE, NULL, 0,
-                    &action, NULL, 0, &cb_written);
-  if (ret != NO_ERROR) {
-    fprintf(stderr, "Failed to lock drive, code %d\n", ret);
-    rc = -1;
-    goto cleanup;
+  if ((fp = fopen(dev, "wb")) == NULL) {
+    perror("Failed to open device");
+    return;
   }
 
@@ -175 +116 @@
 
     /* 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;
+    cb_written = fwrite(wbuf, 1, cbtake, fp);
+    if (cb_written < cbtake) {
+      if (!feof(fp)) {
+        perror("Failed to write to target device");
       }
-      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;
+      break;
     }
-
+    
     /* write progress */
-    printf("\r%dk sectors written (%0.02f GB)", lba / 1000, (float)lba / gbf);
+    printf("\r%uk sectors written (%0.02f GB)", 
+           (size_t)(lba / 1000), (float)lba / gbf);
     
   }
 
-cleanup:
-  /* unlock drive */
-  DosDevIOCtl(hf_disk, IOCTL_DISK, DSK_UNLOCKDRIVE, NULL, 0, &action,
-              NULL, 0, &cb_written);
-  DosClose(hf_disk);
+  /* cleanup */
+  fclose(fp);
   free(wbuf);
-  return rc;
 
-}
-
-/******************************************************************************
- * read_test() - read each sector's first 4 bytes and compare to its LBA
- */
-int read_test(char *drv)
-{
-  unsigned long ret;
-  HFILE hf_disk;
-  unsigned long action;
-  unsigned long cb_read;
-  char buf[SECTOR_SIZE];
-  int rc = 0;
-  unsigned long err_cnt = 0;
-  float gbf = 1024.0 * 1024.0 * 1024.0 / 512.0;
-
-  /* open drive */
-  ret = DosOpen(drv, &hf_disk, &action, 0, 0, OPEN_ACTION_OPEN_IF_EXISTS,
-                OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR |
-                OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_NO_CACHE |
-                OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYREADWRITE |
-                OPEN_ACCESS_READONLY,
-                NULL);
-  if (ret != NO_ERROR) {
-    fprintf(stderr, "Failed to open disk %s for reading: %d\n", drv, ret);
-    return -1;
-  }
-
-  /* lock disk */
-  ret = DosDevIOCtl(hf_disk, IOCTL_DISK, DSK_LOCKDRIVE, NULL, 0,
-                    &action, NULL, 0, &cb_read);
-  if (ret != NO_ERROR) {
-    fprintf(stderr, "Failed to lock drive, code %d\n", ret);
-    rc = -1;
-    goto cleanup;
-  }
-
-  /* catch Ctrl+C */
-  signal(SIGINT, signal_handler);
-
-  /* go... */
-  memset(buf, 0x00, sizeof(buf));
-  for (lba_pos = 0; ; lba_pos++) {
-    ret = DosRead(hf_disk, buf, SECTOR_SIZE, &cb_read);
-    if (ret != NO_ERROR) {
-      fprintf(stderr, "\nFailed to read from disk %s, code %d\n", drv, ret);
-      rc = -1;
-      goto cleanup;
-    }
-
-    if (*((unsigned long*) buf) != lba_pos) {
-      printf("\nWrong sector number: read %d from sector %d\n",
-              *((unsigned long*) buf), lba_pos);
-      err_cnt++;
-      if (first_wrong_sector == 0xffffffff) {
-        first_wrong_sector = lba_pos;
-      }
-    }
-
-    /* progress */
-    if (lba_pos % 100 == 0) {
-      printf("\r%dk sectors read (%0.02f GB)", lba_pos / 1000, 
-             (float) lba_pos / gbf);
-    }
-  }
-
-cleanup:
-  /* unlock drive */
-  DosDevIOCtl(hf_disk, IOCTL_DISK, DSK_UNLOCKDRIVE, NULL, 0, &action,
-              NULL, 0, &cb_read);
-  DosClose(hf_disk);
-
-  /* print summary */
-  printf("Found %d logical errors\n", err_cnt);
-  if (first_wrong_sector != 0xffffffff) {
-    printf("First wrong sector was %u.\n", err_cnt, first_wrong_sector);
-  }
-
-  return rc;
 }
 
@@ -303 +143 @@
   printf("lbatest for os2ahci.add\n"
          "Usage:\n\n"
-         "lbatest <drive letter> <mode>\n\n"
-         "where mode is either W for writing or R for reading.\n\n"
-         "In write mode, this program COMPLETELY DESTROYS ALL DATA on the specified\n"
-         "partition/disc. It writes the address of each sector to the sector itself.\n\n"
-         "In read mode, each sector is read and its address verified.\n");
+         "lbatest <device>\n\n");
 }
 
-
-/******************************************************************************
- * signal_handler for SIGINT - prints summary to STDOUT
- */
-void signal_handler(int sig_no)
-{
-
-  if (sig_no == SIGINT && mode == 'R') {
-    /* read mode interrupted; show summary */
-    printf("\n\nLast block read:    %u\n", lba_pos);
-    if (first_wrong_sector != 0xffffffff) {
-      printf("First wrong sector: %u\n", first_wrong_sector);
-    } else {
-      printf("All sectors read ok\n");
-    }
-  }
-
-  exit(0);
-
-}