Module Name: src
Committed By: skrll
Date: Thu Sep 19 14:43:39 UTC 2013
Modified Files:
src/sys/external/bsd/vchiq/conf: files.vchiq
src/sys/external/bsd/vchiq/dist/interface/compat: vchi_bsd.h
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_core.h
vchiq_util.h
Removed Files:
src/sys/external/bsd/vchiq/dist/interface/compat: list.h
Log Message:
Use the common list.h
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/vchiq/conf/files.vchiq
cvs rdiff -u -r1.1 -r0 \
src/sys/external/bsd/vchiq/dist/interface/compat/list.h
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.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/conf/files.vchiq
diff -u src/sys/external/bsd/vchiq/conf/files.vchiq:1.1 src/sys/external/bsd/vchiq/conf/files.vchiq:1.2
--- src/sys/external/bsd/vchiq/conf/files.vchiq:1.1 Fri Mar 8 12:32:29 2013
+++ src/sys/external/bsd/vchiq/conf/files.vchiq Thu Sep 19 14:43:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.vchiq,v 1.1 2013/03/08 12:32:29 jmcneill Exp $
+# $NetBSD: files.vchiq,v 1.2 2013/09/19 14:43:39 skrll Exp $
#
# Broadcom VideoCore IV
#
@@ -17,4 +17,4 @@ file external/bsd/vchiq/dist/interface/v
file external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kern_lib.c vchiq
file external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_kmod_netbsd.c vchiq
-makeoptions vchiq CPPFLAGS+="-I$S/external/bsd/vchiq/dist -DVCOS_VERIFY_BKPTS=1 -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -DVCHIQ_ENABLE_DEBUG=1 -DVCHIQ_LOG_DEFAULT=5"
+makeoptions vchiq CPPFLAGS+="-I$S/external/bsd/vchiq/dist -I$S/external/bsd/common/include -DVCOS_VERIFY_BKPTS=1 -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -DVCHIQ_ENABLE_DEBUG=1 -DVCHIQ_LOG_DEFAULT=5"
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.3 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.3 Thu Sep 5 13:56:12 2013
+++ src/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Thu Sep 19 14:43:39 2013
@@ -375,8 +375,6 @@ int fatal_signal_pending(VCHIQ_THREAD_T)
#define __user
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
#define current curlwp
#define EXPORT_SYMBOL(x)
#define PAGE_ALIGN(addr) round_page(addr)
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h:1.1 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h:1.2
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h:1.1 Fri Mar 8 12:32:31 2013
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h Thu Sep 19 14:43:39 2013
@@ -35,7 +35,7 @@
#define VCHIQ_CORE_H
#include <interface/compat/vchi_bsd.h>
-#include <interface/compat/list.h>
+#include <linux/list.h>
#include "vchiq_cfg.h"
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h:1.1 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h:1.2
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h:1.1 Fri Mar 8 12:32:31 2013
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h Thu Sep 19 14:43:39 2013
@@ -34,6 +34,8 @@
#ifndef VCHIQ_UTIL_H
#define VCHIQ_UTIL_H
+#include <linux/kernel.h>
+
#include <interface/compat/vchi_bsd.h>
#include "vchiq_if.h"
