Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/vchiq Use the common list.h
details: https://anonhg.NetBSD.org/src/rev/9fa9375a242b
branches: trunk
changeset: 790110:9fa9375a242b
user: skrll <skrll%NetBSD.org@localhost>
date: Thu Sep 19 14:43:39 2013 +0000
description:
Use the common list.h
diffstat:
sys/external/bsd/vchiq/conf/files.vchiq | 4 +-
sys/external/bsd/vchiq/dist/interface/compat/list.h | 32 ------------
sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h | 2 -
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h | 2 +-
sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h | 2 +
5 files changed, 5 insertions(+), 37 deletions(-)
diffs (87 lines):
diff -r 067823fad46a -r 9fa9375a242b sys/external/bsd/vchiq/conf/files.vchiq
--- a/sys/external/bsd/vchiq/conf/files.vchiq Thu Sep 19 13:51:44 2013 +0000
+++ b/sys/external/bsd/vchiq/conf/files.vchiq Thu Sep 19 14:43:39 2013 +0000
@@ -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/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"
diff -r 067823fad46a -r 9fa9375a242b sys/external/bsd/vchiq/dist/interface/compat/list.h
--- a/sys/external/bsd/vchiq/dist/interface/compat/list.h Thu Sep 19 13:51:44 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#ifndef __COMPAT_LIST__
-#define __COMPAT_LIST__
-
-struct list_head {
- struct list_head *next;
- struct list_head *prev;
-};
-
-#define INIT_LIST_HEAD(ptr) do { \
- (ptr)->prev = (ptr); \
- (ptr)->next = (ptr); \
-} while(0)
-
-#define list_for_each_safe(pos, next, head) \
- for ((pos) = (head)->next, (next) = (pos)->next->next; (pos) != (head); (pos) = (next), (next) = (next)->next)
-#define list_for_each(pos, head) \
- for ((pos) = (head)->next; (pos) != (head); (pos) = (pos)->next)
-#define list_entry(pos, type, head) ((type*)((intptr_t)(pos) - offsetof(type, head)))
-
-#define list_del(pos) do { \
- (pos)->prev->next = (pos)->next; \
- (pos)->next->prev = (pos)->prev; \
- (pos)->next = (pos)->prev = (pos); \
-} while(0)
-
-#define list_add(pos, head) do { \
- (pos)->prev = (head)->prev; \
- (pos)->next = (head); \
- (head)->prev = (pos); \
-} while (0)
-
-#endif
diff -r 067823fad46a -r 9fa9375a242b sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h
--- a/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Thu Sep 19 13:51:44 2013 +0000
+++ b/sys/external/bsd/vchiq/dist/interface/compat/vchi_bsd.h Thu Sep 19 14:43:39 2013 +0000
@@ -375,8 +375,6 @@
#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)
diff -r 067823fad46a -r 9fa9375a242b sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h
--- a/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h Thu Sep 19 13:51:44 2013 +0000
+++ b/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_core.h Thu Sep 19 14:43:39 2013 +0000
@@ -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"
diff -r 067823fad46a -r 9fa9375a242b sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h
--- a/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h Thu Sep 19 13:51:44 2013 +0000
+++ b/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_util.h Thu Sep 19 14:43:39 2013 +0000
@@ -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"
Home |
Main Index |
Thread Index |
Old Index