CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: martin Date: Sun Feb 6 12:12:08 UTC 2022 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: vchiq(4): Fix llvm build with only one loff_t definition. Author: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.18 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.19 --- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.18 Sun Dec 19 11:26:04 2021 +++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Sun Feb 6 12:12:08 2022 @@ -45,6 +45,7 @@ #include #include +#include #include /* @@ -255,7 +256,6 @@ int fatal_signal_pending(VCHIQ_THREAD_T) #define PAGE_ALIGN(addr) round_page(addr) typedef void irqreturn_t; -typedef off_t loff_t; #define BCM2835_MBOX_CHAN_VCHIQ 3 #define bcm_mbox_write bcmmbox_write
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: martin Date: Sun Feb 6 12:12:08 UTC 2022 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: vchiq(4): Fix llvm build with only one loff_t definition. Author: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: riastradh
Date: Sun Dec 19 11:26:04 UTC 2021
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
Don't redefine stuff that common now has
Preferring common to avoid licensing mish-mash
Author: Maya Rashish
Committer: Taylor R Campbell
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.17 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.18
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.17 Sat Sep 26 12:58:22 2020
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Sun Dec 19 11:26:04 2021
@@ -173,47 +173,6 @@ void
device_rlprintf(int pps, device_t dev, const char *fmt, ...)
__printflike(3, 4);
-#define might_sleep()
-
-#define WARN(condition, msg)\
-({ \
- int __ret_warn_on = !!(condition); \
- if (unlikely(__ret_warn_on)) \
- printf((msg));\
- unlikely(__ret_warn_on); \
-})
-
-
-
-#define WARN_ON(condition)\
-({ \
- int __ret_warn_on = !!(condition); \
- if (unlikely(__ret_warn_on)) \
- printf("WARN_ON: " #condition "\n"); \
- unlikely(__ret_warn_on); \
-})
-
-#define WARN_ON_ONCE(condition) ({ \
- static int __warned;\
- int __ret_warn_once = !!(condition); \
- \
- if (unlikely(__ret_warn_once)) \
- if (WARN_ON(!__warned)) \
- __warned = 1; \
- unlikely(__ret_warn_once); \
-})
-
-#define BUG_ON(cond) \
- do { \
- if (cond)\
- panic("BUG_ON: " #cond); \
- } while (0)
-
-#define BUG() \
- do { \
- panic("BUG: %s:%d", __FILE__, __LINE__); \
- } while (0)
-
#define vchiq_static_assert(cond) CTASSERT(cond)
/*
@@ -293,7 +252,6 @@ int fatal_signal_pending(VCHIQ_THREAD_T)
#define __user
#define current curlwp
-#define EXPORT_SYMBOL(x)
#define PAGE_ALIGN(addr) round_page(addr)
typedef void irqreturn_t;
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: riastradh Date: Sun Dec 19 11:26:04 UTC 2021 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Don't redefine stuff that common now has Preferring common to avoid licensing mish-mash Author: Maya Rashish Committer: Taylor R Campbell To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Sat Sep 26 10:56:37 UTC 2020 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Sat Sep 26 10:56:37 UTC 2020 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.15 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.16 --- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.15 Tue Aug 28 09:25:21 2018 +++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Sat Sep 26 10:56:37 2020 @@ -293,7 +293,7 @@ int fatal_signal_pending(VCHIQ_THREAD_T) #define __user #define current curlwp -#define EXPORT_SYMBOL(x) +#define EXPORT_SYMBOL(x) #define PAGE_ALIGN(addr) round_page(addr) typedef void irqreturn_t;
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Tue Aug 28 09:25:21 UTC 2018
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
Remove stuff now in sys/external/bsd/common
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.14 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.15
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.14 Sun Nov 5 09:11:43 2017
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Tue Aug 28 09:25:21 2018
@@ -216,32 +216,6 @@ device_rlprintf(int pps, device_t dev, c
#define vchiq_static_assert(cond) CTASSERT(cond)
-#define KERN_EMERG "<0>" /* system is unusable */
-#define KERN_ALERT "<1>" /* action must be taken immediately */
-#define KERN_CRIT "<2>" /* critical conditions */
-#define KERN_ERR "<3>" /* error conditions */
-#define KERN_WARNING "<4>" /* warning conditions */
-#define KERN_NOTICE "<5>" /* normal but significant condition */
-#define KERN_INFO "<6>" /* informational */
-#define KERN_DEBUG "<7>" /* debug-level messages */
-#define KERN_CONT ""
-
-#define printk(fmt, args...) printf(fmt, ##args)
-#define vprintk(fmt, args) vprintf(fmt, args)
-
-/*
- * Malloc API
- */
-#define GFP_KERNEL 0
-#define GFP_ATOMIC 0
-
-MALLOC_DECLARE(M_VCHI);
-
-#define kmalloc(size, flags) malloc((size), M_VCHI, M_NOWAIT | M_ZERO)
-#define kcalloc(n, size, flags) malloc((n) * (size), M_VCHI, M_NOWAIT | M_ZERO)
-#define kzalloc(a, b) kcalloc(1, (a), (b))
-#define kfree(p) do { if (p) free(p, M_VCHI); } while (0)
-
/*
* Kernel module API
*/
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Tue Aug 28 09:25:21 UTC 2018 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Remove stuff now in sys/external/bsd/common To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: maya Date: Mon Sep 11 05:25:53 UTC 2017 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Use common barrier.h rather than separate implementation. NFCI To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: maya
Date: Mon Sep 11 05:25:53 UTC 2017
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
Use common barrier.h rather than separate implementation. NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.11 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.12
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.11 Mon Sep 11 00:58:20 2017
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Mon Sep 11 05:25:53 2017
@@ -28,10 +28,6 @@
#ifndef __VCHI_NETBSD_H__
#define __VCHI_NETBSD_H__
-#ifdef _KERNEL_OPT
-#include "opt_multiprocessor.h"
-#endif
-
#include
#include
#include
@@ -49,6 +45,7 @@
#include
#include
+#include
/*
* Copy from/to user API
@@ -331,21 +328,6 @@ typedef off_t loff_t;
#define BCM2835_MBOX_CHAN_VCHIQ 3
#define bcm_mbox_write bcmmbox_write
-#define mb membar_sync
-#define wmb membar_producer
-#define rmb membar_consumer
-#define dsb membar_producer
-
-#ifdef MULTIPROCESSOR
-# define smp_mb mb
-# define smp_wmb wmb
-# define smp_rmb rmb
-#else
-# define smp_mb()do {} while (0)
-# define smp_wmb() do {} while (0)
-# define smp_rmb() do {} while (0)
-#endif
-
#define device_print_prettyname(dev) device_printf((dev), "")
#endif /* __VCHI_NETBSD_H__ */
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: maya Date: Mon Sep 11 00:58:20 UTC 2017 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Include opt_multiprocessor.h for MULTIPROCESSOR To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.10 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.11 --- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.10 Thu Jan 12 05:25:03 2017 +++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Mon Sep 11 00:58:20 2017 @@ -28,6 +28,10 @@ #ifndef __VCHI_NETBSD_H__ #define __VCHI_NETBSD_H__ +#ifdef _KERNEL_OPT +#include "opt_multiprocessor.h" +#endif + #include #include #include
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: maya Date: Mon Sep 11 00:58:20 UTC 2017 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Include opt_multiprocessor.h for MULTIPROCESSOR To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Thu Jan 12 05:25:03 UTC 2017
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
Sync memory barriers with sys/external/bsd/drm2/include/asm/barrier.h
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.9 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.10
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.9 Sat Oct 25 11:35:15 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Thu Jan 12 05:25:03 2017
@@ -327,13 +327,20 @@ typedef off_t loff_t;
#define BCM2835_MBOX_CHAN_VCHIQ 3
#define bcm_mbox_write bcmmbox_write
-#define rmb membar_consumer
-#define wmb membar_producer
+#define mb membar_sync
+#define wmb membar_producer
+#define rmb membar_consumer
#define dsb membar_producer
-#define smp_mb membar_producer
-#define smp_rmb membar_consumer
-#define smp_wmb membar_producer
+#ifdef MULTIPROCESSOR
+# define smp_mb mb
+# define smp_wmb wmb
+# define smp_rmb rmb
+#else
+# define smp_mb()do {} while (0)
+# define smp_wmb() do {} while (0)
+# define smp_rmb() do {} while (0)
+#endif
#define device_print_prettyname(dev) device_printf((dev), "")
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Thu Jan 12 05:25:03 UTC 2017 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Sync memory barriers with sys/external/bsd/drm2/include/asm/barrier.h To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Sat Oct 25 11:35:15 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
G/C some unused code.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.8 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.9
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.8 Tue Sep 2 09:55:48 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Sat Oct 25 11:35:15 2014
@@ -53,46 +53,6 @@
#define copy_to_user(to, from, n) copyout((from), (to), (n))
/*
- * Bit API
- */
-
-static __inline int
-test_and_set_bit(int nr, volatile void *addr)
-{
- volatile uint32_t *val;
- uint32_t mask, old;
-
- val = (volatile uint32_t *)addr;
- mask = 1 nr;
-
- do {
- old = *val;
- if ((old mask) != 0)
- break;
- } while (atomic_cas_uint(val, old, old | mask) != old);
-
- return old mask;
-}
-
-static __inline__ int
-test_and_clear_bit(int nr, volatile void *addr)
-{
- volatile uint32_t *val;
- uint32_t mask, old;
-
- val = (volatile uint32_t *)addr;
- mask = 1 nr;
-
- do {
- old = *val;
- if ((old mask) == 0)
- break;
- } while (atomic_cas_uint(val, old, old ~mask) != old);
-
- return old mask;
-}
-
-/*
* Atomic API
*/
typedef volatile unsigned int atomic_t;
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Sat Oct 25 11:35:15 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: G/C some unused code. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Fri Apr 25 15:49:17 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.7 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.8
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.7 Sat Apr 12 13:28:41 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Fri Apr 25 15:49:17 2014
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.7 2014/04/12 13:28:41 skrll Exp $
+ * $Id: vchi_bsd.c,v 1.8 2014/04/25 15:49:17 skrll Exp $
*/
#include sys/types.h
@@ -281,7 +281,7 @@ struct thread_data {
static struct thread_data thread_slots[MAX_THREAD_DATA_SLOTS];
-static void
+static void
kthread_wrapper(void *data)
{
struct thread_data *slot;
@@ -312,7 +312,7 @@ vchiq_thread_create(int (*threadfn)(void
va_start(ap, namefmt);
vsnprintf(name, sizeof(name), namefmt, ap);
va_end(ap);
-
+
newt = NULL;
if (kthread_create(PRI_NONE, 0, NULL, kthread_wrapper, slot, newt,
%s, name) != 0) {
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Fri Apr 25 15:49:17 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Thu Mar 27 07:54:43 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
bzero - memset
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.3 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.4
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.3 Fri Sep 6 05:50:22 2013
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Thu Mar 27 07:54:43 2014
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.3 2013/09/06 05:50:22 skrll Exp $
+ * $Id: vchi_bsd.c,v 1.4 2014/03/27 07:54:43 skrll Exp $
*/
#include sys/types.h
@@ -252,7 +252,7 @@ void sema_sysinit(void *arg)
void
_sema_init(struct semaphore *s, int value)
{
- bzero(s, sizeof(*s));
+ memset(s, 0, sizeof(*s));
mutex_init(s-mtx, MUTEX_DEFAULT, IPL_VM);
cv_init(s-cv, semacv);
s-value = value;
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Thu Mar 27 07:56:56 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.4 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.5
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.4 Thu Mar 27 07:54:43 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Thu Mar 27 07:56:56 2014
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.4 2014/03/27 07:54:43 skrll Exp $
+ * $Id: vchi_bsd.c,v 1.5 2014/03/27 07:56:56 skrll Exp $
*/
#include sys/types.h
@@ -296,14 +296,14 @@ down_interruptible(struct semaphore *s)
if (ret == EINTR || ret == ERESTART) {
mutex_exit(s-mtx);
- return (-EINTR);
+ return -EINTR;
}
}
s-value--;
mutex_exit(s-mtx);
- return (0);
+ return 0;
}
int
@@ -325,7 +325,7 @@ down_trylock(struct semaphore *s)
mutex_exit(s-mtx);
- return (ret);
+ return ret;
}
void
@@ -385,7 +385,7 @@ int
fatal_signal_pending(VCHIQ_THREAD_T thr)
{
printf(Implement ME: %s\n, __func__);
- return (0);
+ return 0;
}
/*
@@ -426,7 +426,7 @@ vchiq_thread_create(int (*threadfn)(void
if (thread_data_slot = MAX_THREAD_DATA_SLOTS) {
printf(kthread_create: out of thread data slots\n);
- return (NULL);
+ return NULL;
}
slot = thread_slots[thread_data_slot];
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Thu Mar 27 07:59:17 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
Simplify the semaphore code a little
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.5 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.6
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.5 Thu Mar 27 07:56:56 2014
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Thu Mar 27 07:59:17 2014
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.5 2014/03/27 07:56:56 skrll Exp $
+ * $Id: vchi_bsd.c,v 1.6 2014/03/27 07:59:17 skrll Exp $
*/
#include sys/types.h
@@ -283,15 +283,12 @@ down(struct semaphore *s)
int
down_interruptible(struct semaphore *s)
{
- int ret ;
-
- ret = 0;
mutex_enter(s-mtx);
while (s-value == 0) {
s-waiters++;
- ret = cv_wait_sig(s-cv, s-mtx);
+ int ret = cv_wait_sig(s-cv, s-mtx);
s-waiters--;
if (ret == EINTR || ret == ERESTART) {
@@ -309,9 +306,7 @@ down_interruptible(struct semaphore *s)
int
down_trylock(struct semaphore *s)
{
- int ret;
-
- ret = 0;
+ int ret = 1;
mutex_enter(s-mtx);
@@ -319,8 +314,6 @@ down_trylock(struct semaphore *s)
/* Success. */
s-value--;
ret = 0;
- } else {
- ret = -EAGAIN;
}
mutex_exit(s-mtx);
@@ -333,7 +326,7 @@ up(struct semaphore *s)
{
mutex_enter(s-mtx);
s-value++;
- if (s-waiters s-value 0)
+ if (s-value 0 s-waiters)
cv_signal(s-cv);
mutex_exit(s-mtx);
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Thu Mar 27 07:54:43 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: bzero - memset To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Thu Mar 27 07:56:56 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Thu Mar 27 07:59:17 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: Simplify the semaphore code a little To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Wed Mar 26 16:44:41 UTC 2014
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
KNF
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.4 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.5
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.4 Thu Sep 19 14:43:39 2013
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Wed Mar 26 16:44:41 2014
@@ -315,7 +315,8 @@ MALLOC_DECLARE(M_VCHI);
*/
#if 1
/* emulate jiffies */
-static inline unsigned long _jiffies(void)
+static inline unsigned long
+_jiffies(void)
{
struct timeval tv;
@@ -323,7 +324,8 @@ static inline unsigned long _jiffies(voi
return tvtohz(tv);
}
-static inline unsigned long msecs_to_jiffies(unsigned long msecs)
+static inline unsigned long
+msecs_to_jiffies(unsigned long msecs)
{
struct timeval tv;
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Wed Mar 26 16:44:41 UTC 2014 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Thu Sep 5 13:56:12 UTC 2013
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
Do a better job of matching some linux APIs. Still not quite working.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.2 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.3
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.2 Mon Mar 25 22:17:01 2013
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Thu Sep 5 13:56:12 2013
@@ -96,7 +96,7 @@ test_and_clear_bit(int nr, volatile void
typedef volatile unsigned int atomic_t;
#define atomic_set(p, v) (*(p) = (v))
-#define atomic_read(p) (*(p))
+#define atomic_read(p) (*(volatile int *)(p))
#define atomic_inc(p) atomic_inc_uint(p)
#define atomic_dec(p) atomic_dec_uint(p)
#define atomic_dec_and_test(p) (atomic_dec_uint_nv(p) == 0)
@@ -125,15 +125,6 @@ typedef kmutex_t spinlock_t;
#define spin_lock_destroy(lock) mutex_destroy(lock)
#define spin_lock(lock) mutex_spin_enter(lock)
#define spin_unlock(lock) mutex_spin_exit(lock)
-#define spin_lock_bh(lock) spin_lock(lock)
-#define spin_unlock_bh(lock) spin_unlock(lock)
-#define spin_lock_irqsave(lock, flags) \
- do { \
- spin_lock(lock); \
- (void) (flags); \
- } while (0)
-#define spin_unlock_irqrestore(lock, flags) \
- spin_unlock(lock)
/*
* Mutex API
@@ -151,25 +142,16 @@ struct mutex {
/*
* Rwlock API
*/
-typedef krwlock_t rwlock_t;
+typedef kmutex_t rwlock_t;
-/*
- * NB: Need to initialize these at attach time!
- */
-#define DEFINE_RWLOCK(name) rwlock_t name
-#define rwlock_init(rwlock) rw_init(rwlock)
-#define read_lock(rwlock) rw_enter(rwlock, RW_READER)
-#define read_unlock(rwlock) rw_exit(rwlock)
-
-#define write_lock(rwlock) rw_enter(rwlock, RW_WRITER)
-#define write_unlock(rwlock) rw_exit(rwlock)
-#define write_lock_irqsave(rwlock, flags) \
- do { \
- write_lock(rwlock); \
- (void) (flags); \
- } while (0)
-#define write_unlock_irqrestore(rwlock, flags) \
- write_unlock(rwlock)
+#define DEFINE_RWLOCK(name) kmutex_t name
+
+#define rwlock_init(rwlock) mutex_init(rwlock, MUTEX_DEFAULT, IPL_VM)
+#define read_lock(rwlock) mutex_spin_enter(rwlock)
+#define read_unlock(rwlock) mutex_spin_exit(rwlock)
+
+#define write_lock(rwlock) mutex_spin_enter(rwlock)
+#define write_unlock(rwlock) mutex_spin_exit(rwlock)
#define read_lock_bh(rwlock) read_lock(rwlock)
#define read_unlock_bh(rwlock) read_unlock(rwlock)
@@ -371,7 +353,7 @@ static inline unsigned long msecs_to_jif
#define time_before(a, b) time_after((b), (a))
/*
- * kthread API (we use proc)
+ * kthread API (we use lwp)
*/
typedef lwp_t * VCHIQ_THREAD_T;
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: skrll
Date: Fri Sep 6 05:50:22 UTC 2013
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
Change the cv name slightly
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.2 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.3
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.2 Sun Mar 24 14:26:16 2013
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Fri Sep 6 05:50:22 2013
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.2 2013/03/24 14:26:16 jmcneill Exp $
+ * $Id: vchi_bsd.c,v 1.3 2013/09/06 05:50:22 skrll Exp $
*/
#include sys/types.h
@@ -254,7 +254,7 @@ _sema_init(struct semaphore *s, int valu
{
bzero(s, sizeof(*s));
mutex_init(s-mtx, MUTEX_DEFAULT, IPL_VM);
- cv_init(s-cv, sema cv);
+ cv_init(s-cv, semacv);
s-value = value;
}
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Thu Sep 5 13:56:12 UTC 2013 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: Do a better job of matching some linux APIs. Still not quite working. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: skrll Date: Fri Sep 6 05:50:22 UTC 2013 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: Change the cv name slightly To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: jmcneill
Date: Mon Mar 25 22:17:01 UTC 2013
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
Log Message:
fix atomic_cmpxchg wrapper
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.1 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.2
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h:1.1 Fri Mar 8 12:32:30 2013
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Mon Mar 25 22:17:01 2013
@@ -107,16 +107,10 @@ typedef volatile unsigned int atomic_t;
#define atomic_add_return(v, p) atomic_add_int_nv(p, v)
#define atomic_sub_return(v, p) atomic_add_int_nv(p, -(v))
#define atomic_xchg(p, v) atomic_swap_uint(p, v)
+#define atomic_cmpxchg(p, oldv, newv) atomic_cas_uint(p, oldv, newv)
#define ATOMIC_INIT(v) (v)
-static inline int
-atomic_cmpxchg(atomic_t *v, int oldv, int newv)
-{
- atomic_cas_uint(v, oldv, newv);
- return *v;
-}
-
/*
* Spinlock API
*/
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: jmcneill Date: Mon Mar 25 22:17:01 UTC 2013 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h Log Message: fix atomic_cmpxchg wrapper To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src
Committed By: jmcneill
Date: Sun Mar 24 14:26:16 UTC 2013
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c
Log Message:
sema mutex needs to be IPL_VM
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c
diff -u src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.1 src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.2
--- src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c:1.1 Fri Mar 8 12:32:30 2013
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Sun Mar 24 14:26:16 2013
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: vchi_bsd.c,v 1.1 2013/03/08 12:32:30 jmcneill Exp $
+ * $Id: vchi_bsd.c,v 1.2 2013/03/24 14:26:16 jmcneill Exp $
*/
#include sys/types.h
@@ -253,7 +253,7 @@ void
_sema_init(struct semaphore *s, int value)
{
bzero(s, sizeof(*s));
- mutex_init(s-mtx, MUTEX_DEFAULT, IPL_NONE);
+ mutex_init(s-mtx, MUTEX_DEFAULT, IPL_VM);
cv_init(s-cv, sema cv);
s-value = value;
}
CVS commit: src/sys/external/bsd/vchiq/dist/interface/compat
Module Name:src Committed By: jmcneill Date: Sun Mar 24 14:26:16 UTC 2013 Modified Files: src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.c Log Message: sema mutex needs to be IPL_VM To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
