[src/trunk]: src/sys/ufs/chfs cleanup macros

[ahoka <ahoka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/614ae8cdb786
branches:  trunk
changeset: 772780:614ae8cdb786
user:      ahoka <ahoka%NetBSD.org@localhost>
date:      Mon Jan 16 12:17:55 2012 +0000

description:
cleanup macros

diffstat:

 sys/ufs/chfs/chfs_wbuf.c |  19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diffs (42 lines):

diff -r 6b5b376cf395 -r 614ae8cdb786 sys/ufs/chfs/chfs_wbuf.c
--- a/sys/ufs/chfs/chfs_wbuf.c  Mon Jan 16 10:36:16 2012 +0000
+++ b/sys/ufs/chfs/chfs_wbuf.c  Mon Jan 16 12:17:55 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chfs_wbuf.c,v 1.2 2011/11/24 20:50:33 agc Exp $        */
+/*     $NetBSD: chfs_wbuf.c,v 1.3 2012/01/16 12:17:55 ahoka Exp $      */
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -35,28 +35,19 @@
 #include <dev/flash/flash.h>
 #include <sys/uio.h>
 #include "chfs.h"
-//#include </root/xipffs/netbsd.chfs/chfs.h>
 
-#define DBG_WBUF 1
+#define DBG_WBUF 1             /* XXX unused, but should be */
 
 #define PAD(x) (((x)+3)&~3)
 
-#define EB_ADDRESS(x) ( ((unsigned long)(x) / chmp->chm_ebh->eb_size) * chmp->chm_ebh->eb_size )
-
-#define PAGE_DIV(x) ( ((unsigned long)(x) / (unsigned long)(chmp->chm_wbuf_pagesize)) * (unsigned long)(chmp->chm_wbuf_pagesize) )
-#define PAGE_MOD(x) ( (unsigned long)(x) % (unsigned long)(chmp->chm_wbuf_pagesize) )
+#define EB_ADDRESS(x) ( rounddown((x), chmp->chm_ebh->eb_size) )
 
-/*
-// test functions
-int wbuf_test(void);
-void wbuf_test_erase_flash(struct chfs_mount*);
-void wbuf_test_callback(struct erase_instruction*);
-*/
+#define PAGE_DIV(x) ( rounddown((x), chmp->chm_wbuf_pagesize) )
+#define PAGE_MOD(x) ( (x) % (chmp->chm_wbuf_pagesize) )
 
 #define NOPAD  0
 #define SETPAD 1
 
-
 /**
  * chfs_flush_wbuf - write wbuf to the flash
  * @chmp: super block info