All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 7e03f8af authored by Charles Jacobsen's avatar Charles Jacobsen Committed by Vikram Narayanan

Fixed build errors.

parent 89200827
......@@ -39,7 +39,7 @@ obj-y += soc/
obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_XEN) += xen/
#obj-$(CONFIG_LCD) += lcd/
obj-$(CONFIG_LCD_DRIVERS) += lcd/
# regulators early, since some subsystems rely on them to initialize
obj-$(CONFIG_REGULATOR) += regulator/
......
......@@ -2,17 +2,23 @@
# LCD modules configuration
#
config LCD_DRIVERS
bool "Misc drivers for testing LCDs"
default y
---help---
Misc drivers for testing Lightweight cap domains.
config LCD_PING_PONG_RECEIVER
tristate "LCD ping-pong IPC test (receiver)"
depends on LCD_PING_PONG_SENDER
depends on LCD
depends on LCD_DRIVERS
default m
---help---
Receiver for the ping-pong LCD IPC test
config LCD_PING_PONG_SENDER
tristate "LCD ping-pong IPC test (sender)"
depends on LCD
depends on LCD_DRIVERS
default m
---help---
Sender for the ping-pong LCD IPC test
......@@ -42,7 +48,8 @@ config LCD_PING_PONG_SENDER
config LCD_IPC_AUTO
bool "Build automobile ipc test"
depends on LCD_DRIVERS
config LCD_AUTO_CUSTOMER
tristate "LCD automobile ipc test (customer)"
depends on LCD_IPC_AUTO
......
obj-$(LCD_IPC_AUTO) += ipc-auto/
obj-$(CONFIG_LCD_IPC_AUTO) += ipc-auto/
#obj-y += ipc-ping-pong/
......@@ -4,8 +4,8 @@
*
*/
#define CS_ERR(msg...) __cs_err(__FILE__, __LINE__, msg)
static inline void __cs_err(char *file, int lineno, char *fmt, ...)
#define AU_ERR(msg...) __au_err(__FILE__, __LINE__, msg)
static inline void __au_err(char *file, int lineno, char *fmt, ...)
{
va_list args;
pr_err("cs: %s:%d: error: ", file, lineno);
......@@ -13,8 +13,8 @@ static inline void __cs_err(char *file, int lineno, char *fmt, ...)
vprintk(fmt, args);
va_end(args);
}
#define CS_MSG(msg...) __cs_msg(__FILE__, __LINE__, msg)
static inline void __cs_msg(char *file, int lineno, char *fmt, ...)
#define AU_MSG(msg...) __au_msg(__FILE__, __LINE__, msg)
static inline void __au_msg(char *file, int lineno, char *fmt, ...)
{
va_list args;
pr_info("cs: %s:%d: note: ", file, lineno);
......@@ -22,8 +22,8 @@ static inline void __cs_msg(char *file, int lineno, char *fmt, ...)
vprintk(fmt, args);
va_end(args);
}
#define CS_WARN(msg...) __cs_warn(__FILE__, __LINE__, msg)
static inline void __cs_warn(char *file, int lineno, char *fmt, ...)
#define AU_WARN(msg...) __au_warn(__FILE__, __LINE__, msg)
static inline void __au_warn(char *file, int lineno, char *fmt, ...)
{
va_list args;
pr_warn("cs: %s:%d: warning: ", file, lineno);
......
......@@ -17,7 +17,7 @@
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Auto buyer (LCD test)");
#if CONFIG_RUN_IN_LCD
#ifdef CONFIG_RUN_IN_LCD
int customer_init(void)
#else
static int __init customer_init(void)
......@@ -36,7 +36,7 @@ static int __init customer_init(void)
return 0;
}
#if CONFIG_RUN_IN_LCD
#ifdef CONFIG_RUN_IN_LCD
void customer_exit(void)
#else
static void __init customer_exit(void)
......@@ -45,7 +45,7 @@ static void __init customer_exit(void)
AU_MSG("customer exited");
}
#if !CONFIG_RUN_IN_LCD
#ifndef CONFIG_RUN_IN_LCD
module_init(customer_init);
module_exit(customer_exit);
#endif
......@@ -30,14 +30,14 @@ struct automobile * dealer_buy_car(void)
{
struct engine *e;
struct automobile *a;
int ret;
/*
* Make an 8 cylinder engine
*/
e = manufacturer->mk_engine(8);
if (!e || e->cylinders != 8) {
AU_ERR("client: bad engine");
return -1;
return NULL;
}
/*
* Make a 4-door car with e as its engine.
......@@ -45,7 +45,7 @@ struct automobile * dealer_buy_car(void)
a = manufacturer->mk_automobile(e, 4);
if (!a || a->engine != e || a->doors != 4) {
AU_ERR("client: bad auto");
return -1;
return NULL;
}
return a;
}
......@@ -61,7 +61,7 @@ void dealer_return_car(struct automobile *a)
}
EXPORT_SYMBOL(dealer_return_car);
#if CONFIG_RUN_IN_LCD
#ifdef CONFIG_RUN_IN_LCD
int dealer_init(void)
#else
static int __init dealer_init(void)
......@@ -71,7 +71,7 @@ static int __init dealer_init(void)
return 0;
}
#if CONFIG_RUN_IN_LCD
#ifdef CONFIG_RUN_IN_LCD
void dealer_exit(void)
#else
static void __init dealer_exit(void)
......@@ -80,7 +80,7 @@ static void __init dealer_exit(void)
AU_MSG("dealer exited");
}
#if !CONFIG_RUN_IN_LCD
#ifndef CONFIG_RUN_IN_LCD
module_init(dealer_init);
module_exit(dealer_exit);
#endif
......@@ -71,13 +71,13 @@ static void free_automobile(struct automobile *a)
}
static struct manufacturer_interface mi = {
.mk_engine = mk_engine;
.mk_automobile = mk_automobile;
.free_engine = free_engine;
.free_automobile = free_automobile;
.mk_engine = mk_engine,
.mk_automobile = mk_automobile,
.free_engine = free_engine,
.free_automobile = free_automobile,
};
#if CONFIG_RUN_IN_LCD
#ifdef CONFIG_RUN_IN_LCD
int manufacturer_init(void)
#else
static int __init manufacturer_init(void)
......@@ -93,7 +93,7 @@ static int __init manufacturer_init(void)
return 0;
}
#if CONFIG_RUN_IN_LCD
#ifdef CONFIG_RUN_IN_LCD
void manufacturer_exit(void)
#else
static void __init manufacturer_exit(void)
......@@ -102,7 +102,7 @@ static void __init manufacturer_exit(void)
AU_MSG("manufacturer exited");
}
#if !CONFIG_RUN_IN_LCD
#ifndef CONFIG_RUN_IN_LCD
module_init(manufacturer_init);
module_exit(manufacturer_exit);
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment