Changeset 03362fbd in mainline for uspace/srv/hid/compositor/compositor.h

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/srv/hid/compositor/compositor.h (moved) (moved from kernel/arch/amd64/include/debugger.h ) (3 diffs)

uspace/srv/hid/compositor/compositor.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Ondrej Palkovsky
+ * Copyright (c) 2012 Petr Koupy
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup amd64debug
+/** @addtogroup compositor
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef KERN_amd64_DEBUGGER_H_
-#define KERN_amd64_DEBUGGER_H_
+#ifndef COMPOSITOR_COMPOSITOR_H_
+#define COMPOSITOR_COMPOSITOR_H_
 
-#include <typedefs.h>
+typedef native_t desktop_coord_t;
+typedef struct {
+        desktop_coord_t x;
+        desktop_coord_t y;
+} desktop_point_t;
+typedef desktop_point_t desktop_vector_t;
 
-#define BKPOINTS_MAX  4
+typedef struct {
+        desktop_coord_t x;
+        desktop_coord_t y;
+        desktop_coord_t w;
+        desktop_coord_t h;
+} desktop_rect_t;
 
-/* Flags that are passed to breakpoint_add function */
-#define BKPOINT_INSTR       0x1U
-#define BKPOINT_WRITE       0x2U
-#define BKPOINT_READ_WRITE  0x4U
-
-#define BKPOINT_CHECK_ZERO  0x8U
-
-
-extern void debugger_init(void);
-extern int breakpoint_add(const void *, const unsigned int, int);
-extern void breakpoint_del(int);
+/* TODO remove? */
+typedef struct {
+        double x;
+        double y;
+} double_point_t;
+typedef double_point_t double_vector_t;
 
 #endif