 @@ -1,14 +1,14 @@
-/*	$NetBSD: mkboot.c,v 1.7 2009/03/18 16:00:11 cegger Exp $	*/
+/*	$NetBSD: mkboot.c,v 1.8 2012/02/24 18:45:20 skrll Exp $	*/
 /*	$OpenBSD: mkboot.c,v 1.9 2001/05/17 00:57:55 pvalchev Exp $	*/
 /*
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -91,27 +91,27 @@ struct exec {
 	u_long	a_entry;	/* entry point */
 	u_long	a_trsize;	/* text relocation size */
 	u_long	a_drsize;	/* data relocation size */
 };
 /* a_magic */
 #define	OMAGIC		0407	/* old impure format */
 #define	NMAGIC		0410	/* read-only text */
 #define	ZMAGIC		0413	/* demand load format */
 #define	QMAGIC		0314	/* "compact" demand load format; deprecated */
 #define N_GETMAGIC(ex) \
     ((((ex).a_midmag)&0xffff0000) ? \
-    (ntohl((u_int32_t)((ex).a_midmag))&0xffff) : ((ex).a_midmag))
+    (ntohl((uint32_t)((ex).a_midmag))&0xffff) : ((ex).a_midmag))
 #include <stdio.h>
 #include <ctype.h>
 int putfile(char *, int);
 void __dead usage(void);
 void bcddate(char *, char *);
 char *lifname(char *);
 int cksum(int, int *, int);
 char *to_file;
 int loadpoint, verbose;
 u_long entry;

 @@ -1,108 +1,108 @@
-/*	$NetBSD: iplsum.c,v 1.5 2011/02/21 02:31:57 itohy Exp $	*/
+/*	$NetBSD: iplsum.c,v 1.6 2012/02/24 18:45:20 skrll Exp $	*/
 /*
  * Calculate 32bit checksum of IPL and store in a certain location
+ *
  * Written in 2003 by ITOH Yasufumi.
  * Public domain
  */
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
 #include <netinet/in.h>
 #ifndef __BIT_TYPES_DEFINED__
-typedef unsigned int	u_int32_t;
+typedef unsigned int	uint32_t;
 #endif
 /* see README.ipl */
 #define IPLOFF		(4*1024)	/* 4KB */
 #define IPL1SIZE	(4*1024)	/* 4KB */
 #define IPL2SIZE	(1*1024)	/* 1KB */
 #define IPL2ONDISK	0x0400
 #define IPL3SIZE	(3*512)		/* 1.5KB */
 #define IPL3ONDISK	0x0A00
 #define IPLSIZE		(IPL1SIZE + IPL2SIZE + IPL3SIZE)
 #define BOOTSIZE	(IPLOFF + IPLSIZE)
 #define BOOTBLOCKSIZE	8192
-u_int32_t bootblk[BOOTSIZE / sizeof(u_int32_t) + 1];
+uint32_t bootblk[BOOTSIZE / sizeof(uint32_t) + 1];
-#define SUMOFF		((IPLOFF + 4) / sizeof(u_int32_t))
+#define SUMOFF		((IPLOFF + 4) / sizeof(uint32_t))
 #ifdef __STDC__
 int main(int, char *[]);
 #endif
 int
 main(int argc, char *argv[])
