Changeset 10 for trunk/txlib/txfsys.c

Timestamp:

02/22/06 13:03:35 (3 years ago)

Author:

jvw

Message:

Fix FileDialog? trap, other minor updates

Files:

• trunk/txlib/txfsys.c (modified) (8 diffs)

trunk/txlib/txfsys.c

@@ -40 +40 @@
 
 
-#if   defined (LINUX)                           // LINUX specific
-
-   #define BLKGETSIZE        0x1260
-   #define BLKSSZGET         0x1268
-
-   #define ROOT_DEVICE       "/dev/root"
+#if   defined (WIN32)
+#elif defined (DOS32)
+
+#define DRIVETYPE_REMOTE  0x1000                // BIT 12 from Ioctl 4409 dx
+#define DRIVETYPE_RAMDRV  0x0800                // BIT 11 from Ioctl 4409 dx
+
+#elif defined (LINUX)
+
+#define BLKGETSIZE        0x1260
+#define BLKSSZGET         0x1268
+
+#define ROOT_DEVICE       "/dev/root"
 
 // Translate root-devicename to disk-partition device name using cached /etc/fstab info
@@ -54 +60 @@
 );
 
-#elif defined (DOS32)                           // DOS specific local stuff
-
-#define DRIVETYPE_REMOTE  0x1000                // BIT 12 from Ioctl 4409 dx
-#define DRIVETYPE_RAMDRV  0x0800                // BIT 11 from Ioctl 4409 dx
+#else
+
+#define TXFSDC_BLOCKR         0x00              // block device removable
+#define TXFSDC_GETBPB         0x00              // get device bpb info
+
+#define TXFSDC_UNLOCK         0x00              // unlock logical drive
+#define TXFSDC_LOCK           0x01              // lock logical drive
+#define TXFSDC_EJECT          0x02              // eject removable
+#define TXFSDC_LOAD           0x03              // load removable
+
+typedef struct drivecmd
+{
+   BYTE                cmd;                     // 0=unlock 1=lock 2=eject
+   BYTE                drv;                     // 0=A, 1=B 2=C ...
+} DRIVECMD;                                     // end of struct "drivecmd"
+
+#define TXFSBPB_REMOVABLE     0x08              // BPB attribute for removable
+
+typedef struct drivebpb
+{
+   TXFS_EBPB           ebpb;                    // extended BPB
+   BYTE                reserved[6];
+   USHORT              cyls;
+   BYTE                type;
+   USHORT              attributes;              // device attributes
+   BYTE                fill[6];                 // documented for IOCtl
+} DRIVEBPB;                                     // end of struct "drivebpb"
 
 #endif
+
 
 /*****************************************************************************/
