diff options
| author | Johnathan Corgan | 2010-04-26 13:05:03 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-04-26 13:05:03 -0700 |
| commit | 665d7a850eeb46bfc6388a98e4a4107648cb6add (patch) | |
| tree | 722736b80651cd2b6fbde49c7859af50b94d3621 /usrp/host/lib/fusb_darwin.h | |
| parent | a3278070d3e991ea0a8f6e62bbfc2a2e177fe8e7 (diff) | |
| parent | a40feb1dece1b8064f3f81e669f3ed38b60b6dd8 (diff) | |
| download | gnuradio-665d7a850eeb46bfc6388a98e4a4107648cb6add.tar.gz gnuradio-665d7a850eeb46bfc6388a98e4a4107648cb6add.tar.bz2 gnuradio-665d7a850eeb46bfc6388a98e4a4107648cb6add.zip | |
Merge branch 'wip/remove-mld-threads'
* wip/remove-mld-threads:
Further updates for removing omnithreads
Update build configuration for OSX omnithreads changeover
initial move from mld_threads to gruel:: namespace threads and such
Initial changes to remove mld_thread and instead use gruel:: namespace classes
Diffstat (limited to 'usrp/host/lib/fusb_darwin.h')
| -rw-r--r-- | usrp/host/lib/fusb_darwin.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usrp/host/lib/fusb_darwin.h b/usrp/host/lib/fusb_darwin.h index 735e5f16d..4d18177be 100644 --- a/usrp/host/lib/fusb_darwin.h +++ b/usrp/host/lib/fusb_darwin.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2006,2009 Free Software Foundation, Inc. + * Copyright 2006,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio. * @@ -150,8 +150,8 @@ class fusb_ephandle_darwin : public fusb_ephandle { private: fusb_devhandle_darwin* d_devhandle; - mld_thread_ptr d_runThread; - mld_mutex_ptr d_runThreadRunning; + gruel::thread* d_runThread; + gruel::mutex* d_runThreadRunning; CFRunLoopRef d_CFRunLoopRef; @@ -174,8 +174,11 @@ public: s_queue_ptr d_queue; circular_buffer<char>* d_buffer; size_t d_bufLenBytes; - mld_mutex_ptr d_readRunning; - mld_condition_ptr d_runBlock, d_readBlock; + gruel::mutex* d_readRunning; + gruel::mutex* d_runBlock_mutex; + gruel::mutex* d_readBlock_mutex; + gruel::condition_variable* d_runBlock; + gruel::condition_variable* d_readBlock; // CREATORS |