From owner-p4-projects@FreeBSD.ORG Mon Sep 25 22:37:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 966A416A4A0; Mon, 25 Sep 2006 22:37:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7263416A492 for ; Mon, 25 Sep 2006 22:37:55 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F35A43D55 for ; Mon, 25 Sep 2006 22:37:55 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k8PMbtFN027985 for ; Mon, 25 Sep 2006 22:37:55 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8PMbsUk027982 for perforce@freebsd.org; Mon, 25 Sep 2006 22:37:54 GMT (envelope-from imp@freebsd.org) Date: Mon, 25 Sep 2006 22:37:54 GMT Message-Id: <200609252237.k8PMbsUk027982@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 106687 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: Mon, 25 Sep 2006 22:37:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=106687 Change 106687 by imp@imp_lighthouse on 2006/09/25 22:37:41 Make these compile Affected files ... .. //depot/projects/arm/src/sys/conf/files#45 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcbr_if.m#2 edit .. //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.m#2 edit Differences ... ==== //depot/projects/arm/src/sys/conf/files#45 (text+ko) ==== @@ -753,6 +753,8 @@ dev/mlx/mlx_pci.c optional mlx pci dev/mly/mly.c optional mly dev/mmc/mmc.c optional mmc +dev/mmc/mmcbr_if.m optional mmc +dev/mmc/mmcbus_if.m optional mmc dev/mmc/mmcsd.c optional mmcsd dev/mpt/mpt.c optional mpt dev/mpt/mpt_cam.c optional mpt ==== //depot/projects/arm/src/sys/dev/mmc/mmcbr_if.m#2 (text+ko) ==== @@ -26,23 +26,24 @@ # $FreeBSD$ # +#include #include +#include # # This is the interface that a mmc bridge chip gives to the mmc bus # that attaches to the mmc bridge. # -INTERFACE mmcbr +INTERFACE mmcbr; # # Called by the mmcbus to setup the IO pins correctly, the voltage to use # for the card, the type of selects, power modes and bus width. # -METHOD int set_ios { +METHOD int update_ios { device_t brdev; device_t reqdev; - struct mmc_ios *iostate; }; # @@ -54,7 +55,7 @@ METHOD int request { device_t brdev; device_t reqdev; - struct mmc_req *req; + struct mmc_request *req; }; # @@ -66,23 +67,6 @@ }; # -# Called by mmcbus to get the capabilities of this bridge. These are defined -# with names starting as MMC_CAP_*. -# -METHOD uint32_t get_cap { - device_t brdev; - device_t reqdev; -}; - -# -# Get the current card mode of this bridge. -# -METHOD enum mmc_card_mode get_card_mode { - device_t brdev; - device_t reqdev; -}; - -# # Claim the current bridge, blocking the current thread until the host # is no longer busy. The method is called claim_host because the # Linux interface has a mmc_claim_host function. ==== //depot/projects/arm/src/sys/dev/mmc/mmcbus_if.m#2 (text+ko) ==== @@ -34,7 +34,7 @@ # that mmc/sd card drivers call to make requests. # -INTERFACE mmcbus +INTERFACE mmcbus; # # Called by the mmcbr devices when a mmc_request has completed @@ -42,6 +42,6 @@ METHOD int xfer_done { device_t brdev; device_t reqdev; - struct mmc_req *req; + struct mmc_request *req; int status; };