+{
 	FILE *fp;
 	int len;
-	u_int32_t sum, *p;
+	uint32_t sum, *p;
 	int iploff, iplsumsize;
 	if (argc != 3) {
 		fprintf(stderr, "usage: %s <input> <output>\n", argv[0]);
 		return 1;
+	}
 	/* read file */
 	if ((fp = fopen(argv[1], "rb")) == NULL) {
 		perror(argv[1]);
 		return 1;
+	}
 	if ((len = fread(bootblk, 1, sizeof bootblk, fp)) <= IPLOFF) {
 		fprintf(stderr, "%s: too short\n", argv[1]);
 		return 1;
 	} else if (len > BOOTSIZE) {
 		fprintf(stderr, "%s: too long\n", argv[1]);
 		return 1;
+	}
 	(void) fclose(fp);
 	/* sanity check */
 	if ((ntohl(bootblk[0]) & 0xffff0000) != 0x80000000) {
 		fprintf(stderr, "%s: bad LIF magic\n", argv[1]);
 		return 1;
+	}
-	iploff = ntohl(bootblk[0xf0 / sizeof(u_int32_t)]);
+	iploff = ntohl(bootblk[0xf0 / sizeof(uint32_t)]);
-	iplsumsize = ntohl(bootblk[0xf4 / sizeof(u_int32_t)]);
+	iplsumsize = ntohl(bootblk[0xf4 / sizeof(uint32_t)]);
 	printf("%d bytes free, ipl offset = %d, ipl sum size = %d\n",
 	    BOOTSIZE - len, iploff, iplsumsize);
 	if (iploff != IPLOFF || iplsumsize <= 0 || iplsumsize % 2048 ||
 	    iploff + iplsumsize > BOOTBLOCKSIZE) {
 		fprintf(stderr, "%s: bad ipl offset / size\n", argv[1]);
 		return 1;
+	}
 	/* checksum */
 	sum = 0;
-	for (p = bootblk + IPLOFF / sizeof(u_int32_t);
+	for (p = bootblk + IPLOFF / sizeof(uint32_t);
-	    p < bootblk + (IPLOFF + IPL1SIZE) / sizeof(u_int32_t); p++)
+	    p < bootblk + (IPLOFF + IPL1SIZE) / sizeof(uint32_t); p++)
 		sum += ntohl(*p);
 	bootblk[SUMOFF] = htonl(ntohl(bootblk[SUMOFF]) - sum);
 	/* transfer ipl part 2 */
-	memcpy(bootblk + IPL2ONDISK / sizeof(u_int32_t),
+	memcpy(bootblk + IPL2ONDISK / sizeof(uint32_t),
-	    bootblk + (IPLOFF + IPL1SIZE) / sizeof(u_int32_t),
+	    bootblk + (IPLOFF + IPL1SIZE) / sizeof(uint32_t),
 	    IPL2SIZE);
 	/* transfer ipl part 3 */
-	memcpy(bootblk + IPL3ONDISK / sizeof(u_int32_t),
+	memcpy(bootblk + IPL3ONDISK / sizeof(uint32_t),
-	    bootblk + (IPLOFF + IPL1SIZE + IPL2SIZE) / sizeof(u_int32_t),
+	    bootblk + (IPLOFF + IPL1SIZE + IPL2SIZE) / sizeof(uint32_t),
 	    IPL3SIZE);
 	/* write file */
 	if ((fp = fopen(argv[2], "wb")) == NULL) {
 		perror(argv[2]);
 		return 1;
+	}
 	if ((len = fwrite(bootblk, 1, BOOTBLOCKSIZE, fp)) != BOOTBLOCKSIZE) {
 		if (len < 0)
 			perror(argv[2]);
 		else
 			fprintf(stderr, "%s: short write\n", argv[2]);
 		fclose(fp);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: readufs.h,v 1.5 2011/02/21 02:31:57 itohy Exp $	*/
+/*	$NetBSD: readufs.h,v 1.6 2012/02/24 18:45:20 skrll Exp $	*/
 /*	from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp	*/
 /*
  * Written in 1999, 2002, 2003 by ITOH Yasufumi.
  * Public domain.
  */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 /*
 @@ -66,52 +66,52 @@ struct ufs_info {
 		, UFSTYPE_LFS
 #endif
 	} fstype;
 #if defined(USE_UFS1) && defined(USE_UFS2)
 	enum ufs_ufstype {
 		UFSTYPE_UFS1, UFSTYPE_UFS2
 	} ufstype;
 #endif
 #if 0
 	int (*get_inode)(ino32_t ino, union ufs_dinode *dibuf);
 #endif
 	/* superblock information */
-	u_int32_t bsize;	/* fs block size */
+	uint32_t bsize;	/* fs block size */
-	u_int32_t nindir;	/* # indirect per block */
+	uint32_t nindir;	/* # indirect per block */
-	u_int32_t fsbtodb;	/* block -> sector shift count */
+	uint32_t fsbtodb;	/* block -> sector shift count */
 	union {
 #ifdef USE_FFS
 		struct {
 			daddr_t iblkno;		/* inode-block offset */
 			int32_t old_cgoffset;	/* cylinder group offset */
 			int32_t old_cgmask;	/* cylinder group mask */
 			int32_t fragshift;	/* block to fragmentation */
 			int32_t inopb;		/* # inodes per block */
 			int32_t ipg;		/* # inodes per group */
 			int32_t fpg;		/* # inodes per group * frag */
 			int32_t magic;		/* FS_UFSx_MAGIC */
 		} u_ffs;
 #endif
 #ifdef USE_LFS
 		struct {
-			u_int32_t version;	/* LFS version # */
+			uint32_t version;	/* LFS version # */
 			daddr_t idaddr;		/* ifile inode disk address */
-			u_int32_t inopb;	/* inodes per block (v1) */
+			uint32_t inopb;	/* inodes per block (v1) */
 						/* inodes per frag (v2) */
-			u_int32_t ifpb;		/* inode addrs / ifile block */
+			uint32_t ifpb;		/* inode addrs / ifile block */
-			u_int32_t ioffset;	/* start of inode in ifile */
+			uint32_t ioffset;	/* start of inode in ifile */
 						/* (in sector) */
-			u_int32_t ibsize;	/* size of inode block */
+			uint32_t ibsize;	/* size of inode block */
 		} u_lfs;
 #endif
 	} fs_u;
 };
 extern struct ufs_info	ufs_info;
 int get_ffs_inode(ino32_t ino, union ufs_dinode *dibuf);
 int get_lfs_inode(ino32_t ino, union ufs_dinode *dibuf);
 #if defined(USE_FFS) && defined(USE_LFS)
 #define ufs_get_inode(ino, di)  ((ufs_info.fstype == UFSTYPE_FFS) ? \
 	get_ffs_inode((ino), (di)) : get_lfs_inode((ino), (di)))
 #else

 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.9 2009/03/18 16:00:11 cegger Exp $	*/
+/*	$NetBSD: main.c,v 1.10 2012/02/24 18:45:20 skrll Exp $	*/
 /*
  * Copyright (c) 2003 ITOH Yasufumi.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary forms are unlimited.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS''
 @@ -376,43 +376,43 @@ xi_elf64(struct loadinfo *inf, Elf64_Ehd
 	inf->sec_size = (unsigned) ph->p_filesz;
 #if 0
 	inf->sec_pad = (unsigned) ph->p_memsz - (unsigned) ph->p_filesz;
 #endif
 	/* entry */
 	inf->entry_offset = (unsigned) hdr->e_entry - (unsigned) ph->p_vaddr;
+}
 int
 xi_load(struct loadinfo *inf, void *buf)
+{
 	Elf32_Ehdr *e32hdr = buf;
 	Elf64_Ehdr *e64hdr = buf;
-	u_int16_t class_data;
+	uint16_t class_data;
 	/*
 	 * check ELF header
 	 * (optimized assuming big endian byte order)
 	 */
 	/* ELF magic */
-	if (*(u_int32_t *)&e32hdr->e_ident[EI_MAG0] !=
+	if (*(uint32_t *)&e32hdr->e_ident[EI_MAG0] !=
 		(ELFMAG0 << 24 | ELFMAG1 << 16 | ELFMAG2 << 8 | ELFMAG3) ||
 	    e32hdr->e_ident[EI_VERSION] != EV_CURRENT)
 		return 1;	/* Not an ELF */
 	/* file and machine type */
-	if (*(u_int32_t *)&e32hdr->e_type != (ET_EXEC << 16 | EM_PARISC))
+	if (*(uint32_t *)&e32hdr->e_type != (ET_EXEC << 16 | EM_PARISC))
 		return 1;	/* Not an executable / Wrong architecture */
-	if ((class_data = *(u_int16_t *)&e32hdr->e_ident[EI_CLASS]) ==
+	if ((class_data = *(uint16_t *)&e32hdr->e_ident[EI_CLASS]) ==
 	    (ELFCLASS32 << 8 | ELFDATA2MSB)) {
 		/* support one section executable (ld -N) only */
 		if (e32hdr->e_phnum != 1)
 			return 1;	/* Wrong number of loading sections */
 		/* fill in loading information */
 		xi_elf32(inf, e32hdr);
 	} else if (class_data == (ELFCLASS64 << 8 | ELFDATA2MSB)) {
 		/* support one section executable (ld -N) only */
 		if (e64hdr->e_phnum != 1)