29c29
< $FreeBSD: head/sys/dev/cxgb/cxgb_adapter.h 170654 2007-06-13 05:36:00Z kmacy $
---
> $FreeBSD: head/sys/dev/cxgb/cxgb_adapter.h 170869 2007-06-17 04:33:38Z kmacy $
39c39
< __FBSDID("$FreeBSD: head/sys/dev/cxgb/cxgb_adapter.h 170654 2007-06-13 05:36:00Z kmacy $");
---
> __FBSDID("$FreeBSD: head/sys/dev/cxgb/cxgb_adapter.h 170869 2007-06-17 04:33:38Z kmacy $");
42a43
> #include <sys/sx.h>
67a69,70
> #define USE_SX
>
71a75,105
> #ifdef DEBUG_LOCKING
> #define MTX_INIT(lock, lockname, class, flags) \
> do { \
> printf("initializing %s at %s:%d\n", lockname, __FILE__, __LINE__); \
> mtx_init((lock), lockname, class, flags); \
> } while (0)
>
> #define MTX_DESTROY(lock) \
> do { \
> printf("destroying %s at %s:%d\n", (lock)->lock_object.lo_name, __FILE__, __LINE__); \
> mtx_destroy((lock)); \
> } while (0)
>
> #define SX_INIT(lock, lockname) \
> do { \
> printf("initializing %s at %s:%d\n", lockname, __FILE__, __LINE__); \
> sx_init((lock), lockname); \
> } while (0)
>
> #define SX_DESTROY(lock) \
> do { \
> printf("destroying %s at %s:%d\n", (lock)->lock_object.lo_name, __FILE__, __LINE__); \
> sx_destroy((lock)); \
> } while (0)
> #else
> #define MTX_INIT mtx_init
> #define MTX_DESTROY mtx_destroy
> #define SX_INIT sx_init
> #define SX_DESTROY sx_destroy
> #endif
>
80c114,117
< struct ifmedia media;
---
> struct ifmedia media;
> #ifdef USE_SX
> struct sx lock;
> #else
82c119
<
---
> #endif
90a128,132
>
> #define PORT_NAME_LEN 32
> #define TASKQ_NAME_LEN 32
> char lockbuf[PORT_NAME_LEN];
> char taskqbuf[TASKQ_NAME_LEN];
106a149,150
>
>
167a212,214
> #define RSPQ_NAME_LEN 32
> char lockbuf[RSPQ_NAME_LEN];
>
218a266,267
> #define TXQ_NAME_LEN 32
> char lockbuf[TXQ_NAME_LEN];
263d311
<
285a334
> struct task tick_task;
287d335
< struct task mr_refresh_task;
312a361,363
> #ifdef USE_SX
> struct sx lock;
> #else
313a365
> #endif
315a368,373
>
> #define ADAPTER_LOCK_NAME_LEN 32
> char lockbuf[ADAPTER_LOCK_NAME_LEN];
> char reglockbuf[ADAPTER_LOCK_NAME_LEN];
> char mdiolockbuf[ADAPTER_LOCK_NAME_LEN];
> char elmerlockbuf[ADAPTER_LOCK_NAME_LEN];
330,331d387
< #define PORT_LOCK(port) mtx_lock(&(port)->lock);
< #define PORT_UNLOCK(port) mtx_unlock(&(port)->lock);
332a389,407
> #ifdef USE_SX
> #define PORT_LOCK(port) sx_xlock(&(port)->lock);
> #define PORT_UNLOCK(port) sx_xunlock(&(port)->lock);
> #define PORT_LOCK_INIT(port, name) SX_INIT(&(port)->lock, name)
> #define PORT_LOCK_DEINIT(port) SX_DESTROY(&(port)->lock)
> #define PORT_LOCK_ASSERT_OWNED(port) sx_assert(&(port)->lock, SA_LOCKED)
>
> #define ADAPTER_LOCK(adap) sx_xlock(&(adap)->lock);
> #define ADAPTER_UNLOCK(adap) sx_xunlock(&(adap)->lock);
> #define ADAPTER_LOCK_INIT(adap, name) SX_INIT(&(adap)->lock, name)
> #define ADAPTER_LOCK_DEINIT(adap) SX_DESTROY(&(adap)->lock)
> #define ADAPTER_LOCK_ASSERT_NOTOWNED(adap) sx_assert(&(adap)->lock, SA_UNLOCKED)
> #else
> #define PORT_LOCK(port) mtx_lock(&(port)->lock);
> #define PORT_UNLOCK(port) mtx_unlock(&(port)->lock);
> #define PORT_LOCK_INIT(port, name) mtx_init(&(port)->lock, name, 0, MTX_DEF)
> #define PORT_LOCK_DEINIT(port) mtx_destroy(&(port)->lock)
> #define PORT_LOCK_ASSERT_OWNED(port) mtx_assert(&(port)->lock, MA_OWNED)
>
334a410,413
> #define ADAPTER_LOCK_INIT(adap, name) mtx_init(&(adap)->lock, name, 0, MTX_DEF)
> #define ADAPTER_LOCK_DEINIT(adap) mtx_destroy(&(adap)->lock)
> #define ADAPTER_LOCK_ASSERT_NOTOWNED(adap) mtx_assert(&(adap)->lock, MO_NOTOWNED)
> #endif
337d415
<