Generalized the sim_disk layer to support large file disk devices (simh, VHD and RAW formats) with out requiring USE_ADDR64, and enhanced the pdp11_rq device to use this capability.

Author: markpizz

AltairZ80/sim_imd.c

@@ -543,7 +543,7 @@ t_stat sectRead(DISK_INFO *myDisk,
 
     DBG_PRINT(("Reading C:%d/H:%d/S:%d, len=%d, offset=0x%08x" NLP, Cyl, Head, Sector, buflen, sectorFileOffset));
 
-    sim_fseek(myDisk->file, sectorFileOffset-1, 0);
+    sim_fseek(myDisk->file, sectorFileOffset-1, SEEK_SET);
 
     sectRecordType = fgetc(myDisk->file);
     switch(sectRecordType) {
@@ -642,7 +642,7 @@ t_stat sectWrite(DISK_INFO *myDisk,
 
     sectorFileOffset = myDisk->track[Cyl][Head].sectorOffsetMap[Sector-start_sect];
 
-    sim_fseek(myDisk->file, sectorFileOffset-1, 0);
+    sim_fseek(myDisk->file, sectorFileOffset-1, SEEK_SET);
 
     if (*flags & IMD_DISK_IO_ERROR_GENERAL) {
         sectRecordType = SECT_RECORD_UNAVAILABLE;

PDP11/pdp11_rq.c

@@ -654,7 +654,7 @@ struct drvtyp {
     d##_GPC,  d##_XBN,  d##_DBN,  d##_LBN, \
     d##_RCTS, d##_RCTC, d##_RBN,  d##_MOD, \
     d##_MED, d##_FLGS
-#define RQ_SIZE(d)      (d##_LBN * RQ_NUMBY)
+#define RQ_SIZE(d)      d##_LBN
 
 static struct drvtyp drv_tab[] = {
     { RQ_DRV (RX50), "RX50" }, 
@@ -1011,7 +1011,7 @@ DEVICE rq_dev = {
     RQ_NUMDR + 2, DEV_RDX, T_ADDR_W, 2, DEV_RDX, 16,
     NULL, NULL, &rq_reset,
     &rq_boot, &rq_attach, &rq_detach,
-    &rq_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK,
+    &rq_dib, DEV_DISABLE | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK | DEV_SECTORS,
     0, rq_debug, NULL, NULL, &rq_help, NULL, NULL,
     &rq_description
     };
@@ -1086,7 +1086,7 @@ DEVICE rqb_dev = {
     RQ_NUMDR + 2, DEV_RDX, T_ADDR_W, 2, DEV_RDX, 16,
     NULL, NULL, &rq_reset,
     &rq_boot, &rq_attach, &rq_detach,
-    &rqb_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK,
+    &rqb_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK | DEV_SECTORS,
     0, rq_debug, NULL, NULL, &rq_help, NULL, NULL,
     &rq_description
     };
@@ -1161,7 +1161,7 @@ DEVICE rqc_dev = {
     RQ_NUMDR + 2, DEV_RDX, T_ADDR_W, 2, DEV_RDX, 16,
     NULL, NULL, &rq_reset,
     &rq_boot, &rq_attach, &rq_detach,
-    &rqc_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK,
+    &rqc_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK | DEV_SECTORS,
     0, rq_debug, NULL, NULL, &rq_help, NULL, NULL,
     &rq_description
     };
@@ -1236,7 +1236,7 @@ DEVICE rqd_dev = {
     RQ_NUMDR + 2, DEV_RDX, T_ADDR_W, 2, DEV_RDX, 16,
     NULL, NULL, &rq_reset,
     &rq_boot, &rq_attach, &rq_detach,
-    &rqd_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK,
+    &rqd_dib, DEV_DISABLE | DEV_DIS | DEV_UBUS | DEV_QBUS | DEV_DEBUG | DEV_DISK | DEV_SECTORS,
     0, rq_debug, NULL, NULL, &rq_help, NULL, NULL,
     &rq_description
     };
@@ -1915,7 +1915,7 @@ int32 rq_rw_valid (MSC *cp, int32 pkt, UNIT *uptr, uint32 cmd)
 uint32 dtyp = GET_DTYPE (uptr->flags);                  /* get drive type */
 uint32 lbn = GETP32 (pkt, RW_LBNL);                     /* get lbn */
 uint32 bc = GETP32 (pkt, RW_BCL);                       /* get byte cnt */
-uint32 maxlbn = (uint32) (uptr->capac / RQ_NUMBY);      /* get max lbn */
+uint32 maxlbn = (uint32)uptr->capac;                    /* get max lbn */
 
 if ((uptr->flags & UNIT_ATT) == 0)                      /* not attached? */
     return (ST_OFL | SB_OFL_NV);                        /* offl no vol */
@@ -2549,7 +2549,7 @@ return;
 void rq_putr_unit (MSC *cp, int32 pkt, UNIT *uptr, uint32 lu, t_bool all)
 {
 uint32 dtyp = GET_DTYPE (uptr->flags);                  /* get drive type */
-uint32 maxlbn = (uint32) (uptr->capac / RQ_NUMBY);      /* get max lbn */
+uint32 maxlbn = (uint32)uptr->capac;                    /* get max lbn */
 
 sim_debug (DBG_TRC, rq_devmap[cp->cnum], "rq_putr_unit\n");
 
@@ -2723,7 +2723,7 @@ if (cptr) {
     drv_tab[val].lbn = cap;
     }
 uptr->flags = (uptr->flags & ~UNIT_DTYPE) | (val << UNIT_V_DTYPE);
-uptr->capac = ((t_addr) drv_tab[val].lbn) * RQ_NUMBY;
+uptr->capac = (t_addr)drv_tab[val].lbn;
 return SCPE_OK;
 }
 

README.md

@@ -20,6 +20,7 @@
     RQ has new disk types: RC25, RCF25, RA80
     RQ device has a settable controller type (RQDX3, UDA50, KLESI, RUX50)
     RQ disks default to Autosize without regard to disk type
+    RQ disks on PDP11 can have RAUSER size beyond 2GB
     DMC11 DDCMP DECnet device simulation from Rob Jarratt.  Up to 4 DMC11 devices are supported.
     DZ on Unibus systems can have up to 256 ports (default of 32), on 
         Qbus systems 128 port limit (default of 16).

scp.c

@@ -2710,6 +2710,10 @@ t_addr mval = kval * kval;
 t_addr psize = uptr->capac;
 char scale, width;
 
+if (dptr->flags & DEV_SECTORS) {
+    kval = kval / 512;
+    mval = mval / 512;
+    }
 if ((dptr->dwidth / dptr->aincr) > 8)
     width = 'W';
 else width = 'B';
@@ -2753,7 +2757,6 @@ if (flag) {
     fprintf (st, "\n\t\t%s", sim_snet);
     idle_capable = sim_timer_idle_capable (&os_tick_size);
     fprintf (st, "\n\t\tIdle/Throttling support is %savailable", ((idle_capable == 0) ? "NOT " : ""));
-    fprintf (st, "\n\t\t%s", sim_taddr_64 ? "Large File (>2GB) support" : "No Large File support");
     if (sim_disk_vhd_support())
         fprintf (st, "\n\t\tVirtual Hard Disk (VHD) support");
     if (sim_disk_raw_support())
@@ -2770,6 +2773,7 @@ if (flag) {
     fprintf (st, "\n\tHost Platform:");
     fprintf (st, "\n\t\tMemory Access: %s Endian", sim_end ? "Little" : "Big");
     fprintf (st, "\n\t\tMemory Pointer Size: %d bits", (int)sizeof(dptr)*8);
+    fprintf (st, "\n\t\t%s", sim_toffset_64 ? "Large File (>2GB) support" : "No Large File support");
 #if defined(__VMS)
     fprintf (st, "\n\t\tOS: VMS");
 #elif defined(_WIN32)

sim_defs.h

@@ -358,6 +358,7 @@ struct sim_device {
 #define DEV_V_DEBUG     3                               /* debug capability */
 #define DEV_V_TYPE      4                               /* Attach type */
 #define DEV_S_TYPE      3                               /* Width of Type Field */
+#define DEV_V_SECTORS   7                               /* Unit Capacity is in 512byte sectors */
 #define DEV_V_UF_31     12                              /* user flags, V3.1 */
 #define DEV_V_UF        16                              /* user flags */
 #define DEV_V_RSV       31                              /* reserved */
@@ -366,6 +367,7 @@ struct sim_device {
 #define DEV_DISABLE     (1 << DEV_V_DISABLE)            /* device is currently disabled */
 #define DEV_DYNM        (1 << DEV_V_DYNM)               /* device requires call on msize routine to change memory size */
 #define DEV_DEBUG       (1 << DEV_V_DEBUG)              /* device supports SET DEBUG command */
+#define DEV_SECTORS     (1 << DEV_V_SECTORS)            /* capacity is 512 byte sectors */
 #define DEV_NET         0                               /* Deprecated - meaningless */