diff options
| author | kato <kato@FreeBSD.org> | 1998-12-28 12:46:55 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1998-12-28 12:46:55 +0000 |
| commit | 790434fad1fdf6cbdc8b4615491194ba5947d4cc (patch) | |
| tree | 6ddc19b674b6e3166bb2445793daed9c8889b188 /sys/i386/isa/ccbque.h | |
| parent | ea122a9130f80b5565833f6939ff681919cc7337 (diff) | |
| download | FreeBSD-src-790434fad1fdf6cbdc8b4615491194ba5947d4cc.zip FreeBSD-src-790434fad1fdf6cbdc8b4615491194ba5947d4cc.tar.gz | |
CAM support.
Submitted by: NOKUBI Hirotaka <hnokubi@yyy.or.jp> and
Takahashi Yoshihiro <nyan@wyvern.cc.kogakuin.ac.jp>
Diffstat (limited to 'sys/i386/isa/ccbque.h')
| -rw-r--r-- | sys/i386/isa/ccbque.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h index 7530068..0d9eeec 100644 --- a/sys/i386/isa/ccbque.h +++ b/sys/i386/isa/ccbque.h @@ -36,7 +36,6 @@ #define _CCBQUE_H_ #define CCB_MWANTED 0x01 -#define CCB_WOK(fl) (((fl) == 0) ? M_WAITOK : M_NOWAIT) /* (I) structure and prototype */ #define GENERIC_CCB_ASSERT(DEV, CCBTYPE) \ @@ -49,7 +48,7 @@ struct CCBTYPE##que { \ }; \ \ void DEV##_init_ccbque __P((int)); \ -struct CCBTYPE *DEV##_get_ccb __P((int)); \ +struct CCBTYPE *DEV##_get_ccb __P((void)); \ void DEV##_free_ccb __P((register struct CCBTYPE *)); /* (II) static allocated memory */ @@ -69,8 +68,7 @@ DEV##_init_ccbque(count) \ } \ \ struct CCBTYPE * \ -DEV##_get_ccb(flags) \ - int flags; \ +DEV##_get_ccb() \ { \ register struct CCBTYPE *cb; \ int s = splbio(); \ @@ -87,7 +85,7 @@ again: \ } \ else \ { \ - cb = malloc(sizeof(*cb), M_DEVBUF, CCB_WOK(flags));\ + cb = malloc(sizeof(*cb), M_DEVBUF, M_NOWAIT); \ if (cb != NULL) \ { \ bzero(cb, sizeof(*cb)); \ @@ -97,12 +95,6 @@ again: \ CCBTYPE##que.count --; \ } \ \ - if (flags == 0) \ - { \ - CCBTYPE##que.flags |= CCB_MWANTED; \ - tsleep((caddr_t) &CCBTYPE##que.count, PRIBIO, "ccbwait", 0);\ - goto again; \ - } \ cb = NULL; \ \ out: \ |