@@ -135 +165 @@
       if (drivemap & (1 << ml))
       {
-         BOOL       incl = TRUE;
          TXTT       fstype;
 
@@ -141 +170 @@
          if (TxFsType( drive, fstype, NULL))
          {
+            BOOL       removable = TxFsIsRemovable( drive);
+            BOOL       incl = TRUE;
+
             //- Note, connected Win-NT drives use the REAL FS-name like NTFS!
             if     ((strnicmp( fstype, "LAN",    3) == 0) || //- OS/2 LAN drives
@@ -149 +181 @@
             else if (strnicmp( fstype, "CD", 2) == 0) // OS2:CDFS, DOS/WIN:CDROM
             {
-               incl = (flags & TXFSV_CD);
+               removable = TRUE;                // overrule for any CDROM
+               incl      = (flags & TXFSV_CD);
+            }
+            if ((flags & TXFSV_REM) && (removable == FALSE))
+            {
+               incl = FALSE;                    // just want removables ...
             }
             if (incl)
@@ -358 +395 @@
       strcat( leader, "Mounted device");
    #else
-      strcat( leader, "Volume info on");
+      if (TxFsIsRemovable( drive))
+      {
+         strcat( leader, "RemovableDrive");
+      }
+      else
+      {
+         strcat( leader, "Volume info on");
+      }
    #endif
 
@@ -609 +653 @@
       }
    #endif
+   if (list == NULL)                            // empty sofar ?
+   {
+      list = TxSelEmptyList( "- No volumes matching the criteria -",
+            "No volumes found that match the criteria for this list");
+   }
    RETURN( list);
 }                                               // end 'TxFsDriveSelist'
@@ -785 +834 @@
 
 /*****************************************************************************/
+// Eject a removable medium specified by driveletter
+/*****************************************************************************/
+ULONG TxFsEjectRemovable
+(
+   char               *drive                    // IN    Driveletter to eject
+)
+{
+   ULONG               rc = NO_ERROR;           // DOS rc
+   #if   defined (WIN32)
+   #elif defined (DOS32)
+   #elif defined (LINUX)
+   #else
+      DRIVECMD         IOCtl;
+      ULONG            DataLen;
+      ULONG            ParmLen;
+   #endif
+
+   ENTER();
+   TxFsAutoFailCriticalErrors( TRUE);           // avoid Not-ready pop-ups
+
+   TRACES(("Drive: %s\n", drive));
+   #if   defined (WIN32)
+   #elif defined (DOS32)
+   #elif defined (LINUX)
+   #else
+      ParmLen   = sizeof(DRIVECMD);
+      IOCtl.cmd = TXFSDC_EJECT;
+      IOCtl.drv = toupper(drive[0]) - 'A';
+      DataLen   = 0;
+
+      rc = DosDevIOCtl((HFILE) -1, IOCTL_DISK,
+                       DSK_UNLOCKEJECTMEDIA,
+                       &IOCtl, ParmLen, &ParmLen,
+                       NULL,   DataLen, &DataLen);
+   #endif
+   TxFsAutoFailCriticalErrors( FALSE);          // enable criterror handler
+   RETURN (rc);
+}                                               // end 'TxFsEjectRemovable'
+/*---------------------------------------------------------------------------*/
+
+
+/*****************************************************************************/
+// Determine if a driveletter represents a removable medium/device
+/*****************************************************************************/
+BOOL TxFsIsRemovable                            // RET   drive is removable
+(
+   char               *drive                    // IN    Driveletter to test
+)
+{
+   BOOL                rc = FALSE;
+   #if   defined (WIN32)
+   #elif defined (DOS32)
+   #elif defined (LINUX)
+   #else
+      DRIVECMD         IOCtl;
+      DRIVEBPB         RemAt;
+      ULONG            DataLen;
+      ULONG            ParmLen;
+      BYTE             NoRem;
+   #endif
+
+   ENTER();
+   TxFsAutoFailCriticalErrors( TRUE);           // avoid Not-ready pop-ups
+
+   TRACES(("Drive: %s\n", drive));
+   #if   defined (WIN32)
+   #elif defined (DOS32)
+   #elif defined (LINUX)
+   #else
+      ParmLen   = sizeof(IOCtl);
+      IOCtl.cmd = TXFSDC_BLOCKR;
+      IOCtl.drv = toupper(drive[0]) - 'A';
+      DataLen   = sizeof(NoRem);
+
+      if (DosDevIOCtl((HFILE) -1, IOCTL_DISK,
+                                  DSK_BLOCKREMOVABLE,
+                                  &IOCtl, ParmLen, &ParmLen,
+                                  &NoRem, DataLen, &DataLen) == NO_ERROR)
+      {
+         if (NoRem)                             // non-removable sofar, check
+         {                                      // BPB as well (USB devices)
+            ParmLen   = sizeof(IOCtl);
+            IOCtl.cmd = TXFSDC_GETBPB;
+            IOCtl.drv = toupper(drive[0]) - 'A';
+            DataLen   = sizeof(RemAt);
+
+            if (DosDevIOCtl((HFILE) -1, IOCTL_DISK,
+                                        DSK_GETDEVICEPARAMS,
+                                        &IOCtl, ParmLen, &ParmLen,
+                                        &RemAt, DataLen, &DataLen) == NO_ERROR)
+
+            {
+               if (RemAt.attributes & TXFSBPB_REMOVABLE)
+               {
+                  TRACES(( "BPB removable, like USB\n"));
+                  rc = TRUE;                    // removable, probably USB
+               }
+            }
+         }
+         else
+         {
+            TRACES(( "Block removable\n"));
+            rc = TRUE;                          // removable block device
+         }
+      }
+   #endif
+   TxFsAutoFailCriticalErrors( FALSE);          // enable criterror handler
+   BRETURN (rc);
+}                                               // end 'TxFsIsRemovable'
+/*---------------------------------------------------------------------------*/
+
+
+/*****************************************************************************/
 // Determine free and total-available space (sectors) on specified drive
 /*****************************************************************************/