IDL-like generated code (checkpoint)

drivers/lcd/ipc-client-server/client-idl.c

+
+#include "server-idl.h"
+
+struct server_interface {
+	int (*test_func1) (unsigned long a, long b, char c);
+	int (*test_func2) (unsigned long a);
+};
+
+
+/* Caller stubs */
+int register_server(struct server_interface *server) {
+
+
+}
+
+

drivers/lcd/ipc-client-server/client-idl.h

+#ifndef _LCD_IPC_CLIENT_SERVER_CLIENT_H_
+#define _LCD_IPC_CLIENT_SERVER_CLIENT_H_
+
+enum client_interface {
+	client_interface_register_server,
+};
+
+int register_server(capability_t client, capability _t server);
+
+#endif

drivers/lcd/ipc-client-server/client-lcd-glue.c

+struct sync_ipc *rvp; 
+
+int lcd_client_server_init_client(void) {
+	int ret; 
+	capability_t server;
+	struct cnode *cnode;
+	
+	ret = lcd_enter();
+	if (ret) {
+		printk(KERN_ERR "Failed to enter LCD environment\n");
+		return ret;
+	};
+
+	ret = lcd_api_connect(lcd_get_api());
+	if (ret) {
+		printk(KERN_ERR "Failed to connect to LCD API\n");
+		return ret;
+	};
+
+	api_cap = current->utcb->boot_info.boot_caps[LCD_BOOT_API_CAP];
+	reply_cap = current->utcb->boot_info.boot_caps[LCD_BOOT_REPLY_CAP];
+
+
+        ret = lcd_alloc_cap(&current->cap_cache, &server); 
+	if(ret) {
+		printk(KERN_ERR "Failed to allocate free capability\n");
+		return -ENOSPC;
+	};
+
+	ret = lcd_api_create_sync_endpoint(api_cap, reply_cap, server); 
+	if(ret) {
+		printk(KERN_ERR "Failed to allocate free capability\n");
+		return -ENOSPC;
+	};
+
+	current->utcb->boot_info.boot_caps[LCD_BOOT_FREE_CAP0] = server;
+
+	cnode = lcd_cnode_lookup(&current->cspace, server);
+	if(cnode == NULL || cnode->type != LCD_TYPE_SYNC_EP) {
+		printk(KERN_ERR "Failed to create capability\n");
+		return -ENOMEM;
+	};
+
+	rvp = cnode->object; 
+	lcd_cnode_release(cnode);
+
+	return 0;
+};
+
+int lcd_client_server_init_server(void) 
+{
+	int ret; 
+	capability_t client;
+
+	ret = lcd_enter();
+	if (ret) {
+		printk(KERN_ERR "Failed to enter LCD environment\n");
+		return ret;
+	};
+
+	ret = lcd_api_connect(lcd_get_api());
+	if (ret) {
+		printk(KERN_ERR "Failed to connect to LCD API\n");
+		return ret;
+	};
+
+        ret = lcd_alloc_cap(&current->cap_cache, &client); 
+	if(ret) {
+		printk(KERN_ERR "Failed to allocate free capability\n");
+		return -ENOSPC;
+	};
+
+	lcd_cap_insert_object(&current->cspace, client, rvp, LCD_TYPE_SYNC_EP);
+
+	current->utcb->boot_caps[LCD_BOOT_FREE_CAP0] = client; 
+	return 0;
+};
+EXPORT_SYMBOL(lcd_client_server_init_server); 
+
+int module_execution_loop(void) {
+
+	int ret; 
+	capability_t api_cap = current->utcb->boot_info.boot_caps[LCD_BOOT_API_CAP];
+	capability_t reply_cap = current->utcb->boot_info.boot_caps[LCD_BOOT_REPLY_CAP];
+	capability_t server = current->utcb->boot_info.boot_caps[LCD_BOOT_FREE_CAP0];
+
+	capability_t server_interface;
+	capability_t server_reply; 
+	
+	struct message_info *msg = &current->utcb->msg_info;
+
+
+        ret = lcd_alloc_cap(&current->cap_cache, &server_interface); 
+	if(ret) {
+		printk(KERN_ERR "Failed to allocate free capability\n");
+		return -ENOSPC;
+	};
+
+	msg->cap_regs[0] = server_interface;
+	msg->valid_cap_regs = 1;
+
+	ret = ipc_recv(server, msg);
+	if (ret) {
+		printk(KERN_ERR "client failed to receive from the server:%d\n", ret);
+		return ret;
+	};
+
+
+	call = msg->regs[0];
+
+	switch (call) {
+		case LCD_CREATE_SYNC_ENDPOINT: 
+			ret = lcd_api_create_sync_endpoint(lcd_api, reply_cap); 
+			break; 
+		default: 
+			printk(KERN_ERR "lcd_api: invalid call number:%d\n", call);
+			msg->valid_regs = 0; 
+			msg->valid_cap_regs = 0; 
+			ipc_reply(reply_cap, msg); 
+			lcd_cap_drop(&current->cspace, reply_cap);
+		};
+
+
+	return 0;
+};
+
+int lcd_thread(void *p) {
+	int ret;
+
+	ret = lcd_client_server_init_client();
+	if (ret) {
+		printk(KERN_ERR "client failed to initialize client-server environtment\n");
+		return -EINVAL;
+	}
+
+	return lcd_execution_loop();
+};
+
+int lcd_thread_init(void) {
+
+	struct task_struct *t;
+
+	t = kthread_create(lcd_thread, NULL, "cs-client");
+	if (!t) {
+		printk(KERN_ERR "Failed to create module thread\n");
+		return -EINVAL;
+	};
+
+	wake_up_process(t);
+	return 0;
+}
+

