[haiku-commits] r34622 - in haiku/branches/components/gallium3d: . headers/os/drivers headers/posix/sys headers/private/kernel headers/private/media ...
- From: aljen-mlists@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 10 Dec 2009 19:03:19 +0100 (CET)
Author: aljen
Date: 2009-12-10 19:03:19 +0100 (Thu, 10 Dec 2009)
New Revision: 34622
Changeset: http://dev.haiku-os.org/changeset/34622/haiku
Added:
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphy.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphyreg.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy_subr.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/glue.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vge.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgereg.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgevar.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_aironet_ieee.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_isa.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pccard.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pci.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_anreg.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/opt_inet.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wavelan_ieee.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pccard.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pci.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wireg.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wivar.h
haiku/branches/components/gallium3d/src/kits/media/request_data.cpp
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/machine/md_var.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/ctype.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/priority.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/random.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/syslog.h
haiku/branches/components/gallium3d/src/system/kernel/scheduler/scheduler_simple_smp.cpp
haiku/branches/components/gallium3d/src/system/kernel/scheduler/scheduler_simple_smp.h
Removed:
haiku/branches/components/gallium3d/headers/private/media/PortPool.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphy.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ciphyreg.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/mii/ukphy_subr.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/glue.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vge.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgereg.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/vt612x/dev/vge/if_vgevar.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_aironet_ieee.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_isa.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pccard.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_an_pci.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/if_anreg.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/opt_inet.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wavelan_ieee.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pccard.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wi_pci.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wireg.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/if_wivar.h
haiku/branches/components/gallium3d/src/kits/media/PortPool.cpp
Modified:
haiku/branches/components/gallium3d/
haiku/branches/components/gallium3d/headers/os/drivers/ACPI.h
haiku/branches/components/gallium3d/headers/posix/sys/sockio.h
haiku/branches/components/gallium3d/headers/private/kernel/cpu.h
haiku/branches/components/gallium3d/headers/private/kernel/smp.h
haiku/branches/components/gallium3d/headers/private/kernel/thread.h
haiku/branches/components/gallium3d/headers/private/kernel/thread_types.h
haiku/branches/components/gallium3d/headers/private/media/DataExchange.h
haiku/branches/components/gallium3d/headers/private/media/ServerInterface.h
haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h
haiku/branches/components/gallium3d/src/add-ons/kernel/bus_managers/acpi/oshaiku.c
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/Jamfile
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/ports/pc_serial/Driver.cpp
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/ports/pc_serial/Driver.h
haiku/branches/components/gallium3d/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.cpp
haiku/branches/components/gallium3d/src/apps/cortex/NodeManager/NodeManager.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/HeaderView.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/HeaderView.h
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/ListSelectionModel.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/ListSelectionModel.h
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/GeneralPage.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/GeneralPage.h
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/SchedulingPage.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/SchedulingPage.h
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/main_window/WaitObjectsPage.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/gui/thread_window/WaitObjectsPage.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/model/Model.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/model/Model.h
haiku/branches/components/gallium3d/src/apps/debuganalyzer/model_loader/ModelLoader.cpp
haiku/branches/components/gallium3d/src/apps/debuganalyzer/model_loader/ModelLoader.h
haiku/branches/components/gallium3d/src/apps/debuganalyzer/util/TimeUtils.h
haiku/branches/components/gallium3d/src/data/keymaps/Arabic (102).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Brazilian (ABNT2).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Bulgarian
(Cyrillic).keymap
haiku/branches/components/gallium3d/src/data/keymaps/French (Mac).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Lithuanian
(Baltic).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Polish
(programmer's).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Serbian
(Cyrillic).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Serbian (Latin).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Spanish (Dvorak).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Turkish (Type-F).keymap
haiku/branches/components/gallium3d/src/data/keymaps/Turkish (Type-Q).keymap
haiku/branches/components/gallium3d/src/data/timezones/antarctica
haiku/branches/components/gallium3d/src/data/timezones/asia
haiku/branches/components/gallium3d/src/data/timezones/australasia
haiku/branches/components/gallium3d/src/data/timezones/europe
haiku/branches/components/gallium3d/src/data/timezones/southamerica
haiku/branches/components/gallium3d/src/data/timezones/zone.tab
haiku/branches/components/gallium3d/src/kits/interface/ToolTipManager.cpp
haiku/branches/components/gallium3d/src/kits/media/BufferConsumer.cpp
haiku/branches/components/gallium3d/src/kits/media/Controllable.cpp
haiku/branches/components/gallium3d/src/kits/media/DataExchange.cpp
haiku/branches/components/gallium3d/src/kits/media/DormantNodeManager.cpp
haiku/branches/components/gallium3d/src/kits/media/FileInterface.cpp
haiku/branches/components/gallium3d/src/kits/media/Jamfile
haiku/branches/components/gallium3d/src/kits/media/MediaAddOn.cpp
haiku/branches/components/gallium3d/src/kits/media/MediaRoster.cpp
haiku/branches/components/gallium3d/src/kits/media/SoundPlayer.cpp
haiku/branches/components/gallium3d/src/kits/media/TimeSourceObject.cpp
haiku/branches/components/gallium3d/src/kits/media/TimeSourceObjectManager.cpp
haiku/branches/components/gallium3d/src/kits/support/Beep.cpp
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/Condvar.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/bus.c
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/net/bpf.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/bus.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/ioccom.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/param.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/proc.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/rman.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/sockio.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/sysctl.h
haiku/branches/components/gallium3d/src/libs/compat/freebsd_network/compat/sys/systm.h
haiku/branches/components/gallium3d/src/servers/media/AppManager.cpp
haiku/branches/components/gallium3d/src/servers/media/AppManager.h
haiku/branches/components/gallium3d/src/servers/media/DefaultManager.cpp
haiku/branches/components/gallium3d/src/servers/media/NodeManager.cpp
haiku/branches/components/gallium3d/src/servers/media/NodeManager.h
haiku/branches/components/gallium3d/src/servers/media/media_server.cpp
haiku/branches/components/gallium3d/src/servers/media_addon/MediaAddonServer.cpp
haiku/branches/components/gallium3d/src/system/kernel/Jamfile
haiku/branches/components/gallium3d/src/system/kernel/arch/arm/arch_smp.cpp
haiku/branches/components/gallium3d/src/system/kernel/arch/arm/arch_thread.cpp
haiku/branches/components/gallium3d/src/system/kernel/arch/arm/uart.cpp
haiku/branches/components/gallium3d/src/system/kernel/arch/m68k/arch_thread.cpp
haiku/branches/components/gallium3d/src/system/kernel/arch/x86/arch_int.cpp
haiku/branches/components/gallium3d/src/system/kernel/cache/block_cache.cpp
haiku/branches/components/gallium3d/src/system/kernel/int.cpp
haiku/branches/components/gallium3d/src/system/kernel/scheduler/scheduler.cpp
haiku/branches/components/gallium3d/src/system/kernel/scheduler/scheduler_affine.cpp
haiku/branches/components/gallium3d/src/system/kernel/scheduler/scheduler_simple.cpp
haiku/branches/components/gallium3d/src/system/kernel/smp.cpp
haiku/branches/components/gallium3d/src/system/kernel/thread.cpp
haiku/branches/components/gallium3d/src/system/kernel/timer.cpp
[... truncated: 1 changed files follow ...]
Log:
merged changes from trunk r34569-r34621
Property changes on: haiku/branches/components/gallium3d
___________________________________________________________________
Modified: svn:mergeinfo
- /haiku/trunk:33410-34568
+ /haiku/trunk:33410-34621
Modified: haiku/branches/components/gallium3d/headers/os/drivers/ACPI.h
===================================================================
--- haiku/branches/components/gallium3d/headers/os/drivers/ACPI.h
2009-12-10 16:23:38 UTC (rev 34621)
+++ haiku/branches/components/gallium3d/headers/os/drivers/ACPI.h
2009-12-10 18:03:19 UTC (rev 34622)
@@ -15,10 +15,15 @@
#define B_ACPI_MODULE_NAME "bus_managers/acpi/v1"
-/* This must be uint64 for 64 bit! */
+#ifdef B_HAIKU_64_BIT
+typedef uint64 acpi_physical_address;
+typedef uint64 acpi_io_address;
+typedef uint64 acpi_size;
+#else
typedef uint32 acpi_physical_address;
typedef uint32 acpi_io_address;
typedef uint32 acpi_size;
+#endif
/* Actually a ptr to a NS Node */
typedef void * acpi_handle;
Modified: haiku/branches/components/gallium3d/headers/posix/sys/sockio.h
===================================================================
--- haiku/branches/components/gallium3d/headers/posix/sys/sockio.h
2009-12-10 16:23:38 UTC (rev 34621)
+++ haiku/branches/components/gallium3d/headers/posix/sys/sockio.h
2009-12-10 18:03:19 UTC (rev 34622)
@@ -52,4 +52,14 @@
#define SIOCSPGRP 8939 /* set process group */
#define SIOCGPGRP 8940 /* get process group */
+#define SIOCGPRIVATE_0 8941 /* device private 0 */
+#define SIOCGPRIVATE_1 8942 /* device private 1 */
+#define SIOCSDRVSPEC 8943 /* set driver-specific parameters */
+#define SIOCGDRVSPEC 8944 /* get driver-specific parameters */
+
+#define SIOCSIFGENERIC 8945 /* generic IF set op */
+#define SIOCGIFGENERIC 8946 /* generic IF get op */
+
+#define SIOCEND 8946 /* Always set to
highest SIOC* */
+
#endif /* _SYS_SOCKIO_H */
Modified: haiku/branches/components/gallium3d/headers/private/kernel/cpu.h
===================================================================
--- haiku/branches/components/gallium3d/headers/private/kernel/cpu.h
2009-12-10 16:23:38 UTC (rev 34621)
+++ haiku/branches/components/gallium3d/headers/private/kernel/cpu.h
2009-12-10 18:03:19 UTC (rev 34622)
@@ -43,6 +43,7 @@
jmp_buf fault_jump_buffer;
bool invoke_scheduler;
+ bool invoke_scheduler_if_idle;
bool disabled;
// arch-specific stuff
Modified: haiku/branches/components/gallium3d/headers/private/kernel/smp.h
===================================================================
--- haiku/branches/components/gallium3d/headers/private/kernel/smp.h
2009-12-10 16:23:38 UTC (rev 34621)
+++ haiku/branches/components/gallium3d/headers/private/kernel/smp.h
2009-12-10 18:03:19 UTC (rev 34622)
@@ -22,7 +22,8 @@
SMP_MSG_GLOBAL_INVALIDATE_PAGES,
SMP_MSG_CPU_HALT,
SMP_MSG_CALL_FUNCTION,
- SMP_MSG_RESCHEDULE
+ SMP_MSG_RESCHEDULE,
+ SMP_MSG_RESCHEDULE_IF_IDLE
};
enum {
Modified: haiku/branches/components/gallium3d/headers/private/kernel/thread.h
===================================================================
--- haiku/branches/components/gallium3d/headers/private/kernel/thread.h
2009-12-10 16:23:38 UTC (rev 34621)
+++ haiku/branches/components/gallium3d/headers/private/kernel/thread.h
2009-12-10 18:03:19 UTC (rev 34622)
@@ -197,7 +197,7 @@
// wake up the thread, if it is sleeping
if (thread->state == B_THREAD_WAITING)
return scheduler_enqueue_in_run_queue(thread);
-
+
return false;
}
@@ -229,18 +229,4 @@
}
-static inline void
-thread_disable_scheduling(struct thread* thread)
-{
- thread->keep_scheduled++;
-}
-
-
-static inline void
-thread_enable_scheduling(struct thread* thread)
-{
- thread->keep_scheduled--;
-}
-
-
#endif /* _THREAD_H */
Modified:
haiku/branches/components/gallium3d/headers/private/kernel/thread_types.h
===================================================================
--- haiku/branches/components/gallium3d/headers/private/kernel/thread_types.h
2009-12-10 16:23:38 UTC (rev 34621)
+++ haiku/branches/components/gallium3d/headers/private/kernel/thread_types.h
2009-12-10 18:03:19 UTC (rev 34622)
@@ -241,7 +241,6 @@
struct cpu_ent *cpu;
struct cpu_ent *previous_cpu;
int32 pinned_to_cpu;
- int32 keep_scheduled;
sigset_t sig_pending;
sigset_t sig_block_mask;
Modified:
haiku/branches/components/gallium3d/headers/private/media/DataExchange.h
===================================================================
--- haiku/branches/components/gallium3d/headers/private/media/DataExchange.h
2009-12-10 16:23:38 UTC (rev 34621)
+++ haiku/branches/components/gallium3d/headers/private/media/DataExchange.h
2009-12-10 18:03:19 UTC (rev 34622)
@@ -8,1020 +8,41 @@
#define _DATA_EXCHANGE_H
-#include <string.h>
+#include <ServerInterface.h>
-#include <MediaFormats.h>
-#include <MediaNode.h>
-#include <MediaAddOn.h>
-#include <Messenger.h>
-#include <Buffer.h>
-#include <Entry.h>
-
namespace BPrivate {
namespace media {
namespace dataexchange {
-struct reply_data;
-struct request_data;
-struct command_data;
// BMessage based data exchange with the media_server
-status_t SendToServer(BMessage *msg);
-status_t QueryServer(BMessage &request, BMessage &reply);
+status_t SendToServer(BMessage* msg);
+status_t QueryServer(BMessage& request, BMessage& reply);
// Raw data based data exchange with the media_server
-status_t SendToServer(int32 msgcode, command_data *msg, int size);
-status_t QueryServer(int32 msgcode, request_data *request, int requestsize,
- reply_data *reply, int replysize);
+status_t SendToServer(int32 msgCode, command_data* msg, size_t size);
+status_t QueryServer(int32 msgCode, request_data* request, size_t requestSize,
+ reply_data* reply, size_t replySize);
// Raw data based data exchange with the media_addon_server
-status_t SendToAddonServer(int32 msgcode, command_data *msg, int size);
-status_t QueryAddonServer(int32 msgcode, request_data *request, int
requestSize,
- reply_data *reply, int replysize);
+status_t SendToAddOnServer(int32 msgCode, command_data *msg, size_t size);
+status_t QueryAddOnServer(int32 msgCode, request_data* request,
+ size_t requestSize, reply_data* reply, size_t replySize);
// Raw data based data exchange with any (media node control-) port
-status_t SendToPort(port_id sendport, int32 msgcode, command_data *msg,
- int size);
-status_t QueryPort(port_id requestport, int32 msgcode, request_data *request,
- int requestsize, reply_data *reply, int replysize);
+status_t SendToPort(port_id sendPort, int32 msgCode, command_data* msg,
+ size_t size);
+status_t QueryPort(port_id requestPort, int32 msgCode, request_data* request,
+ size_t requestSize, reply_data* reply, size_t replySize);
-// The base struct used for all raw requests
-struct request_data {
- port_id reply_port;
- status_t SendReply(status_t result, reply_data* reply,
- size_t replySize) const;
-};
+} // namespace dataexchange
+} // namespace media
+} // namespace BPrivate
-// The base struct used for all raw replys
-struct reply_data {
- status_t result;
-};
-// The base struct used for all raw commands (asynchronous, no answer)
-struct command_data {
- // yes, it's empty ;)
-
-#if __GNUC__ == 4
- int32 _padding;
- // GCC 2 and GCC 4 treat empty structures differently
-#endif
-};
-
-// The base struct used for all requests using an area
-struct area_request_data : request_data {
- area_id area;
-};
-
-// The base struct used for all requests requesting an area
-struct request_area_data : request_data {
- team_id team;
-};
-
-// The base struct used for all replies using an area
-struct area_reply_data : reply_data {
- area_id area;
- void* address;
-};
-
-} // namespace dataexchange
-} // namespace media
-} // namespace BPrivate
-
using namespace BPrivate::media::dataexchange;
-// BMessage based server communication
-enum {
- // BMediaRoster notification service
- MEDIA_SERVER_REQUEST_NOTIFICATIONS = 1000,
- MEDIA_SERVER_CANCEL_NOTIFICATIONS,
- MEDIA_SERVER_SEND_NOTIFICATIONS,
- MEDIA_SERVER_GET_FORMATS,
- MEDIA_SERVER_MAKE_FORMAT_FOR,
-
- // add_system_beep_event()
- MEDIA_SERVER_ADD_SYSTEM_BEEP_EVENT,
-
- // media addon server
- MEDIA_ADDON_SERVER_PLAY_MEDIA = '_TRU'
-};
-
-// Raw port based communication
-enum {
- ADDONSERVER_RESCAN_MEDIAADDON_FLAVORS = 0x50,
- ADDONSERVER_RESCAN_FINISHED_NOTIFY,
-
- SERVER_MESSAGE_START = 0x100,
- SERVER_REGISTER_APP,
- SERVER_UNREGISTER_APP,
- SERVER_GET_NODE,
- SERVER_SET_NODE,
- SERVER_PUBLISH_INPUTS,
- SERVER_PUBLISH_OUTPUTS,
- SERVER_NODE_ID_FOR,
- SERVER_GET_LIVE_NODE_INFO,
- SERVER_GET_LIVE_NODES,
- SERVER_GET_NODE_FOR,
- SERVER_RELEASE_NODE,
- SERVER_REGISTER_NODE,
- SERVER_UNREGISTER_NODE,
- SERVER_GET_DORMANT_NODE_FOR,
- SERVER_GET_INSTANCES_FOR,
- SERVER_GET_SHARED_BUFFER_AREA,
- SERVER_REGISTER_BUFFER,
- SERVER_UNREGISTER_BUFFER,
- SERVER_RESCAN_DEFAULTS,
- SERVER_SET_NODE_CREATOR,
- SERVER_CHANGE_ADDON_FLAVOR_INSTANCES_COUNT,
- SERVER_GET_MEDIA_FILE_TYPES,
- SERVER_GET_MEDIA_FILE_ITEMS,
- SERVER_GET_REF_FOR,
- SERVER_SET_REF_FOR,
- SERVER_INVALIDATE_MEDIA_ITEM,
- SERVER_REMOVE_MEDIA_ITEM,
- SERVER_GET_ITEM_AUDIO_GAIN,
- SERVER_SET_ITEM_AUDIO_GAIN,
- SERVER_GET_FORMAT_FOR_DESCRIPTION,
- SERVER_GET_DESCRIPTION_FOR_FORMAT,
- SERVER_GET_READERS,
- SERVER_GET_DECODER_FOR_FORMAT,
- SERVER_GET_WRITER_FOR_FORMAT_FAMILY,
- SERVER_GET_FILE_FORMAT_FOR_COOKIE,
- SERVER_GET_CODEC_INFO_FOR_COOKIE,
- SERVER_GET_ENCODER_FOR_CODEC_INFO,
- SERVER_MESSAGE_END,
- NODE_MESSAGE_START = 0x200,
-
- NODE_START,
- NODE_STOP,
- NODE_SEEK,
- NODE_SET_RUN_MODE,
- NODE_TIME_WARP,
- NODE_PREROLL,
- NODE_SET_TIMESOURCE,
- NODE_GET_TIMESOURCE,
- NODE_REQUEST_COMPLETED,
- NODE_FINAL_RELEASE,
-
- NODE_MESSAGE_END,
- CONSUMER_MESSAGE_START = 0x300,
- CONSUMER_GET_NEXT_INPUT,
- CONSUMER_DISPOSE_INPUT_COOKIE,
- CONSUMER_ACCEPT_FORMAT,
- CONSUMER_CONNECTED,
- CONSUMER_DISCONNECTED,
-
- CONSUMER_BUFFER_RECEIVED,
- CONSUMER_PRODUCER_DATA_STATUS,
- CONSUMER_GET_LATENCY_FOR,
- CONSUMER_FORMAT_CHANGED,
- CONSUMER_SEEK_TAG_REQUESTED,
-
- CONSUMER_MESSAGE_END,
- PRODUCER_MESSAGE_START = 0x400,
- PRODUCER_GET_NEXT_OUTPUT,
- PRODUCER_DISPOSE_OUTPUT_COOKIE,
- PRODUCER_FORMAT_PROPOSAL,
- PRODUCER_PREPARE_TO_CONNECT,
- PRODUCER_CONNECT,
- PRODUCER_DISCONNECT,
-
- PRODUCER_LATE_NOTICE_RECEIVED,
- PRODUCER_LATENCY_CHANGED,
- PRODUCER_ADDITIONAL_BUFFER_REQUESTED,
- PRODUCER_VIDEO_CLIPPING_CHANGED,
- PRODUCER_FORMAT_CHANGE_REQUESTED,
- PRODUCER_SET_BUFFER_GROUP,
- PRODUCER_GET_LATENCY,
- PRODUCER_GET_INITIAL_LATENCY,
- PRODUCER_FORMAT_SUGGESTION_REQUESTED,
- PRODUCER_SET_PLAY_RATE,
- PRODUCER_ENABLE_OUTPUT,
- PRODUCER_SET_RUN_MODE_DELAY,
-
- PRODUCER_MESSAGE_END,
- FILEINTERFACE_MESSAGE_START = 0x500,
- FILEINTERFACE_SET_REF,
- FILEINTERFACE_GET_REF,
- FILEINTERFACE_SNIFF_REF,
- FILEINTERFACE_MESSAGE_END,
- CONTROLLABLE_MESSAGE_START = 0x600,
- CONTROLLABLE_GET_PARAMETER_WEB,
- CONTROLLABLE_GET_PARAMETER_DATA,
- CONTROLLABLE_SET_PARAMETER_DATA,
- CONTROLLABLE_START_CONTROL_PANEL,
- CONTROLLABLE_MESSAGE_END,
- TIMESOURCE_MESSAGE_START = 0x700,
-
- TIMESOURCE_OP, // datablock is a struct time_source_op_info
- TIMESOURCE_ADD_SLAVE_NODE,
- TIMESOURCE_REMOVE_SLAVE_NODE,
- TIMESOURCE_GET_START_LATENCY,
-
- TIMESOURCE_MESSAGE_END,
-};
-
-
-/* We can't send an entry_ref through a port to another team,
- * but we can assign it to an xfer_entry_ref and send this one,
- * when we receive it we can assign it to a normal entry_ref
- */
-struct xfer_entry_ref {
-public:
- xfer_entry_ref()
- {
- device = -1;
- directory = -1;
- name[0] = 0;
- }
-
- operator entry_ref() const
- {
- entry_ref ref(device, directory, name);
- return ref;
- }
-
- xfer_entry_ref& operator=(const entry_ref& ref)
- {
- device = ref.device;
- directory = ref.directory;
- if (ref.name)
- strcpy(name, ref.name);
- else
- name[0] = 0;
-
- return *this;
- }
-
-private:
- dev_t device;
- ino_t directory;
- char name[B_FILE_NAME_LENGTH];
-};
-
-// used by SERVER_GET_NODE and SERVER_SET_NODE
-enum node_type {
- VIDEO_INPUT,
- AUDIO_INPUT,
- VIDEO_OUTPUT,
- AUDIO_MIXER,
- AUDIO_OUTPUT,
- AUDIO_OUTPUT_EX,
- TIME_SOURCE,
- SYSTEM_TIME_SOURCE
-};
-
-// used by SERVER_PUBLISH_INPUTS and SERVER_PUBLISH_OUTPUTS
-enum {
- MAX_OUTPUTS = 8,
- MAX_INPUTS = 8,
-};
-
-// used by SERVER_GET_LIVE_NODES
-enum {
- MAX_LIVE_INFO = 16,
-};
-
-// used by SERVER_GET_INSTANCES_FOR
-enum {
- MAX_NODE_ID = 4000,
-};
-
-// used by SERVER_GET_READERS
-enum {
- MAX_READERS = 40,
-};
-
-struct addonserver_instantiate_dormant_node_request : request_data {
- media_addon_id addon_id;
- int32 flavor_id;
- team_id creator_team;
-};
-
-struct addonserver_instantiate_dormant_node_reply : reply_data {
- media_node node;
-};
-
-struct server_set_node_request : request_data {
- node_type type;
- bool use_node;
- media_node node;
- bool use_dni;
- dormant_node_info dni;
- bool use_input;
- media_input input;
-};
-
-struct server_set_node_reply : reply_data {
-};
-
-struct server_get_node_request : request_data {
- node_type type;
- team_id team;
-};
-
-struct server_get_node_reply : public reply_data {
- media_node node;
-
- // for AUDIO_OUTPUT_EX
- char input_name[B_MEDIA_NAME_LENGTH];
- int32 input_id;
-};
-
-struct producer_format_proposal_request : public request_data {
- media_source output;
- media_format format;
-};
-
-struct producer_format_proposal_reply : reply_data {
- media_format format;
-};
-
-struct producer_prepare_to_connect_request : request_data {
- media_source source;
- media_destination destination;
- media_format format;
- char name[B_MEDIA_NAME_LENGTH];
-};
-
-struct producer_prepare_to_connect_reply : reply_data {
- media_format format;
- media_source out_source;
- char name[B_MEDIA_NAME_LENGTH];
-};
-
-struct producer_connect_request : request_data {
- status_t error;
- media_source source;
- media_destination destination;
- media_format format;
- char name[B_MEDIA_NAME_LENGTH];
-};
-
-struct producer_connect_reply : reply_data {
- char name[B_MEDIA_NAME_LENGTH];
-};
-
-struct producer_disconnect_request : request_data {
- media_source source;
- media_destination destination;
-};
-
-struct producer_disconnect_reply : reply_data {
-};
-
-struct producer_format_suggestion_requested_request : request_data {
- media_type type;
- int32 quality;
-};
-
-struct producer_format_suggestion_requested_reply : reply_data {
- media_format format;
-};
-
-struct producer_set_play_rate_request : request_data {
- int32 numer;
- int32 denom;
-};
-
-struct producer_set_play_rate_reply : reply_data {
-};
-
-struct producer_get_initial_latency_request : request_data {
-};
-
-struct producer_get_initial_latency_reply : reply_data {
- bigtime_t initial_latency;
- uint32 flags;
-};
-
-struct producer_get_latency_request : request_data {
-};
-
-struct producer_get_latency_reply : reply_data {
- bigtime_t latency;
-};
-
-struct producer_set_buffer_group_command : command_data {
- media_source source;
- media_destination destination;
- void* user_data;
- int32 change_tag;
- int32 buffer_count;
- media_buffer_id buffers[1];
-};
-
-struct producer_format_change_requested_command : command_data {
- media_source source;
- media_destination destination;
- media_format format;
- void* user_data;
- int32 change_tag;
-};
-
-struct producer_video_clipping_changed_command : command_data {
- media_source source;
- media_destination destination;
- media_video_display_info display;
- void* user_data;
- int32 change_tag;
- int32 short_count;
- int16 shorts[1];
-};
-
-struct producer_additional_buffer_requested_command : command_data {
- media_source source;
- media_buffer_id prev_buffer;
- bigtime_t prev_time;
- bool has_seek_tag;
- media_seek_tag prev_tag;
-};
-
-struct producer_latency_changed_command : command_data {
- media_source source;
- media_destination destination;
- bigtime_t latency;
- uint32 flags;
-};
-
-struct producer_enable_output_command : command_data {
- media_source source;
- media_destination destination;
- bool enabled;
- void* user_data;
- int32 change_tag;
-};
-
-struct producer_late_notice_received_command : command_data {
- media_source source;
- bigtime_t how_much;
- bigtime_t performance_time;
-};
-
-struct producer_set_run_mode_delay_command : command_data {
- BMediaNode::run_mode mode;
- bigtime_t delay;
-};
-
-struct consumer_accept_format_request : request_data {
- media_destination dest;
- media_format format;
-};
-
-struct consumer_accept_format_reply : reply_data {
- media_format format;
-};
-
-struct consumer_connected_request : request_data {
- media_input input;
-};
-
-struct consumer_connected_reply : reply_data {
- media_input input;
-};
-
-struct server_publish_inputs_request : request_data {
- media_node node;
- int32 count;
- area_id area; // if count > MAX_INPUTS, inputs are in the area
- // area is created in the library, and
also deleted
- // in the library after the reply has
been received
- media_input inputs[MAX_INPUTS];
-};
-
-struct server_publish_inputs_reply : reply_data {
-};
-
-struct server_publish_outputs_request : area_request_data {
- media_node node;
- int32 count;
- // if count > MAX_OUTPUTS, outputs are in the area
- // area is created in the library, and also deleted
- // in the library after the reply has been received
- media_output outputs[MAX_OUTPUTS];
-};
-
-struct server_publish_outputs_reply : reply_data {
-};
-
-struct producer_get_next_output_request : request_data {
- int32 cookie;
-};
-
-struct producer_get_next_output_reply : reply_data
-{
- int32 cookie;
- media_output output;
-};
-
-struct producer_dispose_output_cookie_request : request_data
-{
- int32 cookie;
-};
-
-struct producer_dispose_output_cookie_reply : reply_data {
-};
-
-struct consumer_get_next_input_request : request_data {
- int32 cookie;
-};
-
-struct consumer_get_next_input_reply : reply_data {
- int32 cookie;
- media_input input;
-};
-
-struct consumer_dispose_input_cookie_request : request_data {
- int32 cookie;
-};
-
-struct consumer_dispose_input_cookie_reply : reply_data {
-};
-
-struct consumer_disconnected_request : request_data {
- media_source source;
- media_destination destination;
-};
-
-struct consumer_disconnected_reply : reply_data {
-};
-
-struct consumer_buffer_received_command : command_data {
- media_buffer_id buffer;
- media_header header;
-};
-
-struct consumer_producer_data_status_command : command_data {
- media_destination for_whom;
- int32 status;
- bigtime_t at_performance_time;
-};
-
-struct consumer_get_latency_for_request : request_data {
- media_destination for_whom;
-};
-
-struct consumer_get_latency_for_reply : reply_data {
- bigtime_t latency;
- media_node_id timesource;
-};
-
-struct consumer_format_changed_request : request_data {
- media_source producer;
- media_destination consumer;
- int32 change_tag;
- media_format format;
-};
-
-struct consumer_format_changed_reply : reply_data {
-};
-
-struct consumer_seek_tag_requested_request : request_data {
- media_destination destination;
- bigtime_t target_time;
- uint32 flags;
-};
-
-struct consumer_seek_tag_requested_reply : reply_data {
- media_seek_tag seek_tag;
- bigtime_t tagged_time;
- uint32 flags;
-};
-
-struct server_register_app_request : request_data {
- team_id team;
- BMessenger messenger;
-};
-
-struct server_register_app_reply : reply_data {
-};
-
-struct server_unregister_app_request : request_data {
- team_id team;
-};
-
-struct server_unregister_app_reply : reply_data {
-};
-
-struct server_set_node_creator_request : request_data {
- media_node_id node;
- team_id creator;
-};
-
-struct server_set_node_creator_reply : reply_data {
-};
-
-struct server_change_addon_flavor_instances_count_request : request_data {
- media_addon_id addon_id;
- int32 flavor_id;
- int32 delta; // must be +1 or -1
- team_id team;
-};
-
-struct server_change_addon_flavor_instances_count_reply : reply_data {
-};
-
-struct server_register_node_request : request_data {
- media_addon_id addon_id;
- int32 addon_flavor_id;
- char name[B_MEDIA_NAME_LENGTH];
- uint64 kinds;
- port_id port;
- team_id team;
-};
-
-struct server_register_node_reply : reply_data {
- media_node_id node_id;
-};
-
-struct server_unregister_node_request : request_data {
- media_node_id node_id;
- team_id team;
-};
-
-struct server_unregister_node_reply : reply_data {
- media_addon_id addon_id;
- int32 flavor_id;
-};
-
-struct server_get_live_node_info_request : request_data {
- media_node node;
-};
-
-struct server_get_live_node_info_reply : reply_data {
- live_node_info live_info;
-};
-
-struct server_get_live_nodes_request : request_data {
- int32 maxcount;
- bool has_input;
- bool has_output;
- bool has_name;
- media_format inputformat;
- media_format outputformat;
- char name[B_MEDIA_NAME_LENGTH + 1];
- // +1 for a
trailing "*"
- uint64 require_kinds;
-};
-
-struct server_get_live_nodes_reply : area_reply_data {
- int32 count;
- // if count > MAX_LIVE_INFO, live_node_infos are in the area
- // area is created in the server, but deleted in the library
- live_node_info live_info[MAX_LIVE_INFO];
-};
-
-struct server_node_id_for_request : request_data {
- port_id port;
-};
-
-struct server_node_id_for_reply : reply_data {
- media_node_id node_id;
-};
-
-struct server_get_node_for_request : request_data {
- media_node_id node_id;
- team_id team;
-};
-
-struct server_get_node_for_reply : reply_data {
- media_node clone;
-};
-
-struct server_release_node_request : request_data {
- media_node node;
- team_id team;
-};
-
-struct server_release_node_reply : reply_data {
-};
-
-struct server_get_dormant_node_for_request : request_data {
- media_node node;
-};
-
-struct server_get_dormant_node_for_reply : reply_data {
- dormant_node_info node_info;
-};
-
-struct server_get_instances_for_request : request_data {
- int32 maxcount;
- media_addon_id addon_id;
- int32 addon_flavor_id;
-};
-
-struct server_get_instances_for_reply : reply_data {
- int32 count;
- media_node_id node_id[MAX_NODE_ID];
- // no area here, MAX_NODE_ID is really large
-};
-
-struct server_rescan_defaults_command : command_data {
-};
-
-struct addonserver_rescan_mediaaddon_flavors_command : command_data {
- media_addon_id addon_id;
-};
-
-struct addonserver_rescan_finished_notify_command : command_data {
-};
-
-struct server_register_mediaaddon_request : request_data {
- xfer_entry_ref ref;
-};
-
-struct server_register_mediaaddon_reply : reply_data {
- media_addon_id addon_id;
-};
-
-struct server_unregister_mediaaddon_command : command_data {
- media_addon_id addon_id;
-};
-
-struct server_get_mediaaddon_ref_request : request_data {
- media_addon_id addon_id;
-};
-
-struct server_get_mediaaddon_ref_reply : reply_data {
- xfer_entry_ref ref;
-};
-
-struct server_get_shared_buffer_area_request : request_data {
-};
-
-struct server_get_shared_buffer_area_reply : area_reply_data {
-};
-
-struct server_register_buffer_request : request_data {
- team_id team;
- buffer_clone_info info;
- // either info.buffer is != 0, or the area, size, offset is used
-};
-
-struct server_register_buffer_reply : reply_data {
- buffer_clone_info info;
-};
-
-struct server_unregister_buffer_command : command_data {
- team_id team;
- media_buffer_id buffer_id;
-};
-
-struct server_get_media_types_request : request_area_data {
-};
-
-struct server_get_media_types_reply : area_reply_data {
- int32 count;
-};
-
-struct server_get_media_items_request : request_area_data {
- char type[B_MEDIA_NAME_LENGTH];
-};
-
-struct server_get_media_items_reply : area_reply_data {
- int32 count;
-};
-
-struct server_get_ref_for_request : request_data {
- char type[B_MEDIA_NAME_LENGTH];
- char item[B_MEDIA_NAME_LENGTH];
-};
-
-struct server_get_ref_for_reply : reply_data {
- xfer_entry_ref ref;
-};
-
-struct server_set_ref_for_request : request_data {
- char type[B_MEDIA_NAME_LENGTH];
- char item[B_MEDIA_NAME_LENGTH];
- xfer_entry_ref ref;
-};
-
-struct server_set_ref_for_reply : reply_data {
-};
-
-struct server_invalidate_item_request : request_data {
- char type[B_MEDIA_NAME_LENGTH];
- char item[B_MEDIA_NAME_LENGTH];
-};
-
-struct server_invalidate_item_reply : reply_data {
-};
-
-struct server_remove_media_item_request : request_data {
- char type[B_MEDIA_NAME_LENGTH];
- char item[B_MEDIA_NAME_LENGTH];
-};
-
-struct server_remove_media_item_reply : reply_data {
-};
-
-struct server_get_item_audio_gain_request : request_data {
- char type[B_MEDIA_NAME_LENGTH];
- char item[B_MEDIA_NAME_LENGTH];
-};
-
-struct server_get_item_audio_gain_reply : reply_data {
- float gain;
-};
-
-struct server_set_item_audio_gain_request : request_data {
- char type[B_MEDIA_NAME_LENGTH];
- char item[B_MEDIA_NAME_LENGTH];
- float gain;
-};
-
-struct server_set_item_audio_gain_reply : reply_data {
-};
-
-struct server_get_decoder_for_format_request : request_data {
- media_format format;
-};
-
-struct server_get_decoder_for_format_reply : reply_data {
- xfer_entry_ref ref;
- // a ref to the decoder
-};
-
-struct server_get_encoder_for_codec_info_request : request_data {
- int32 id;
-};
-
-struct server_get_encoder_for_codec_info_reply : reply_data {
- xfer_entry_ref ref;
- // a ref to the encoder
-};
-
-struct server_get_readers_request : request_data {
-};
-
-struct server_get_readers_reply : reply_data {
- xfer_entry_ref ref[MAX_READERS];
- // a list of refs to the reader
- int32 count;
[... truncated: 27319 lines follow ...]
Other related posts:
- » [haiku-commits] r34622 - in haiku/branches/components/gallium3d: . headers/os/drivers headers/posix/sys headers/private/kernel headers/private/media ... - aljen-mlists
