View Issue Details

IDProjectCategoryView StatusLast Update
0000519fileGeneralpublic2024-05-12 18:37
Reporterjmaynard Assigned Tochristos  
PrioritynormalSeverityminorReproducibilityalways
Status resolvedResolutionfixed 
Product Version5.45 
Fixed in VersionHEAD 
Summary0000519: Improve Hercules DASD image reporting
DescriptionThe detection and reporting of Hercules emulated DASD images can be improved to report more types and what type of compression is used. In addition, the reporting of DASD types 3380 and 3390 is incorrect: they're reported as 33FFFFFF80 and 33FFFFFF90.

The attached patch makes these improvements.
Tagsmagic

Activities

jmaynard

2024-04-25 13:46

reporter  

hercdasd.diff (2,764 bytes)   
diff --git a/magic/Magdir/images b/magic/Magdir/images
index 28e78952..f1fcd59e 100644
--- a/magic/Magdir/images
+++ b/magic/Magdir/images
@@ -2266,43 +2266,41 @@
 
 # Hercules DASD image files
 # From Jan Jaeger <jj@septa.nl> and Jay Maynard <jaymaynard@gmail.com>
+
+# Common Hercules CKD image files
+0       name    HercCKD 
+>0      lelong  x               \b, %d heads per cylinder
+>4      lelong  x               \b, track size %d bytes
+>8      ubyte   >0x2F
+>>8     ubyte   0x45            \b, device type 9345
+>>8     ubyte   !0x45           \b, device type 33%2.2X
+>8      ubyte   <0x30           \b, device type 23%2.2X
+
 0       string  CKD_P370        Hercules CKD DASD image file
->8      lelong  x               \b, %d heads per cylinder
->12     lelong  x               \b, track size %d bytes
->16     byte    x               \b, device type 33%2.2X
+>8      use     HercCKD
 
 0       string  CKD_C370        Hercules compressed CKD DASD image file
->8      lelong  x               \b, %d heads per cylinder
->12     lelong  x               \b, track size %d bytes
->16     byte    x               \b, device type 33%2.2X
+>8      use     HercCKD
 >552    lelong  x               \b, %d total cylinders
 >>557   byte    0               \b, no compression
 >>557   byte    1               \b, ZLIB compression
 >>557   byte    2               \b, BZ2 compression
 
 0       string  CKD_S370        Hercules CKD DASD shadow file
->8      lelong  x               \b, %d heads per cylinder
->12     lelong  x               \b, track size %d bytes
->16     byte    x               \b, device type 33%2.2X
+>8      use     HercCKD
 
 0       string  CKD_P064        Hercules CKD64 DASD image file
->8      lelong  x               \b, %d heads per cylinder
->12     lelong  x               \b, track size %d bytes
->16     byte    x               \b, device type 33%2.2X
+>8      use     HercCKD
 
 0       string  CKD_C064        Hercules compressed CKD64 DASD image file
->8      lelong  x               \b, %d heads per cylinder
->12     lelong  x               \b, track size %d bytes
->16     byte    x               \b, device type 33%2.2X
+>8      use     HercCKD
 >524    lelong  x               \b, %d total cylinders
 >>585   byte    0               \b, no compression
 >>585   byte    1               \b, ZLIB compression
 >>585   byte    2               \b, BZ2 compression
 
 0       string  CKD_S064        Hercules CKD64 DASD shadow file
->8      lelong  x               \b, %d heads per cylinder
->12     lelong  x               \b, track size %d bytes
->16     byte    x               \b, device type 33%2.2X
+>8      use     HercCKD
 
 # Squeak images and programs - etoffi@softhome.net
 0	string		\146\031\0\0	Squeak image data
hercdasd.diff (2,764 bytes)   

christos

2024-05-12 18:37

manager   ~0004045

Fixed, thanks!

Issue History

Date Modified Username Field Change
2024-04-25 13:46 jmaynard New Issue
2024-04-25 13:46 jmaynard Tag Attached: magic
2024-04-25 13:46 jmaynard File Added: hercdasd.diff
2024-05-12 18:37 christos Assigned To => christos
2024-05-12 18:37 christos Status new => assigned
2024-05-12 18:37 christos Status assigned => resolved
2024-05-12 18:37 christos Resolution open => fixed
2024-05-12 18:37 christos Fixed in Version => HEAD
2024-05-12 18:37 christos Note Added: 0004045