 @@ -1,14 +1,14 @@
-/* $NetBSD: dsk.c,v 1.1 2011/01/23 01:05:30 nisimura Exp $ */
+/* $NetBSD: dsk.c,v 1.2 2011/01/23 01:32:08 nisimura Exp $ */
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -72,29 +72,29 @@ struct dskdv {
 };
 static struct dskdv ldskdv[] = {
 	{ "pciide", pciide_match, pciide_init, },
 	{ "siisata", siisata_match, siisata_init, },
 };
 static int ndskdv = sizeof(ldskdv)/sizeof(ldskdv[0]);
 static int probe_drive(struct dkdev_ata *, int);
 static void drive_ident(struct disk *, char *);
 static char *mkident(char *, int);
 static void set_xfermode(struct dkdev_ata *, int);
 static void decode_dlabel(struct disk *, char *);
-static int lba_read(struct disk *, uint64_t, uint32_t, void *);
+static int lba_read(struct disk *, int64_t, int, void *);
-static void issue48(struct dvata_chan *, uint64_t, uint32_t);
+static void issue48(struct dvata_chan *, int64_t, int);
-static void issue28(struct dvata_chan *, uint64_t, uint32_t);
+static void issue28(struct dvata_chan *, int64_t, int);
 static struct disk *lookup_disk(int);
 static struct disk ldisk[4];
 int
 dskdv_init(unsigned tag, void **cookie)