drivers/lcd/ipc-client-server/client.c

@@ -22,164 +22,36 @@
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("LCD client-server test client");
 
-struct sync_ipc *rvp; 
 
-int lcd_client_server_init_client(void) {
-	int ret; 
-	capability_t server;
-	struct cnode *cnode;
-	
-	ret = lcd_enter();
-	if (ret) {
-		printk(KERN_ERR "Failed to enter LCD environment\n");
-		return ret;
-	};
+struct server_interface *server; 
 
-	ret = lcd_api_connect(lcd_get_api());
-	if (ret) {
-		printk(KERN_ERR "Failed to connect to LCD API\n");
-		return ret;
-	};
-
-	api_cap = current->utcb->boot_info.boot_caps[LCD_BOOT_API_CAP];
-	reply_cap = current->utcb->boot_info.boot_caps[LCD_BOOT_REPLY_CAP];
-
-
-        ret = lcd_alloc_cap(&current->cap_cache, &server); 
-	if(ret) {
-		printk(KERN_ERR "Failed to allocate free capability\n");
-		return -ENOSPC;
-	};
-
-	ret = lcd_api_create_sync_endpoint(api_cap, reply_cap, server); 
-	if(ret) {
-		printk(KERN_ERR "Failed to allocate free capability\n");
-		return -ENOSPC;
-	};
-
-	current->utcb->boot_info.boot_caps[LCD_BOOT_FREE_CAP0] = server;
-
-	cnode = lcd_cnode_lookup(&current->cspace, server);
-	if(cnode == NULL || cnode->type != LCD_TYPE_SYNC_EP) {
-		printk(KERN_ERR "Failed to create capability\n");
-		return -ENOMEM;
-	};
-
-	rvp = cnode->object; 
-	lcd_cnode_release(cnode);
-
-	return 0;
-};
-
-int lcd_client_server_init_server(void) 
-{
-	int ret; 
-	capability_t client;
-
-	ret = lcd_enter();
-	if (ret) {
-		printk(KERN_ERR "Failed to enter LCD environment\n");
-		return ret;
-	};
-
-	ret = lcd_api_connect(lcd_get_api());
-	if (ret) {
-		printk(KERN_ERR "Failed to connect to LCD API\n");
-		return ret;
-	};
-
-        ret = lcd_alloc_cap(&current->cap_cache, &client); 
-	if(ret) {
-		printk(KERN_ERR "Failed to allocate free capability\n");
-		return -ENOSPC;
-	};
-
-	lcd_cap_insert_object(&current->cspace, client, rvp, LCD_TYPE_SYNC_EP);
-
-	current->utcb->boot_caps[LCD_BOOT_FREE_CAP0] = client; 
-	return 0;
+int register_server(struct server_interface *s) {
+	server = s;
 };
-EXPORT_SYMBOL(lcd_client_server_init_server); 
+EXPORT_SYMBOL(register_server);
 
-int module_execution_loop(void) {
-
-	int ret; 
-	capability_t api_cap = current->utcb->boot_info.boot_caps[LCD_BOOT_API_CAP];
-	capability_t reply_cap = current->utcb->boot_info.boot_caps[LCD_BOOT_REPLY_CAP];
-	capability_t server = current->utcb->boot_info.boot_caps[LCD_BOOT_FREE_CAP0];
-	capability_t server_interface;
-	capability_t server_reply; 
-	struct message_info *msg = &current->utcb->msg_info;
-
-
-        ret = lcd_alloc_cap(&current->cap_cache, &server_interface); 
-	if(ret) {
-		printk(KERN_ERR "Failed to allocate free capability\n");
-		return -ENOSPC;
-	};
-
-	msg->cap_regs[0] = server_interface;
-	msg->valid_cap_regs = 1;
-
-	ret = ipc_recv(server, msg);
-	if (ret) {
-		printk(KERN_ERR "client failed to receive from the server:%d\n", ret);
-		return ret;
-	};
-
-	ret = lcd_api_alloc_reply_cap(api_cap, reply_cap, &server_reply); 
-	if(ret) {
-		printk(KERN_ERR "Failed to allocate free capability\n");
-		return -ENOSPC;
-	};
-
-	msg->regs[0] = 0 /* FUNC_TYPE_1*/;
-	msg->regs[1] = 1;
-	msg->regs[2] = 2;
-	msg->regs[3] = 3;
-	msg->valid_regs = 4;
-
-	msg->cap_regs[0] = server_reply;
-	msg->valid_cap_regs = 1;
-
-	ret = ipc_call(server_interface, msg);
-	if (ret) {
-		printk(KERN_ERR "client failed to ivoke server:%d\n", ret);
-		return ret;
-	};
-
-	return 0;
+int server_test_1(struct server_interface *server) {
+	ret = server->test_func1(1, 2, 3);
+	printk(KERN_INFO "Server test1 returns: %d\n");
+	return ret; 	
 };
 
-int module_thread(void *p) {
-	int ret;
-
-	ret = lcd_client_server_init_client();
-	if (ret) {
-		printk(KERN_ERR "client failed to initialize client-server environtment\n");
-		return -EINVAL;
-	}
-
-	return module_execution_loop();
+int server_test_2(struct server_interface *server) {
+	ret = server->test_func2(4);
+	printk(KERN_INFO "Server test1 returns: %d\n");
+	return ret; 	
 };
 
-int module_thread_init(void) {
-
-	struct task_struct *t;
-
-	t = kthread_create(module_thread, NULL, "cs-client");
-	if (!t) {
-		printk(KERN_ERR "Failed to create module thread\n");
-		return -EINVAL;
-	};
-
-	wake_up_process(t);
-	return 0;
+int client_main(void) {
+	server_test_1(server);
+	server_test_2(server);
 }
 
+
 static int __init client_init(void)
 {
-	return module_thread_init();
+	lcd_thread_init();
+	return;
 }
 
 static void __exit client_exit(void)

drivers/lcd/ipc-client-server/server-idl.c

+
+#include "server-idl.h"
+
+/* Caller stubs */
+int test_func1(unsigned long a, long b, char c) {
+
+	msg->regs[0] = ;
+	msg->regs[1] = 1;
+	msg->regs[2] = 2;
+	msg->regs[3] = 3;
+	msg->valid_regs = 4;
+
+	msg->cap_regs[0] = server_reply;
+	msg->valid_cap_regs = 1;
+
+	ret = ipc_call(server_interface, msg);
+	if (ret) {
+		printk(KERN_ERR "client failed to ivoke server:%d\n", ret);
+		return ret;
+	};
+
+
+}
+
+int test_func2(unsigned long a) {
+
+}
+
+/* Callee stubs */
+int test_func1_srv(unsigned long a, long b, char c) {
+
+}
+
+int test_func2_srv(unsigned long a) {
+
+}
+
+

drivers/lcd/ipc-client-server/server-idl.h

+#ifndef _LCD_IPC_CLIENT_SERVER_SERVER_H_
+#define _LCD_IPC_CLIENT_SERVER_SERVER_H_
+
+enum server_interface {
+	server_interface_test_func1,
+	server_interface_test_func2,
+}
+
+/* Caller stubs */
+int test_func1(unsigned long a, long b, char c);
+int test_func2(unsigned long a);
+
+/* Callee stubs */
+int test_func1_srv(unsigned long a, long b, char c);
+int test_func2_srv(unsigned long a);
+
+#endif