Date: Thu, 27 Sep 2001 17:30:49 -0600 From: Warner Losh <imp@harmony.village.org> To: arch@freebsd.org Subject: Proposed change: d_thread_t for driver portability between 4.x and 5.x Message-ID: <200109272330.f8RNUn776995@harmony.village.org>
next in thread | raw e-mail | index | archive | help
Right now I have to do some really ugly things in the pcic driver to make my driver portable between 4.x and 5.x. Surprising, the only ugly part is that stable has struct proc and current has struct thread for many parameters. Most drivers just shuffle these poitners around to various routines and don't need to look under the covers. As such, having a d_thread_t typedef would make it easier to write drivers that can be shared. Instead of saying struct proc *p, you'd say d_thread_t *p in its place. This will make it work for both -stable and -current without further kludges. Here's the diffs for -current: Index: conf.h =================================================================== RCS file: /home/imp/FreeBSD/CVS/src/sys/sys/conf.h,v retrieving revision 1.133 diff -u -r1.133 conf.h --- conf.h 2001/09/12 08:38:05 1.133 +++ conf.h 2001/09/27 23:19:49 @@ -114,17 +114,18 @@ struct uio; struct knote; -typedef int d_open_t __P((dev_t dev, int oflags, int devtype, struct thread *td)); -typedef int d_close_t __P((dev_t dev, int fflag, int devtype, struct thread *td)); +typedef struct thread d_thread_t; +typedef int d_open_t __P((dev_t dev, int oflags, int devtype, d_thread_t *td)); +typedef int d_close_t __P((dev_t dev, int fflag, int devtype, d_thread_t *td)); typedef void d_strategy_t __P((struct bio *bp)); typedef int d_ioctl_t __P((dev_t dev, u_long cmd, caddr_t data, - int fflag, struct thread *td)); + int fflag, d_thread_t *td)); typedef int d_dump_t __P((dev_t dev)); typedef int d_psize_t __P((dev_t dev)); typedef int d_read_t __P((dev_t dev, struct uio *uio, int ioflag)); typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag)); -typedef int d_poll_t __P((dev_t dev, int events, struct thread *td)); +typedef int d_poll_t __P((dev_t dev, int events, d_thread_t *td)); typedef int d_kqfilter_t __P((dev_t dev, struct knote *kn)); typedef int d_mmap_t __P((dev_t dev, vm_offset_t offset, int nprot)); @@ -133,7 +134,7 @@ typedef int l_read_t __P((struct tty *tp, struct uio *uio, int flag)); typedef int l_write_t __P((struct tty *tp, struct uio *uio, int flag)); typedef int l_ioctl_t __P((struct tty *tp, u_long cmd, caddr_t data, - int flag, struct thread *td)); + int flag, d_thread_t *td)); typedef int l_rint_t __P((int c, struct tty *tp)); typedef int l_start_t __P((struct tty *tp)); typedef int l_modem_t __P((struct tty *tp, int flag)); The -stable diffs are similar and can be found at: http://people.freebsd.org/~imp/conf-stable.diff http://people.freebsd.org/~imp/conf-current.diff The impact of those poeple not using this is 0. There are no places in the kernel that use d_thread_t for anything else that I can find, and its naming convention matches the d_XXXX_t that is already used in the device driver interface. I plan on committing this in a few days unless someone comes up with a good reason why I shouldn't do this. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200109272330.f8RNUn776995>