Module Name: src
Committed By: matt
Date: Wed Aug 3 17:34:28 UTC 2011
Modified Files:
src/sys/arch/evbmips/rasoc: machdep.c
src/sys/arch/mips/ralink: ralink_eth.c
Log Message:
Deal with RTMEMSIZE no longer being defined
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/rasoc/machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/ralink/ralink_eth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/rasoc/machdep.c
diff -u src/sys/arch/evbmips/rasoc/machdep.c:1.3 src/sys/arch/evbmips/rasoc/machdep.c:1.4
--- src/sys/arch/evbmips/rasoc/machdep.c:1.3 Wed Aug 3 16:25:02 2011
+++ src/sys/arch/evbmips/rasoc/machdep.c Wed Aug 3 17:34:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.3 2011/08/03 16:25:02 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.4 2011/08/03 17:34:27 matt Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2011/08/03 16:25:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2011/08/03 17:34:27 matt Exp $");
#include <sys/param.h>
#include <sys/boot_flag.h>
@@ -221,7 +221,7 @@
*/
printf("%s%s", copyright, version);
printf("Boot processor: %s\n", cpu_model);
- format_bytes(pbuf, sizeof(pbuf), RTMEMSIZE * 1024 * 1024);
+ format_bytes(pbuf, sizeof(pbuf), physmem << PAGE_SHIFT);
printf("total memory = %s\n", pbuf);
/*
Index: src/sys/arch/mips/ralink/ralink_eth.c
diff -u src/sys/arch/mips/ralink/ralink_eth.c:1.3 src/sys/arch/mips/ralink/ralink_eth.c:1.4
--- src/sys/arch/mips/ralink/ralink_eth.c:1.3 Mon Aug 1 23:01:40 2011
+++ src/sys/arch/mips/ralink/ralink_eth.c Wed Aug 3 17:34:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ralink_eth.c,v 1.3 2011/08/01 23:01:40 matt Exp $ */
+/* $NetBSD: ralink_eth.c,v 1.4 2011/08/03 17:34:27 matt Exp $ */
/*-
* Copyright (c) 2011 CradlePoint Technology, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
/* ralink_eth.c -- Ralink Ethernet Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.3 2011/08/01 23:01:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ralink_eth.c,v 1.4 2011/08/03 17:34:27 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -129,11 +129,9 @@
#if RTMEMSIZE >= 64
#define RALINK_ETH_NUM_RX_DESC 256
#define RALINK_ETH_NUM_TX_DESC 256
-#elif RTMEMSIZE >= 32
+#else
#define RALINK_ETH_NUM_RX_DESC 64
#define RALINK_ETH_NUM_TX_DESC 64
-#else
-#error RTMEMSIZE invalid /* XXX */
#endif
/* maximum segments per packet */
#define RALINK_ETH_MAX_TX_SEGS 1
