Deal with RTMEMSIZE no longer being defined

This commit is contained in:
matt 2011-08-03 17:34:27 +00:00
parent dfbaa6afbe
commit 22c9b287d1
2 changed files with 6 additions and 8 deletions

View File

@ -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 @@ cpu_startup(void)
*/
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);
/*

View File

@ -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 @@ struct ralink_tx_desc {
#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