Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Deal with RTMEMSIZE no longer being defined
details: https://anonhg.NetBSD.org/src/rev/a1f69ea8274d
branches: trunk
changeset: 767933:a1f69ea8274d
user: matt <matt%NetBSD.org@localhost>
date: Wed Aug 03 17:34:27 2011 +0000
description:
Deal with RTMEMSIZE no longer being defined
diffstat:
sys/arch/evbmips/rasoc/machdep.c | 6 +++---
sys/arch/mips/ralink/ralink_eth.c | 8 +++-----
2 files changed, 6 insertions(+), 8 deletions(-)
diffs (58 lines):
diff -r 7a2e5c5be3f9 -r a1f69ea8274d sys/arch/evbmips/rasoc/machdep.c
--- a/sys/arch/evbmips/rasoc/machdep.c Wed Aug 03 17:00:13 2011 +0000
+++ b/sys/arch/evbmips/rasoc/machdep.c Wed Aug 03 17:34:27 2011 +0000
@@ -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);
/*
diff -r 7a2e5c5be3f9 -r a1f69ea8274d sys/arch/mips/ralink/ralink_eth.c
--- a/sys/arch/mips/ralink/ralink_eth.c Wed Aug 03 17:00:13 2011 +0000
+++ b/sys/arch/mips/ralink/ralink_eth.c Wed Aug 03 17:34:27 2011 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index