From owner-p4-projects@FreeBSD.ORG Wed Dec 10 17:39:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D052106568A; Wed, 10 Dec 2008 17:39:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 006741065670 for ; Wed, 10 Dec 2008 17:39:35 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E614D8FC16 for ; Wed, 10 Dec 2008 17:39:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBAHdYrf065883 for ; Wed, 10 Dec 2008 17:39:34 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBAHdY7s065881 for perforce@freebsd.org; Wed, 10 Dec 2008 17:39:34 GMT (envelope-from sam@freebsd.org) Date: Wed, 10 Dec 2008 17:39:34 GMT Message-Id: <200812101739.mBAHdY7s065881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 154446 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2008 17:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=154446 Change 154446 by sam@sam_ebb on 2008/12/10 17:39:28 Fix mac address confusion: ixp425 has B+C MAC's, ixp435 has A+C MAC's; we map mac's to the same two va windows Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#7 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#7 (text+ko) ==== @@ -132,13 +132,11 @@ #define IXP425_NPE_A_OFFSET 0x00006000UL /* Not User Programmable */ #define IXP425_NPE_B_OFFSET 0x00007000UL /* Not User Programmable */ #define IXP425_NPE_C_OFFSET 0x00008000UL /* Not User Programmable */ -#define IXP425_MAC_A_OFFSET 0x00009000UL -#define IXP425_MAC_B_OFFSET 0x0000a000UL +#define IXP425_MAC_B_OFFSET 0x00009000UL /* Ethernet MAC on NPE-B */ +#define IXP425_MAC_C_OFFSET 0x0000a000UL /* Ethernet MAC on NPE-C */ #define IXP425_USB_OFFSET 0x0000b000UL +#define IXP435_MAC_A_OFFSET 0x0000c000UL /* Ethernet MAC on NPE-A */ -#define IXP435_MAC_C_OFFSET 0x0000a000UL /* Ethernet MAC on NPE C */ -#define IXP435_MAC_A_OFFSET 0x0000c000UL /* Ethernet MAC on NPE A */ - #define IXP425_REG_SIZE 0x1000 /* @@ -613,22 +611,17 @@ #define IXP425_NPE_C_VBASE (IXP425_IO_VBASE + IXP425_NPE_C_OFFSET) #define IXP425_NPE_C_SIZE 0x1000 /* Actually only 256 bytes */ -#define IXP425_MAC_A_HWBASE (IXP425_IO_HWBASE + IXP425_MAC_A_OFFSET) -#define IXP425_MAC_A_VBASE (IXP425_IO_VBASE + IXP425_MAC_A_OFFSET) -#define IXP425_MAC_A_SIZE 0x1000 /* Actually only 256 bytes */ - #define IXP425_MAC_B_HWBASE (IXP425_IO_HWBASE + IXP425_MAC_B_OFFSET) #define IXP425_MAC_B_VBASE (IXP425_IO_VBASE + IXP425_MAC_B_OFFSET) #define IXP425_MAC_B_SIZE 0x1000 /* Actually only 256 bytes */ -/* NB: IXP435 MAC's are mapped differently */ +#define IXP425_MAC_C_HWBASE (IXP425_IO_HWBASE + IXP425_MAC_C_OFFSET) +#define IXP425_MAC_C_VBASE (IXP425_IO_VBASE + IXP425_MAC_C_OFFSET) +#define IXP425_MAC_C_SIZE 0x1000 /* Actually only 256 bytes */ + #define IXP435_MAC_A_HWBASE (IXP425_IO_HWBASE + IXP435_MAC_A_OFFSET) -#define IXP435_MAC_A_VBASE (IXP425_IO_VBASE + IXP425_MAC_A_OFFSET) -#define IXP435_MAC_A_SIZE 0x1000 /* Actually only 256 bytes */ - -#define IXP435_MAC_C_HWBASE (IXP425_IO_HWBASE + IXP435_MAC_C_OFFSET) -#define IXP435_MAC_C_VBASE (IXP425_IO_VBASE + IXP425_MAC_B_OFFSET) -#define IXP435_MAC_C_SIZE 0x1000 /* Actually only 256 bytes */ +#define IXP435_MAC_A_VBASE (IXP425_IO_VBASE + IXP435_MAC_A_OFFSET) +#define IXP435_MAC_A_SIZE 0x1000 /* Actually only 256 bytes */ /* * Expansion Bus Data Space.