From owner-cvs-src@FreeBSD.ORG Wed Nov 17 12:54:12 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E780016A4CE; Wed, 17 Nov 2004 12:54:12 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA34D43D1F; Wed, 17 Nov 2004 12:54:12 +0000 (GMT) (envelope-from marius@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAHCsCYl065843; Wed, 17 Nov 2004 12:54:12 GMT (envelope-from marius@repoman.freebsd.org) Received: (from marius@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAHCsCd3065842; Wed, 17 Nov 2004 12:54:12 GMT (envelope-from marius) Message-Id: <200411171254.iAHCsCd3065842@repoman.freebsd.org> From: Marius Strobl Date: Wed, 17 Nov 2004 12:54:12 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/mk48txx mk48txx.c mk48txxreg.h mk48txxvar.h src/sys/sparc64/include eeprom.h src/sys/sparc64/sparc64 eeprom.c eeprom_ebus.c eeprom_sbus.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Nov 2004 12:54:13 -0000 marius 2004-11-17 12:54:12 UTC FreeBSD src repository Modified files: sys/dev/mk48txx mk48txx.c mk48txxreg.h sys/sparc64/include eeprom.h sys/sparc64/sparc64 eeprom.c eeprom_ebus.c eeprom_sbus.c Added files: sys/dev/mk48txx mk48txxvar.h Log: o Sync with the NetBSD mk48txx driver (the result simplyfies some changes I have in mind for the genclock interface): - Recognize the MK48T18 as well (differs from the MK48T08 only in packaging options and voltages). - Allow MD code to provide functions for reading/writing NVRAM/RTC locations. If passed NULL, the old behaviour using bus_space_{read,write}_1() is used. Otherwise, all access to the chip goes via the MD functions. This is necessary for mvmeppc boards where the mk48txx NVRAM/RTC is not directly addressable. - Cleanup MI mk48txx(4) todclock driver: - Prepare mk48txxvar.h and leave only register definitions in mk48txxreg.h. - Define struct mk48txx_softc as usual devices and allocate necessary members in it. - Change mk48txx_attach() to only take a device_t. o While converting the sparc64 eeprom driver to the above changes: - Remove some dead code and stale comments. - Use the NVRAM size provided by the mk48txx driver instead of hardcoding it as suggested by a comment. - Add a comment about why it doesn't make much sense to read the hostid directly from the NVRAM except for displaying it when attaching. - Don't print the hostid if it reads all zero because it's stored elsewhere. Revision Changes Path 1.5 +62 -61 src/sys/dev/mk48txx/mk48txx.c 1.4 +5 -13 src/sys/dev/mk48txx/mk48txxreg.h 1.1 +64 -0 src/sys/dev/mk48txx/mk48txxvar.h (new) 1.4 +1 -5 src/sys/sparc64/include/eeprom.h 1.6 +29 -19 src/sys/sparc64/sparc64/eeprom.c 1.8 +11 -10 src/sys/sparc64/sparc64/eeprom_ebus.c 1.8 +11 -10 src/sys/sparc64/sparc64/eeprom_sbus.c