-/* probe.c -- BIOS probes */
-/*
-Copyright 1999-2006 John Coffman.
-All rights reserved.
-
-Licensed under the terms contained in the file 'COPYING' in the
-source directory.
-
-*/
+/* probe.c - BIOS probe utility
+ *
+ * Copyright 1999-2006 John Coffman
+ * Copyright 2009-2015 Joachim Wiedorn
+ * All rights reserved.
+ *
+ * Licensed under the terms contained in the file 'COPYING'
+ * in the source directory.
+ */
/*#define DEBUG_PROBE*/
#define BITMAP 0 /* change to 1 when do_bitmap is filled in */
{ "DOS12", PART_DOS12, HIDDEN_OFF },
{ "DOS16_small", PART_DOS16_SMALL, HIDDEN_OFF },
{ "DOS16_big", PART_DOS16_BIG, HIDDEN_OFF },
- { "NTFS or OS2_HPFS", PART_NTFS, HIDDEN_OFF }, /* same as HPFS; keep these two together */
+ { "NTFS", PART_NTFS, HIDDEN_OFF }, /* same as HPFS; keep these two together */
/* { "HPFS", PART_HPFS, HIDDEN_OFF }, */ /* same as NTFS */
{ "FAT32", PART_FAT32, HIDDEN_OFF },
{ "FAT32_lba", PART_FAT32_LBA, HIDDEN_OFF },
{ "FAT16_lba", PART_FAT16_LBA, HIDDEN_OFF },
- { "OS/2 BootMgr", PART_OS2_BOOTMGR, 0 },
+/* { "OS/2 BootMgr", PART_OS2_BOOTMGR, 0 }, */ /* obsolete system */
{ "DOS extended", PART_DOS_EXTD, 0 },
{ "WIN extended", PART_WIN_EXTD_LBA, 0 },
{ "Linux ext'd", PART_LINUX_EXTD, 0 },
{
struct partition pt [PART_MAX_MAX+1];
int volid;
- long long where[PART_MAX_MAX+1];
+ int64_t where[PART_MAX_MAX+1];
int i,j;
int extd = (extended_pt || verbose>0);
}
if (verbose>=5) {
printf("\n");
- for (i=0; i<j; i++) printf("%4d%20lld%12d\n", i+1, where[i], (int)(where[i]/SECTOR_SIZE));
+ for (i=0; i<j; i++) printf("%4d%20" PRId64 "%12d\n", i+1, where[i], (int)(where[i]/SECTOR_SIZE));
}
}
while (--bios >= 0x80) {
get_geom(bios, &bdata);
if (verbose>=5) {
- printf("bios_dev: (0x%02X) vol-ID=%08X *PT=%08lX\n",
- bios, bdata.serial_no, (long)bdata.pt);
+ printf("bios_dev: (0x%02X) vol-ID=%08X *PT=%0*" PRIXPTR "\n",
+ bios, bdata.serial_no, PTR_WIDTH, (intptr_t)bdata.pt);
#ifdef DEBUG_PROBE
dump_pt((void*)bdata.pt);
#endif