From owner-p4-projects@FreeBSD.ORG Thu Apr 20 02:17:19 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 B424316A405; Thu, 20 Apr 2006 02:17:19 +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 7635816A400 for ; Thu, 20 Apr 2006 02:17:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3CB6E43D55 for ; Thu, 20 Apr 2006 02:17:19 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3K2HJFm022761 for ; Thu, 20 Apr 2006 02:17:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3K2HI3u022755 for perforce@freebsd.org; Thu, 20 Apr 2006 02:17:18 GMT (envelope-from jb@freebsd.org) Date: Thu, 20 Apr 2006 02:17:18 GMT Message-Id: <200604200217.k3K2HI3u022755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 95655 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: Thu, 20 Apr 2006 02:17:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=95655 Change 95655 by jb@jb_freebsd2 on 2006/04/20 02:16:41 Work-in-progress update. I much prefer working on this stuff with the functions in separate files. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap.c#2 edit .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap_close.c#1 add .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap_ioctl.c#1 add .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap_load.c#1 add .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap_modevent.c#1 add .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap_open.c#1 add .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap_sysctl.c#1 add .. //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap_unload.c#1 add Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/fasttrap/fasttrap.c#2 (text+ko) ==== @@ -38,92 +38,38 @@ #include #include #include +#include #include #include -#include -#include +#include -#include -#include +#define FASTTRAP_MINOR 0 -#define DTRACE_MINOR 0 - -static d_close_t fasttrap_close; -static d_ioctl_t fasttrap_ioctl; -static d_open_t fasttrap_open; +static d_close_t fasttrap_close; +static d_ioctl_t fasttrap_ioctl; +static d_open_t fasttrap_open; +static int fasttrap_load(void); +static int fasttrap_unload(void); static struct cdevsw fasttrap_cdevsw = { - .d_version = D_VERSION, - .d_close = fasttrap_close, - .d_ioctl = fasttrap_ioctl, - .d_open = fasttrap_open, - .d_name = "fasttrap", + .d_version = D_VERSION, + .d_close = fasttrap_close, + .d_ioctl = fasttrap_ioctl, + .d_open = fasttrap_open, + .d_name = "fasttrap", }; /* For use with make_dev(9)/destroy_dev(9). */ static struct cdev *fasttrap_dev; -/* ARGSUSED */ -static int -fasttrap_close(struct cdev *dev __unused, int flags, int fmt __unused, - struct thread *td) -{ - return (0); -} - -/* ARGSUSED */ -static int -fasttrap_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t addr __unused, - int flags __unused, struct thread *td __unused) -{ - int error = 0; - - switch (cmd) { - /* Really handled in upper layer */ - case FIOASYNC: - case FIONBIO: - break; - default: - error = ENOTTY; - } - return (error); -} - -/* ARGSUSED */ -static int -fasttrap_open(struct cdev *dev, int oflags, int devtype, struct thread *td) -{ - int error = 0; - return (error); -} - -/* ARGSUSED */ -static int -fasttrap_modevent(module_t mod __unused, int type, void *data __unused) -{ - int error = 0; - - switch (type) { - case MOD_LOAD: - fasttrap_dev = make_dev(&fasttrap_cdevsw, DTRACE_MINOR, - UID_ROOT, GID_WHEEL, 0660, "fasttrap"); - break; - - case MOD_UNLOAD: - destroy_dev(fasttrap_dev); - break; - - case MOD_SHUTDOWN: - break; - - default: - error = EOPNOTSUPP; - break; - - } - return (error); -} +#include +#include +#include +#include +#include +#include +#include DEV_MODULE(fasttrap, fasttrap_modevent, NULL); MODULE_VERSION(fasttrap, 1);