From 92fc4b8b805ab068c711af90153901ed866b2929 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 5 Jul 2000 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2000-07-05

---
 pc/mem.h   | 2 +-
 pc/sdata.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pc/mem.h b/pc/mem.h
index 57d031980faa2a9e95702c9624e7feb7637dbec2..a655de52571759906d9626f78581dfa0ea24822c 100644
--- a/pc/mem.h
+++ b/pc/mem.h
@@ -25,7 +25,7 @@
 #define	HZ		(82)			/* clock frequency */
 #define	MS2HZ		(1000/HZ)		/* millisec per clock tick */
 #define	TK2SEC(t)	((t)/HZ)		/* ticks to seconds */
-#define	MS2TK(t)	(((t)*HZ)/1000)		/* milliseconds to ticks */
+#define	MS2TK(t)	(((t)*HZ+500)/1000)	/* milliseconds to closest tick */
 
 /*
  * Fundamental addresses
diff --git a/pc/sdata.c b/pc/sdata.c
index 4a1533557613cc35842c9e0b7f4ebf0937f8313f..cfe9cdb3f517bbe9cfb1d3e3c819330063574070 100644
--- a/pc/sdata.c
+++ b/pc/sdata.c
@@ -604,8 +604,9 @@ retry:
 	atadmamode(drive);	
 
 	if(DEBUG & DbgCONFIG){
-		print("dev %2.2uX config %4.4uX capabilities %4.4uX",
-			dev, drive->info[Iconfig], drive->info[Icapabilities]);
+		print("dev %2.2uX port %uX config %4.4uX capabilities %4.4uX",
+			dev, cmdport,
+			drive->info[Iconfig], drive->info[Icapabilities]);
 		print(" mwdma %4.4uX", drive->info[Imwdma]);
 		if(drive->info[Ivalid] & 0x04)
 			print(" udma %4.4uX", drive->info[Iudma]);