-/* device.c - Device access */
-/*
-Copyright 1992-1997 Werner Almesberger.
-Copyright 1999-2006 John Coffman.
-All rights reserved.
-
-Licensed under the terms contained in the file 'COPYING' in the
-source directory.
-
-*/
+/* device.c - Device access
+ *
+ * Copyright 1992-1997 Werner Almesberger
+ * 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 _GNU_SOURCE
#include <unistd.h>
cache_add(DEV_DIR "/fd1", 0x0201);
}
-#if 1
cache_ide(DEV_DISK_DIR "/hdt", MAJOR_IDE10);
cache_ide(DEV_DISK_DIR "/hds", MAJOR_IDE10);
cache_ide(DEV_DISK_DIR "/hdr", MAJOR_IDE9);
cache_ide(DEV_DISK_DIR "/hdl", MAJOR_IDE6);
cache_ide(DEV_DISK_DIR "/hdk", MAJOR_IDE6);
-#ifdef MAJOR_IDE5
+
cache_ide(DEV_DISK_DIR "/hdj", MAJOR_IDE5);
cache_ide(DEV_DISK_DIR "/hdi", MAJOR_IDE5);
-#endif
-#endif
for (i = MAX; i >= 0; i--) {
sprintf(tmp, is_devfs() ? DEV_DISK_DIR "/md/%d" : DEV_DISK_DIR "/md%d", i);
cache_ide(DEV_DISK_DIR "/hdd", MAJOR_IDE2);
cache_ide(DEV_DISK_DIR "/hdc", MAJOR_IDE2);
- cache_ide(DEV_DISK_DIR "/hdb", MAJOR_HD);
- cache_ide(DEV_DISK_DIR "/hda", MAJOR_HD);
+ cache_ide(DEV_DISK_DIR "/hdb", MAJOR_IDE);
+ cache_ide(DEV_DISK_DIR "/hda", MAJOR_IDE);
verbose = vsave;
}
struct stat st;
int duplicate = 0, invalid = 0, ret = 0, ntcaution = 0;
int raidcaution = 0;
- long codes = 0L;
+ int32_t codes = 0L;
/* called from raid_setup & from geo_open */
/* allow only 1 call */
walk->next = disktab;
vm[j].dt = disktab = walk;
#if BETA_TEST
- if (verbose >= 4) printf("Allocated DT entry for device %04X ptr=%08lx\n", vm[j].device, (long)walk);
+ if (verbose >= 4) printf("Allocated DT entry for device %04X ptr=%0*" PRIxPTR "\n", vm[j].device, , PTR_WIDTH, (intptr_t)walk);
#endif
}
- if (verbose>=2) printf("device codes (user assigned pf) = %lX\n", codes);
+ if (verbose>=2) printf("device codes (user assigned pf) = %" PRIX32 "\n", codes);
/* mark those BIOS codes that are already used in the disk=/bios= table */
}
}
- if (verbose>=2) printf("device codes (user assigned) = %lX\n", codes);
+ if (verbose>=2) printf("device codes (user assigned) = %" PRIX32 "\n", codes);
for (i=0; i<ndevs; i++) {
bios = vm[i].bios.probe;
}
}
- if (verbose>=2) printf("device codes (BIOS assigned) = %lX\n", codes);
+ if (verbose>=2) printf("device codes (BIOS assigned) = %" PRIX32 "\n", codes);
for (bios=i=0; i<ndevs; i++) {
int j;
walk->next = disktab;
vm[i].dt = disktab = walk;
#if BETA_TEST
- if (verbose >= 4) printf("Allocated DT entry for device %04X ptr=%08lx\n", vm[i].device, (long)walk);
+ if (verbose >= 4) printf("Allocated DT entry for device %04X ptr=%0*" PRIxPTR "\n", vm[i].device, PTR_WIDTH, (intptr_t)walk);
#endif
}
j = vm[i].dt->bios = vm[i].bios.actual;
inited = 1;
}
- if (verbose>=2) printf("device codes (canonical) = %lX\n", codes);
+ if (verbose>=2) printf("device codes (canonical) = %" PRIX32 "\n", codes);
for (bios=8*sizeof(codes)-1; !(codes&(1L<<bios)) && bios>=0; ) bios--;