psi: Suppport loading and saving raw images in HCS mode

src/drivers/psi/psi-img-raw.c

···
 /*****************************************************************************
  * File name:   src/drivers/psi/psi-img-raw.c                                *
  * Created:     2010-08-13 by Hampa Hug <[e-mail]>                     *
- * Copyright:   (C) 2010-2013 Hampa Hug <[e-mail]>                     *
+ * Copyright:   (C) 2010-2016 Hampa Hug <[e-mail]>                     *
  *****************************************************************************/
 
 /*****************************************************************************
···
 }
 
 static
-int raw_load_fp (FILE *fp, psi_img_t *img, const psi_geometry_t *geo)
+int raw_load_fp (FILE *fp, psi_img_t *img, const psi_geometry_t *geo, int hcs)
 {
 	unsigned      c, h, s;
+	unsigned      ci, hi, ti;
 	unsigned long size;
 	psi_trk_t     *trk;
 	psi_sct_t     *sct;
···
 
 	for (c = 0; c < geo->c; c++) {
 		for (h = 0; h < geo->h; h++) {
-			trk = psi_img_get_track (img, c, h, 1);
+			if (hcs) {
+				ti = c * geo->h + h;
+				ci = ti % geo->c;
+				hi = ti / geo->c;
+
+				if ((hcs < 0) && (hi & 1)) {
+					ci = geo->c - ci - 1;
+				}
+			}
+			else {
+				ci = c;
+				hi = h;
+			}
+
+			trk = psi_img_get_track (img, ci, hi, 1);
 
 			if (trk == NULL) {
 				return (1);
 			}
 
 			for (s = 0; s < geo->s; s++) {
-				sct = psi_sct_new (c, h, s + 1, geo->ssize);
+				sct = psi_sct_new (ci, hi, s + 1, geo->ssize);
 
 				if (sct == NULL) {
 					return (1);
···
 	return (0);
 }
 
-psi_img_t *psi_load_st (FILE *fp)
+psi_img_t *raw_load_img (FILE *fp, const psi_geometry_t *geo, int hcs)
 {
 	psi_img_t *img;
 
···
 		return (NULL);
 	}
 
-	if (raw_load_fp (fp, img, disk_sizes_st)) {
+	if (raw_load_fp (fp, img, geo, hcs)) {
 		psi_img_del (img);
 		return (NULL);
 	}
···
 	return (img);
 }
 
-psi_img_t *psi_load_raw (FILE *fp)
+psi_img_t *psi_load_st (FILE *fp)
 {
-	psi_img_t *img;
+	return (raw_load_img (fp, disk_sizes_st, 0));
+}
 
-	img = psi_img_new();
+psi_img_t *psi_load_raw_hcs (FILE *fp)
+{
+	return (raw_load_img (fp, disk_sizes, 1));
+}
 
-	if (img == NULL) {
-		return (NULL);
-	}
-
-	if (raw_load_fp (fp, img, disk_sizes)) {
-		psi_img_del (img);
-		return (NULL);
-	}
+psi_img_t *psi_load_raw_hts (FILE *fp)
+{
+	return (raw_load_img (fp, disk_sizes, -1));
+}
 
-	return (img);
+psi_img_t *psi_load_raw (FILE *fp)
+{
+	return (raw_load_img (fp, disk_sizes, 0));
 }
 
 
···
 	return (sct);
 }
 
+static
+unsigned raw_get_head_cnt (const psi_img_t *img)
+{
+	unsigned c, hn;
+
+	hn = 0;
+
+	for (c = 0; c < img->cyl_cnt; c++) {
+		if ((img->cyl[c] != NULL) && (img->cyl[c]->trk_cnt > hn)) {
+			hn = img->cyl[c]->trk_cnt;
+		}
+	}
+
+	return (hn);
+}
+
 int psi_save_st (FILE *fp, const psi_img_t *img)
 {
 	return (psi_save_raw (fp, img));
+}
+
+static
+int psi_save_raw_hcs_hts (FILE *fp, const psi_img_t *img, int hts)
+{
+	unsigned        c, ci, h, s, hn;
+	const psi_trk_t *trk;
+	const psi_sct_t *sct;
+
+	hn = raw_get_head_cnt (img);
+
+	for (h = 0; h < hn; h++) {
+		for (c = 0; c < img->cyl_cnt; c++) {
+			if (hts && (h & 1)) {
+				ci = img->cyl_cnt - c - 1;
+			}
+			else {
+				ci = c;
+			}
+
+			trk = psi_img_get_track ((psi_img_t *) img, ci, h, 0);
+
+			if (trk == NULL) {
+				continue;
+			}
+
+			s = 0;
+
+			sct = raw_get_next_sector (trk, &s);
+
+			while (sct != NULL) {
+				if (fwrite (sct->data, 1, sct->n, fp) != sct->n) {
+					return (1);
+				}
+
+				sct = raw_get_next_sector (trk, &s);
+			}
+		}
+	}
+
+	fflush (fp);
+
+	return (0);
+}
+
+int psi_save_raw_hcs (FILE *fp, const psi_img_t *img)
+{
+	return (psi_save_raw_hcs_hts (fp, img, 0));
+}
+
+int psi_save_raw_hts (FILE *fp, const psi_img_t *img)
+{
+	return (psi_save_raw_hcs_hts (fp, img, 1));
 }
 
 int psi_save_raw (FILE *fp, const psi_img_t *img)

src/drivers/psi/psi-img-raw.h

···
 const psi_geometry_t *psi_get_geometry_from_size (unsigned long size, unsigned long mask);
 
 psi_img_t *psi_load_st (FILE *fp);
+psi_img_t *psi_load_raw_hcs (FILE *fp);
+psi_img_t *psi_load_raw_hts (FILE *fp);
 psi_img_t *psi_load_raw (FILE *fp);
 
 int psi_save_st (FILE *fp, const psi_img_t *img);
+int psi_save_raw_hcs (FILE *fp, const psi_img_t *img);
+int psi_save_raw_hts (FILE *fp, const psi_img_t *img);
 int psi_save_raw (FILE *fp, const psi_img_t *img);
 
 int psi_probe_raw_fp (FILE *fp);

src/drivers/psi/psi-img.c

···
 /*****************************************************************************
  * File name:   src/drivers/psi/psi-img.c                                    *
  * Created:     2012-02-14 by Hampa Hug <[e-mail]>                     *
- * Copyright:   (C) 2012-2015 Hampa Hug <[e-mail]>                     *
+ * Copyright:   (C) 2012-2016 Hampa Hug <[e-mail]>                     *
  *****************************************************************************/
 
 /*****************************************************************************
···
 	case PSI_FORMAT_RAW:
 		return (psi_load_raw (fp));
 
+	case PSI_FORMAT_RAW_HCS:
+		return (psi_load_raw_hcs (fp));
+
+	case PSI_FORMAT_RAW_HTS:
+		return (psi_load_raw_hts (fp));
+
 	case PSI_FORMAT_ST:
 		return (psi_load_st (fp));
 
···
 
 	case PSI_FORMAT_RAW:
 		return (psi_save_raw (fp, img));
+
+	case PSI_FORMAT_RAW_HCS:
+		return (psi_save_raw_hcs (fp, img));
+
+	case PSI_FORMAT_RAW_HTS:
+		return (psi_save_raw_hts (fp, img));
 
 	case PSI_FORMAT_ST:
 		return (psi_save_st (fp, img));

src/drivers/psi/psi-img.h

···
 /*****************************************************************************
  * File name:   src/drivers/psi/psi-img.h                                    *
  * Created:     2012-02-14 by Hampa Hug <[e-mail]>                     *
- * Copyright:   (C) 2012-2015 Hampa Hug <[e-mail]>                     *
+ * Copyright:   (C) 2012-2016 Hampa Hug <[e-mail]>                     *
  *****************************************************************************/
 
 /*****************************************************************************
···
 #define PSI_FORMAT_PFDC4   11
 #define PSI_FORMAT_PSI     12
 #define PSI_FORMAT_RAW     13
-#define PSI_FORMAT_ST      14
-#define PSI_FORMAT_STX     15
-#define PSI_FORMAT_TC      16
-#define PSI_FORMAT_TD0     17
-#define PSI_FORMAT_XDF     18
+#define PSI_FORMAT_RAW_CHS PSI_FORMAT_RAW
+#define PSI_FORMAT_RAW_HCS 14
+#define PSI_FORMAT_RAW_HTS 15
+#define PSI_FORMAT_ST      16
+#define PSI_FORMAT_STX     17
+#define PSI_FORMAT_TC      18
+#define PSI_FORMAT_TD0     19
+#define PSI_FORMAT_XDF     20
 
 
 unsigned psi_guess_type (const char *fname);

src/utils/psi/main.c

···
 /*****************************************************************************
  * File name:   src/utils/psi/main.c                                         *
  * Created:     2010-08-13 by Hampa Hug <[e-mail]>                     *
- * Copyright:   (C) 2010-2015 Hampa Hug <[e-mail]>                     *
+ * Copyright:   (C) 2010-2016 Hampa Hug <[e-mail]>                     *
  *****************************************************************************/
 
 /*****************************************************************************
···
 	}
 	else if (strcmp (name, "raw") == 0) {
 		*val = PSI_FORMAT_RAW;
+	}
+	else if (strcmp (name, "raw-chs") == 0) {
+		*val = PSI_FORMAT_RAW;
+	}
+	else if (strcmp (name, "raw-hcs") == 0) {
+		*val = PSI_FORMAT_RAW_HCS;
+	}
+	else if (strcmp (name, "raw-hts") == 0) {
+		*val = PSI_FORMAT_RAW_HTS;
 	}
 	else if (strcmp (name, "st") == 0) {
 		*val = PSI_FORMAT_ST;

src/utils/psi/psi.1

···
 The native PCE sector image file format.
 .TP
 .B raw
-A raw sector dump.
+A raw sector dump in CHS format.
+.TP
+.B raw-hcs
+A raw sector dump in HCS format.
+.TP
+.B raw-hts
+A raw sector dump in HCS format. Additionally, the order of tracks on odd
+heads is reversed.
 .TP
 .B st
 The same as raw, but the auto-detected disk geometries are the ones