Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/247/?format=api
{ "id": 247, "url": "http://patchwork.ozlabs.org/api/patches/247/?format=api", "web_url": "http://patchwork.ozlabs.org/project/cbe-oss-dev/patch/48C972E9.1000507@am.sony.com/", "project": { "id": 1, "url": "http://patchwork.ozlabs.org/api/projects/1/?format=api", "name": "Cell Broadband Engine development", "link_name": "cbe-oss-dev", "list_id": "cbe-oss-dev.ozlabs.org", "list_email": "cbe-oss-dev@ozlabs.org", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<48C972E9.1000507@am.sony.com>", "list_archive_url": null, "date": "2008-09-11T19:35:05", "name": "MARS: Header files cleanup", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "f2fda54246eb6d8a1202e0898eac7dea0461d433", "submitter": { "id": 127, "url": "http://patchwork.ozlabs.org/api/people/127/?format=api", "name": "Yuji Mano", "email": "yuji.mano@am.sony.com" }, "delegate": { "id": 26, "url": "http://patchwork.ozlabs.org/api/users/26/?format=api", "username": "ymano", "first_name": "Yuji", "last_name": "Mano", "email": "yuji.mano@am.sony.com" }, "mbox": "http://patchwork.ozlabs.org/project/cbe-oss-dev/patch/48C972E9.1000507@am.sony.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/247/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/247/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<cbe-oss-dev-bounces+patchwork=ozlabs.org@ozlabs.org>", "X-Original-To": [ "patchwork@ozlabs.org", "cbe-oss-dev@ozlabs.org" ], "Delivered-To": [ "patchwork@ozlabs.org", "cbe-oss-dev@ozlabs.org" ], "Received": [ "from ozlabs.org (localhost [127.0.0.1])\n\tby ozlabs.org (Postfix) with ESMTP id C9D95DEABD\n\tfor <patchwork@ozlabs.org>; Fri, 12 Sep 2008 06:39:40 +1000 (EST)", "from IE1EHSOBE006.bigfish.com (outbound-dub.frontbridge.com\n\t[213.199.154.16]) by ozlabs.org (Postfix) with ESMTP id 2D3BFDE337\n\tfor <cbe-oss-dev@ozlabs.org>; Fri, 12 Sep 2008 06:37:23 +1000 (EST)", "from mail122-dub-R.bigfish.com (10.5.252.3) by\n\tIE1EHSOBE006.bigfish.com (10.5.252.26) with Microsoft SMTP Server id\n\t8.1.291.1; Thu, 11 Sep 2008 20:37:17 +0000", "from mail122-dub (localhost.localdomain [127.0.0.1])\tby\n\tmail122-dub-R.bigfish.com (Postfix) with ESMTP id 5CEA41648182\tfor\n\t<cbe-oss-dev@ozlabs.org>; Thu, 11 Sep 2008 20:37:17 +0000 (UTC)", "by mail122-dub (MessageSwitch) id 1221165432577971_8367;\n\tThu, 11 Sep 2008 20:37:12 +0000 (UCT)", "from mail8.fw-bc.sony.com (mail8.fw-bc.sony.com [160.33.98.75])\tby\n\tmail122-dub.bigfish.com (Postfix) with ESMTP id B6E5E1578051\tfor\n\t<cbe-oss-dev@ozlabs.org>; Thu, 11 Sep 2008 20:37:11 +0000 (UTC)", "from mail3.sjc.in.sel.sony.com (mail3.sjc.in.sel.sony.com\n\t[43.134.1.211])\tby mail8.fw-bc.sony.com (8.14.2/8.14.2) with ESMTP id\n\tm8BKbA3r025094\tfor <cbe-oss-dev@ozlabs.org>;\n\tThu, 11 Sep 2008 20:37:11 GMT", "from USSDIXIM02.am.sony.com (ussdixim02.am.sony.com\n\t[43.130.140.34])\n\tby mail3.sjc.in.sel.sony.com (8.12.11/8.12.11) with ESMTP id\n\tm8BKbAl0021770\n\tfor <cbe-oss-dev@ozlabs.org>; Thu, 11 Sep 2008 20:37:10 GMT", "from ussdixms03.am.sony.com ([43.130.140.23]) by\n\tUSSDIXIM02.am.sony.com with Microsoft SMTPSVC(5.0.2195.6713);\n\tThu, 11 Sep 2008 13:37:10 -0700", "from [43.135.148.175] ([43.135.148.175]) by ussdixms03.am.sony.com\n\twith Microsoft SMTPSVC(5.0.2195.6713);\n\tThu, 11 Sep 2008 13:37:09 -0700" ], "X-BigFish": "VS11(zzzz10c0j10d3izz1497iz2dh6bh68o)", "X-Spam-TCS-SCL": "7:0", "Message-ID": "<48C972E9.1000507@am.sony.com>", "Date": "Thu, 11 Sep 2008 12:35:05 -0700", "From": "Yuji Mano <yuji.mano@am.sony.com>", "User-Agent": "Thunderbird 2.0.0.5 (X11/20070719)", "MIME-Version": "1.0", "To": "CBE Development <cbe-oss-dev@ozlabs.org>", "X-Enigmail-Version": "0.95.7", "X-OriginalArrivalTime": "11 Sep 2008 20:37:09.0835 (UTC)\n\tFILETIME=[29D131B0:01C9144E]", "X-SEL-encryption-scan": "scanned", "Subject": "[Cbe-oss-dev] [PATCH 09/11]MARS: Header files cleanup", "X-BeenThere": "cbe-oss-dev@ozlabs.org", "X-Mailman-Version": "2.1.11", "Precedence": "list", "List-Id": "Discussion about Open Source Software for the Cell Broadband Engine\n\t<cbe-oss-dev.ozlabs.org>", "List-Unsubscribe": "<https://ozlabs.org/mailman/options/cbe-oss-dev>,\n\t<mailto:cbe-oss-dev-request@ozlabs.org?subject=unsubscribe>", "List-Archive": "<http://ozlabs.org/pipermail/cbe-oss-dev>", "List-Post": "<mailto:cbe-oss-dev@ozlabs.org>", "List-Help": "<mailto:cbe-oss-dev-request@ozlabs.org?subject=help>", "List-Subscribe": "<https://ozlabs.org/mailman/listinfo/cbe-oss-dev>,\n\t<mailto:cbe-oss-dev-request@ozlabs.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Sender": "cbe-oss-dev-bounces+patchwork=ozlabs.org@ozlabs.org", "Errors-To": "cbe-oss-dev-bounces+patchwork=ozlabs.org@ozlabs.org" }, "content": "From: Geoff Levand <geoffrey.levand@am.sony.com>\n\nCleanup header files:\n o Adjust scope of C linkage specifiers.\n o Remove unneeded C linkage specifiers.\n o Use system include path for installed headers.\n\nSigned-off-by: Geoff Levand <geoffrey.levand@am.sony.com>\nAcked-by: Kazunori Asayama <asayama@sm.sony.co.jp>", "diff": "--- a/include/common/mars/mars_debug.h\n+++ b/include/common/mars/mars_debug.h\n@@ -42,10 +42,6 @@\n * \\brief MARS Debug Macros\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdio.h>\n \n #define MARS_DEBUG_ENABLE_PRINT\t\t0\n@@ -296,8 +292,4 @@ extern \"C\" {\n #define MARS_TIMER_STOP(id)\n #endif\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_error.h\n+++ b/include/common/mars/mars_error.h\n@@ -43,10 +43,6 @@\n * \\brief MARS Error Values\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n /**\n * \\brief MARS error values\n *\n@@ -68,8 +64,4 @@ enum {\n \tMARS_ERROR_BUSY\t\t/**< operation returned due to being busy */\n };\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_kernel_types.h\n+++ b/include/common/mars/mars_kernel_types.h\n@@ -38,10 +38,6 @@\n #ifndef MARS_KERNEL_TYPES_H\n #define MARS_KERNEL_TYPES_H\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n #define MARS_KERNEL_PARAMS_ALIGN\t128\n@@ -53,8 +49,4 @@ struct mars_kernel_params {\n \tuint64_t workload_queue_ea;\n } __attribute__((aligned(MARS_KERNEL_PARAMS_ALIGN)));\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_mutex_types.h\n+++ b/include/common/mars/mars_mutex_types.h\n@@ -44,10 +44,6 @@\n * \\brief MARS Mutex Types\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n /**\n@@ -95,8 +91,4 @@ struct mars_mutex {\n \tuint8_t pad[124];\n } __attribute__((aligned(MARS_MUTEX_ALIGN)));\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_task_barrier_types.h\n+++ b/include/common/mars/mars_task_barrier_types.h\n@@ -44,10 +44,6 @@\n * \\brief MARS Task Barrier Types\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n /**\n@@ -97,8 +93,4 @@ struct mars_task_barrier {\n \tuint64_t mars_context_ea;\n } __attribute__((aligned(MARS_TASK_BARRIER_ALIGN)));\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_task_event_flag_types.h\n+++ b/include/common/mars/mars_task_event_flag_types.h\n@@ -44,10 +44,6 @@\n * \\brief MARS Task Event Flag Types\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n /**\n@@ -139,8 +135,4 @@ struct mars_task_event_flag {\n \tuint64_t mars_context_ea;\n } __attribute__((aligned(MARS_TASK_EVENT_FLAG_ALIGN)));\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_task_queue_types.h\n+++ b/include/common/mars/mars_task_queue_types.h\n@@ -44,10 +44,6 @@\n * \\brief MARS Task Queue Types\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n /**\n@@ -156,8 +152,4 @@ struct mars_task_queue {\n \tuint64_t mars_context_ea;\n } __attribute__((aligned(MARS_TASK_QUEUE_ALIGN)));\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_task_semaphore_types.h\n+++ b/include/common/mars/mars_task_semaphore_types.h\n@@ -44,10 +44,6 @@\n * \\brief MARS Task Semaphore Types\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n /**\n@@ -93,8 +89,4 @@ struct mars_task_semaphore {\n \tuint64_t mars_context_ea;\n } __attribute__((aligned(MARS_TASK_SEMAPHORE_ALIGN)));\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_task_types.h\n+++ b/include/common/mars/mars_task_types.h\n@@ -44,10 +44,6 @@\n * \\brief MARS Task Types\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n /**\n@@ -166,8 +162,4 @@ struct mars_task_context {\n \tuint8_t pad[20];\t\t/* padding */\n } __attribute__((aligned(MARS_TASK_CONTEXT_ALIGN)));\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/common/mars/mars_workload_types.h\n+++ b/include/common/mars/mars_workload_types.h\n@@ -38,10 +38,6 @@\n #ifndef MARS_WORKLOAD_TYPES_H\n #define MARS_WORKLOAD_TYPES_H\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n #define MARS_WORKLOAD_ID_NONE\t\t\t0xffff\t/* workload id none */\n@@ -147,8 +143,4 @@ struct mars_workload_queue {\n \tstruct mars_workload_context context[MARS_WORKLOAD_MAX];\n } __attribute__((aligned(MARS_WORKLOAD_QUEUE_ALIGN)));\n \n-#if defined(__cplusplus)\n-}\n-#endif\n-\n #endif\n--- a/include/host/mars/mars.h\n+++ b/include/host/mars/mars.h\n@@ -44,9 +44,9 @@\n * \\brief [host] MARS API\n */\n \n-#include \"mars/mars_context.h\"\n-#include \"mars/mars_error.h\"\n-#include \"mars/mars_mutex.h\"\n-#include \"mars/mars_task.h\"\n+#include <mars/mars_context.h>\n+#include <mars/mars_error.h>\n+#include <mars/mars_mutex.h>\n+#include <mars/mars_task.h>\n \n #endif\n--- a/include/host/mars/mars_mutex.h\n+++ b/include/host/mars/mars_mutex.h\n@@ -44,12 +44,12 @@\n * \\brief [host] MARS Mutex API\n */\n \n+#include <mars/mars_mutex_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_mutex_types.h\"\n-\n /**\n * \\ingroup group_mars_mutex\n * \\brief [host] Initializes a mutex.\n--- a/include/host/mars/mars_task.h\n+++ b/include/host/mars/mars_task.h\n@@ -44,18 +44,18 @@\n * \\brief [host] MARS Task API\n */\n \n+#include <mars/mars_task_barrier.h>\n+#include <mars/mars_task_event_flag.h>\n+#include <mars/mars_task_queue.h>\n+#include <mars/mars_task_semaphore.h>\n+#include <mars/mars_task_signal.h>\n+#include <mars/mars_task_types.h>\n+\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_barrier.h\"\n-#include \"mars/mars_task_event_flag.h\"\n-#include \"mars/mars_task_queue.h\"\n-#include \"mars/mars_task_semaphore.h\"\n-#include \"mars/mars_task_signal.h\"\n-#include \"mars/mars_task_types.h\"\n-\n-\n /**\n * \\ingroup group_mars_task\n * \\brief [host] Initializes a MARS task.\n--- a/include/host/mars/mars_task_barrier.h\n+++ b/include/host/mars/mars_task_barrier.h\n@@ -44,14 +44,14 @@\n * \\brief [host] MARS Task Barrier API\n */\n \n+#include <mars/mars_task_barrier_types.h>\n+\n+struct mars_context;\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_barrier_types.h\"\n-\n-struct mars_context;\n-\n /**\n * \\ingroup group_mars_task_barrier\n * \\brief [host] Initializes a task barrier.\n--- a/include/host/mars/mars_task_event_flag.h\n+++ b/include/host/mars/mars_task_event_flag.h\n@@ -44,14 +44,14 @@\n * \\brief [host] MARS Task Event Flag API\n */\n \n+#include <mars/mars_task_event_flag_types.h>\n+\n+struct mars_context;\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_event_flag_types.h\"\n-\n-struct mars_context;\n-\n /**\n * \\ingroup group_mars_task_event_flag\n * \\brief [host] Initializes a task event flag.\n--- a/include/host/mars/mars_task_queue.h\n+++ b/include/host/mars/mars_task_queue.h\n@@ -44,14 +44,14 @@\n * \\brief [host] MARS Task Queue Flag API\n */\n \n+#include <mars/mars_task_queue_types.h>\n+\n+struct mars_context;\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_queue_types.h\"\n-\n-struct mars_context;\n-\n /**\n * \\ingroup group_mars_task_queue\n * \\brief [host] Initializes a task queue.\n--- a/include/host/mars/mars_task_semaphore.h\n+++ b/include/host/mars/mars_task_semaphore.h\n@@ -44,14 +44,14 @@\n * \\brief [host] MARS Task Semaphore API\n */\n \n+#include <mars/mars_task_semaphore_types.h>\n+\n+struct mars_context;\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_semaphore_types.h\"\n-\n-struct mars_context;\n-\n /**\n * \\ingroup group_mars_task_semaphore\n * \\brief [host] Initializes a task semaphore.\n--- a/include/host/mars/mars_task_signal.h\n+++ b/include/host/mars/mars_task_signal.h\n@@ -44,12 +44,12 @@\n * \\brief [host] MARS Task Signal API\n */\n \n+#include <mars/mars_task_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_types.h\"\n-\n /**\n * \\ingroup group_mars_task_signal\n * \\brief [host] Sends a signal to the specified task.\n--- a/include/host/mars/mars_timer.h\n+++ b/include/host/mars/mars_timer.h\n@@ -43,10 +43,6 @@\n * \\brief [host] MARS Timer API\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <sys/time.h>\n #include \"mars/mars_debug.h\"\n \n@@ -69,6 +65,10 @@ struct mars_timer {\n \tunsigned long long end;\t\t/**< internal - stop time */\n };\n \n+#if defined(__cplusplus)\n+extern \"C\" {\n+#endif\n+\n /*\n * \\ingroup group_mars_timer\n * \\brief Starts the timer\n--- a/include/host/mars/mars_workload_queue.h\n+++ b/include/host/mars/mars_workload_queue.h\n@@ -38,12 +38,12 @@\n #ifndef MARS_WORKLOAD_QUEUE_H\n #define MARS_WORKLOAD_QUEUE_H\n \n+#include \"mars/mars_workload_types.h\"\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_workload_types.h\"\n-\n int workload_queue_initialize(struct mars_workload_queue *queue);\n int workload_queue_finalize(struct mars_workload_queue *queue);\n int workload_queue_exit(struct mars_workload_queue *queue);\n--- a/include/mpu/mars/mars.h\n+++ b/include/mpu/mars/mars.h\n@@ -44,16 +44,8 @@\n * \\brief [MPU] MARS API\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n-#include \"mars/mars_error.h\"\n-#include \"mars/mars_mutex.h\"\n-#include \"mars/mars_task.h\"\n-\n-#if defined(__cplusplus)\n-}\n-#endif\n+#include <mars/mars_error.h>\n+#include <mars/mars_mutex.h>\n+#include <mars/mars_task.h>\n \n #endif\n--- a/include/mpu/mars/mars_dma.h\n+++ b/include/mpu/mars/mars_dma.h\n@@ -44,10 +44,6 @@\n * \\brief [MPU] MARS DMA API\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <spu_mfcio.h>\n #include \"mars/mars_debug.h\"\n \n@@ -57,6 +53,10 @@ extern \"C\" {\n #define MARS_DMA_SIZE_MASK\t0xf\t/* dma 16 byte size mask */\n #define MARS_DMA_SIZE_MAX\t16384\t/* dma single tranfer size max 16KB */\n \n+#if defined(__cplusplus)\n+extern \"C\" {\n+#endif\n+\n /* size max 16 KB */\n static inline unsigned int _list_init(mfc_list_element_t *list,\n \t\t\t\tunsigned int size, unsigned int eal)\n--- a/include/mpu/mars/mars_kernel.h\n+++ b/include/mpu/mars/mars_kernel.h\n@@ -38,10 +38,6 @@\n #ifndef MARS_KERNEL_H\n #define MARS_KERNEL_H\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <stdint.h>\n \n #include \"mars/mars_dma.h\"\n@@ -78,6 +74,11 @@ struct mars_kernel_syscalls {\n };\n \n typedef void (*mars_entry)(void *workload_args, void *kernel_syscalls);\n+\n+#if defined(__cplusplus)\n+extern \"C\" {\n+#endif\n+\n void mars_reentry(void);\n \n /* kernel scheduler function */\n--- a/include/mpu/mars/mars_mutex.h\n+++ b/include/mpu/mars/mars_mutex.h\n@@ -44,12 +44,12 @@\n * \\brief [MPU] MARS Mutex API\n */\n \n+#include <mars/mars_mutex_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_mutex_types.h\"\n-\n /**\n * \\ingroup group_mars_mutex\n * \\brief [MPU] Initializes a mutex.\n--- a/include/mpu/mars/mars_syscalls.h\n+++ b/include/mpu/mars/mars_syscalls.h\n@@ -38,12 +38,12 @@\n #ifndef MARS_SYSCALLS_H\n #define MARS_SYSCALLS_H\n \n+#include <stdint.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include <stdint.h>\n-\n uint64_t mars_get_mars_context_ea(void);\n uint32_t mars_get_kernel_id(void);\n uint16_t mars_get_workload_id(void);\n--- a/include/mpu/mars/mars_task.h\n+++ b/include/mpu/mars/mars_task.h\n@@ -44,17 +44,17 @@\n * \\brief [MPU] MARS Task API\n */\n \n+#include <mars/mars_task_barrier.h>\n+#include <mars/mars_task_event_flag.h>\n+#include <mars/mars_task_queue.h>\n+#include <mars/mars_task_semaphore.h>\n+#include <mars/mars_task_signal.h>\n+#include <mars/mars_task_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_barrier.h\"\n-#include \"mars/mars_task_event_flag.h\"\n-#include \"mars/mars_task_queue.h\"\n-#include \"mars/mars_task_semaphore.h\"\n-#include \"mars/mars_task_signal.h\"\n-#include \"mars/mars_task_types.h\"\n-\n /**\n * \\ingroup group_mars_task\n * \\brief [MPU] Entry point for task.\n--- a/include/mpu/mars/mars_task_barrier.h\n+++ b/include/mpu/mars/mars_task_barrier.h\n@@ -44,12 +44,12 @@\n * \\brief [MPU] MARS Task Barrier API\n */\n \n+#include <mars/mars_task_barrier_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_barrier_types.h\"\n-\n /**\n * \\ingroup group_mars_task_barrier\n * \\brief [MPU] Initializes a task barrier.\n--- a/include/mpu/mars/mars_task_event_flag.h\n+++ b/include/mpu/mars/mars_task_event_flag.h\n@@ -44,12 +44,12 @@\n * \\brief [MPU] MARS Task Event Flag API\n */\n \n+#include <mars/mars_task_event_flag_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_event_flag_types.h\"\n-\n /**\n * \\ingroup group_mars_task_event_flag\n * \\brief [MPU] Initializes a task event flag.\n--- a/include/mpu/mars/mars_task_queue.h\n+++ b/include/mpu/mars/mars_task_queue.h\n@@ -44,12 +44,12 @@\n * \\brief [MPU] MARS Task Queue API\n */\n \n+#include <mars/mars_task_queue_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_queue_types.h\"\n-\n /**\n * \\ingroup group_mars_task_queue\n * \\brief [MPU] Initializes a task queue.\n--- a/include/mpu/mars/mars_task_semaphore.h\n+++ b/include/mpu/mars/mars_task_semaphore.h\n@@ -44,12 +44,12 @@\n * \\brief [MPU] MARS Task Semaphore API\n */\n \n+#include <mars/mars_task_semaphore_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_semaphore_types.h\"\n-\n /**\n * \\ingroup group_mars_task_semaphore\n * \\brief [MPU] Initializes a task semaphore.\n--- a/include/mpu/mars/mars_task_signal.h\n+++ b/include/mpu/mars/mars_task_signal.h\n@@ -44,12 +44,12 @@\n * \\brief [MPU] MARS Task Signal API\n */\n \n+#include <mars/mars_task_types.h>\n+\n #if defined(__cplusplus)\n extern \"C\" {\n #endif\n \n-#include \"mars/mars_task_types.h\"\n-\n /**\n * \\ingroup group_mars_task_signal\n * \\brief [MPU] Sends a signal to the specified task.\n--- a/include/mpu/mars/mars_timer.h\n+++ b/include/mpu/mars/mars_timer.h\n@@ -43,15 +43,9 @@\n * \\brief MARS Timer API [MPU]\n */\n \n-#if defined(__cplusplus)\n-extern \"C\" {\n-#endif\n-\n #include <spu_intrinsics.h>\n #include \"mars/mars_debug.h\"\n \n-static const unsigned int mars_timebase = 79800000;\n-\n /*\n * \\ingroup group_mars_timer\n * \\brief MARS timer structure\n@@ -71,6 +65,12 @@ struct mars_timer {\n \tunsigned int end;\t/**< internal - stop time */\n };\n \n+#if defined(__cplusplus)\n+extern \"C\" {\n+#endif\n+\n+static const unsigned int mars_timebase = 79800000;\n+\n /*\n * \\ingroup group_mars_timer\n * \\brief Starts the timer\n@@ -116,4 +116,8 @@ static inline void mars_timer_stop(struc\n \ttimer->us = timer->s * 1.0e6;\n }\n \n+#if defined(__cplusplus)\n+}\n+#endif\n+\n #endif\n", "prefixes": [] }