+{
 	struct dskdv *dv;
 	int n;
 	for (n = 0; n < ndskdv; n++) {
 		dv = &ldskdv[n];
 		if ((*dv->match)(tag, NULL) > 0)
 @@ -358,81 +358,80 @@ static void
 set_xfermode(struct dkdev_ata *l, int n)
+{
 	struct dvata_chan *chan = &l->chan[n];
 	CSR_WRITE_1(chan->cmd + _FEA, ATA_XFER);
 	CSR_WRITE_1(chan->cmd + _NSECT, XFER_PIO0);
 	CSR_WRITE_1(chan->cmd + _DEV, ATA_DEV_OBS); /* ??? */
 	CSR_WRITE_1(chan->cmd + _CMD, ATA_CMD_SETF);
 	spinwait_unbusy(l, n, 1000, NULL);
+}
 static int
-lba_read(struct disk *d, uint64_t bno, uint32_t bcnt, void *buf)
+lba_read(struct disk *d, int64_t bno, int bcnt, void *buf)
+{
 	struct dkdev_ata *l;
 	struct dvata_chan *chan;
-	void (*issue)(struct dvata_chan *, uint64_t, uint32_t);
+	void (*issue)(struct dvata_chan *, int64_t, int);
 	int n, rdcnt, i, k;
 	uint16_t *p;
 	const char *err;
 	int error;
 	l = d->dvops;
 	n = d->unittag;
 	p = (uint16_t *)buf;
 	chan = &l->chan[n];
 	error = 0;
 	for ( ; bcnt > 0; bno += rdcnt, bcnt -= rdcnt) {
 		issue = (bno < (1ULL<<28)) ? issue28 : issue48;
 		rdcnt = (bcnt > 255) ? 255 : bcnt;
 		(*issue)(chan, bno, rdcnt);
 		for (k = 0; k < rdcnt; k++) {
 			if (spinwait_unbusy(l, n, 1000, &err) == 0) {
-				printf("%s blk %d %s\n",
+				printf("%s blk %lld %s\n", d->xname, bno, err);
 				   d->xname, (int)bno, err);
 				error = EIO;
 				break;
+			}
 			for (i = 0; i < 512; i += 2) {
 				/* arrives in native order */
 				*p++ = *(uint16_t *)(chan->cmd + _DAT);
+			}
 			/* clear irq if any */
 			(void)CSR_READ_1(chan->cmd + _STS);
+		}
+	}
 	return error;
+}
 static void
-issue48(struct dvata_chan *chan, uint64_t bno, uint32_t nblk)
+issue48(struct dvata_chan *chan, int64_t bno, int nblk)
+{
 	CSR_WRITE_1(chan->cmd + _NSECT, 0); /* always less than 256 */
 	CSR_WRITE_1(chan->cmd + _LBAL, (bno >> 24) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAM, (bno >> 32) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAH, (bno >> 40) & 0xff);
 	CSR_WRITE_1(chan->cmd + _NSECT, nblk);
 	CSR_WRITE_1(chan->cmd + _LBAL, (bno >>  0) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAM, (bno >>  8) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAH, (bno >> 16) & 0xff);
 	CSR_WRITE_1(chan->cmd + _DEV, ATA_DEV_LBA);
 	CSR_WRITE_1(chan->cmd + _CMD, ATA_CMD_READ_EXT);
+}
 static void
-issue28(struct dvata_chan *chan, uint64_t bno, uint32_t nblk)
+issue28(struct dvata_chan *chan, int64_t bno, int nblk)
+{
 	CSR_WRITE_1(chan->cmd + _NSECT, nblk);
 	CSR_WRITE_1(chan->cmd + _LBAL, (bno >>  0) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAM, (bno >>  8) & 0xff);
 	CSR_WRITE_1(chan->cmd + _LBAH, (bno >> 16) & 0xff);
 	CSR_WRITE_1(chan->cmd + _DEV, ((bno >> 24) & 0xf) | ATA_DEV_LBA);
 	CSR_WRITE_1(chan->cmd + _CMD, ATA_CMD_READ);
+}
 static struct disk *
 lookup_disk(int unit)
+{
 @@ -501,30 +500,30 @@ dsk_close(struct open_file *f)
 	(*fs->close)(f);
 	d->fsops = NULL;
 	f->f_devdata = NULL;
 	return 0;
+}
 int
 dsk_strategy(void *devdata, int rw, daddr_t dblk, size_t size,
 	void *p, size_t *rsize)
+{
 	struct disk *d = devdata;
 	struct disklabel *dlp;
-	uint64_t bno;
+	int64_t bno;
 #if 0
-printf("%s %d %d\n", d->xname, (int)dblk, size);
+printf("%s %lld %d\n", d->xname, dblk, size);
 #endif
 	if (size == 0)
 		return 0;
 	if (rw != F_READ)
 		return EOPNOTSUPP;
 	bno = dblk;
 	if ((dlp = d->dlabel) != NULL)
 		bno += dlp->d_partitions[d->part].p_offset;
 	(*d->lba_read)(d, bno, size / 512, p);
 	if (rsize != NULL)
 		*rsize = size;
 	return 0;

 @@ -1,14 +1,14 @@
-/* $NetBSD: printf.c,v 1.1 2011/01/23 01:05:30 nisimura Exp $ */
+/* $NetBSD: printf.c,v 1.2 2011/01/23 01:32:08 nisimura Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -30,27 +30,27 @@
  */
 /*
  * printf -- format and write output using 'func' to write characters
  */
 #include <sys/types.h>
 #include <machine/stdarg.h>
 #include <lib/libsa/stand.h>
 #define MAXSTR	80
 static int _doprnt(void (*)(int), const char *, va_list);
-static void pr_int(unsigned long, int, char *);
+static void mkdigit(unsigned long long, int, char *);
 static void sputchar(int);
 static char *sbuf, *ebuf;
 void
 printf(const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	_doprnt(putchar, fmt, ap);
 	va_end(ap);
+}
 @@ -79,42 +79,34 @@ int
 snprintf(char *buf, size_t size, const char *fmt, ...)
+{
 	va_list ap;
 	sbuf = buf;
 	ebuf = buf + size - 1;
 	va_start(ap, fmt);
 	_doprnt(sputchar, fmt, ap);
 	*sbuf = '\0';
 	return (sbuf - buf);
+}
 static int
-_doprnt(func, fmt, ap)
+_doprnt(void (*func)(int), const char *fmt, va_list ap)
 	void (*func)(int);	/* Function to put a character */
 	const char *fmt;	/* Format string for pr_int/pr_float */
 	va_list ap;		/* Arguments to pr_int/pr_float */
+{
-	int i;
+	int i, outcnt;
-	char *str;
+	char buf[23], *str; /* requires 23 digits in octal at most */
-	char string[20];
+	int length, fmax, fmin, leading;
-	int length;
+	int leftjust, llflag;
-	int leftjust;
+	char fill, sign;
-	int longflag;
+	long long v;
 	int fmax, fmin;
 	int leading;
 	int outcnt;
 	char fill;
 	char sign;
 	outcnt = 0;
 	while ((i = *fmt++) != '\0') {
 		if (i != '%') {
 			(*func)(i);
 			outcnt += 1;
 			continue;
+		}
 		if (*fmt == '%') {
 			(*func)(*fmt++);
 			outcnt += 1;
 			continue;
+		}
 @@ -131,80 +123,98 @@ _doprnt(func, fmt, ap)
+		}
 		if (*fmt != '.')
 			fmax = 0;
 		else {
 			fmt++;
 			if (*fmt == '*')
 				fmax = va_arg(ap, int);
 			else {
 				fmax = 0;
 				while ('0' <= *fmt && *fmt <= '9')
 					fmax = fmax * 10 + *fmt++ - '0';
+			}
+		}
-		longflag = (*fmt == 'l');
+		llflag = 0;
-		if (longflag)
+		if (*fmt == 'l' && *++fmt == 'l') {
-			fmt++;
+			llflag = 1;
 			fmt += 1;
+		}
 		if ((i = *fmt++) == '\0') {
 			(*func)('%');
 			outcnt += 1;
 			break;
+		}
-		str = string;
+		str = buf;
 		sign = ' ';
 		switch (i) {
 		case 'c':
 			str[0] = va_arg(ap, int);
 			str[1] = '\0';
 			fmax = 0;
 			fill = ' ';
 			break;
 		case 's':
 			str = va_arg(ap, char *);
 			fill = ' ';
 			break;
 		case 'd':
 			if (llflag)
-			long l = va_arg(ap, long);
+				v = va_arg(ap, long long);
-			if (l < 0) { sign = '-' ; l = -l; }
+			else
-			pr_int((unsigned long)l, 10, str);
+				v = va_arg(ap, int);
 			if (v < 0) {
 				sign = '-' ; v = -v;
+			}
 			mkdigit((unsigned long long)v, 10, str);
 			break;
 		case 'u':
-			pr_int(va_arg(ap, unsigned long), 10, str);
+			if (llflag)
 				v = va_arg(ap, long long);
 			else
 				v = va_arg(ap, int);
 			mkdigit((unsigned long long)v, 10, str);
 			break;
 		case 'o':
-			pr_int(va_arg(ap, unsigned long), 8, str);
+			if (llflag)
 				v = va_arg(ap, long long);
 			else
 				v = va_arg(ap, int);
 			mkdigit((unsigned long long)v, 8, str);
 			fmax = 0;
 			break;
 		case 'X':
 		case 'x':
-			pr_int(va_arg(ap, unsigned long), 16, str);
+			if (llflag)
 				v = va_arg(ap, long long);
 			else
 				v = va_arg(ap, int);
 			mkdigit((unsigned long long)v, 16, str);
 			fmax = 0;
 			break;
 		case 'p':
-			pr_int(va_arg(ap, unsigned long), 16, str);
+			mkdigit(va_arg(ap, unsigned int), 16, str);
 			fill = '0';
 			fmin = 8;
 			fmax = 0;
 			(*func)('0'); (*func)('x');
 			outcnt += 2;
 			break;
 		default:
 			(*func)(i);
 			break;
+		}
 		for (i = 0; str[i] != '\0'; i++)
+			;
 		length = i;
 		if (fmin > MAXSTR || fmin < 0)
 			fmin = 0;
 		if (fmax > MAXSTR || fmax < 0)
 			fmax = 0;
 		leading = 0;
 		if (fmax != 0 || fmin != 0) {
 @@ -222,39 +232,40 @@ _doprnt(func, fmt, ap)
 			(*func)(sign);
 		if (leftjust == 0)
 			for (i = 0; i < leading; i++) (*func)(fill);
 		if (sign == '-' && fill == ' ')
 			(*func)(sign);
 		for (i = 0; i < length; i++)
 			(*func)(str[i]);
 		if (leftjust != 0)
 			for (i = 0; i < leading; i++) (*func)(fill);
+	}
 	return outcnt;
+}
 static void pr_int(lval, base, s)
-	unsigned long lval;
+static void
-	int base;
+mkdigit(unsigned long long llval, int base, char *s)
 	char *s;
+{
-	char ptmp[12];	/* unsigned long requires 11 digit in octal form */
+	char ptmp[23], *t;	/* requires 22 digit in octal at most */
-	int i;
+	int n;
 	char *t = ptmp;
 	static const char hexdigit[] = "0123456789abcdef";
-	i = 1;
+	n = 1;
 	t = ptmp;
 	*t++ = '\0';
 	do {
-		*t++ = hexdigit[lval % base];
+		int d = (int)llval % base;
-	} while ((lval /= base) != 0 && ++i < sizeof(ptmp));
+		*t++ = hexdigit[d];
 		llval /= base;
 	} while (llval != 0 && ++n < sizeof(ptmp));
 	while ((*s++ = *--t) != '\0')
 		/* copy reserved digits */ ;
+}
 static void
 sputchar(int c)
+{
 	if (sbuf < ebuf)
 		*sbuf++ = c;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: globals.h,v 1.1 2011/01/23 01:05:30 nisimura Exp $ */
+/* $NetBSD: globals.h,v 1.2 2011/01/23 01:32:08 nisimura Exp $ */
 /* clock feed */
 #ifndef EXT_CLK_FREQ
 #define EXT_CLK_FREQ	33333333	/* external clock (PCI clock) */
 #endif
 /* brd type */
 extern int brdtype;
 #define BRD_SANDPOINTX2		2
 #define BRD_SANDPOINTX3		3
 #define BRD_ENCOREPP1		10
 #define BRD_KUROBOX		100
 #define BRD_QNAPTS101		101
 @@ -176,19 +176,19 @@ struct dkdev_ata {
 	char *iobuf;
 };
 struct disk {
 	char xname[8];
 	void *dvops;
 	unsigned unittag;
 	uint16_t ident[128];
 	uint64_t nsect;
 	uint64_t first;
 	void *dlabel;
 	int part;
 	void *fsops;
-	int (*lba_read)(struct disk *, uint64_t, uint32_t, void *);
+	int (*lba_read)(struct disk *, int64_t, int, void *);
 };
 int spinwait_unbusy(struct dkdev_ata *, int, int, const char **);
 int perform_atareset(struct dkdev_ata *, int);
 int satapresense(struct dkdev_ata *, int);