From 1aad172900a22f403baf366fb7db7ee4560c7544 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Wed, 2 Sep 2015 04:49:18 +0200 Subject: [PATCH] Make more services use stateful live update Change-Id: If2e5b8e56fef633e471ec1cbb6e08ce3496ea755 --- minix/drivers/bus/pci/main.c | 1 - minix/drivers/printer/printer/printer.c | 1 - minix/drivers/storage/fbd/fbd.c | 1 - minix/drivers/storage/filter/main.c | 1 - minix/drivers/storage/memory/memory.c | 1 - minix/drivers/system/log/log.c | 1 - minix/drivers/system/random/main.c | 1 - minix/include/minix/audio_fw.h | 2 +- minix/lib/libaudiodriver/audio_fw.c | 1 - minix/lib/libaudiodriver/liveupdate.c | 2 +- 10 files changed, 2 insertions(+), 10 deletions(-) diff --git a/minix/drivers/bus/pci/main.c b/minix/drivers/bus/pci/main.c index 7c6dfe101..a21080a62 100644 --- a/minix/drivers/bus/pci/main.c +++ b/minix/drivers/bus/pci/main.c @@ -715,7 +715,6 @@ sef_local_startup(void) * Register init callbacks. Use the same function for all event types */ sef_setcb_init_fresh(sef_cb_init); - sef_setcb_init_lu(sef_cb_init); sef_setcb_init_restart(sef_cb_init); /* Let SEF perform startup. */ diff --git a/minix/drivers/printer/printer/printer.c b/minix/drivers/printer/printer/printer.c index 4dc1486be..109c88738 100644 --- a/minix/drivers/printer/printer/printer.c +++ b/minix/drivers/printer/printer/printer.c @@ -123,7 +123,6 @@ static void sef_local_startup() { /* Register init callbacks. */ sef_setcb_init_fresh(sef_cb_init_fresh); - sef_setcb_init_lu(sef_cb_init_fresh); sef_setcb_init_restart(sef_cb_init_fresh); /* Register live update callbacks. */ diff --git a/minix/drivers/storage/fbd/fbd.c b/minix/drivers/storage/fbd/fbd.c index c85148a46..ee216b663 100644 --- a/minix/drivers/storage/fbd/fbd.c +++ b/minix/drivers/storage/fbd/fbd.c @@ -113,7 +113,6 @@ static void sef_local_startup(void) /* Register init callbacks. */ sef_setcb_init_fresh(sef_cb_init_fresh); sef_setcb_init_restart(sef_cb_init_fresh); - sef_setcb_init_lu(sef_cb_init_fresh); /* Register signal callback. */ sef_setcb_signal_handler(sef_cb_signal_handler); diff --git a/minix/drivers/storage/filter/main.c b/minix/drivers/storage/filter/main.c index ca1a5a0e0..98124609b 100644 --- a/minix/drivers/storage/filter/main.c +++ b/minix/drivers/storage/filter/main.c @@ -352,7 +352,6 @@ static void sef_local_startup(void) /* Register init callbacks. */ sef_setcb_init_fresh(sef_cb_init_fresh); sef_setcb_init_restart(sef_cb_init_fresh); - sef_setcb_init_lu(sef_cb_init_fresh); /* Register signal callbacks. */ sef_setcb_signal_handler(sef_cb_signal_handler); diff --git a/minix/drivers/storage/memory/memory.c b/minix/drivers/storage/memory/memory.c index 2dc6b7f51..ffa6b49ab 100644 --- a/minix/drivers/storage/memory/memory.c +++ b/minix/drivers/storage/memory/memory.c @@ -114,7 +114,6 @@ static void sef_local_startup() { /* Register init callbacks. */ sef_setcb_init_fresh(sef_cb_init_fresh); - sef_setcb_init_lu(SEF_CB_INIT_LU_DEFAULT); sef_setcb_init_restart(SEF_CB_INIT_RESTART_STATEFUL); /* Let SEF perform startup. */ diff --git a/minix/drivers/system/log/log.c b/minix/drivers/system/log/log.c index 0f693e844..8869eedd2 100644 --- a/minix/drivers/system/log/log.c +++ b/minix/drivers/system/log/log.c @@ -68,7 +68,6 @@ static void sef_local_startup() { /* Register init callbacks. */ sef_setcb_init_fresh(sef_cb_init_fresh); - sef_setcb_init_lu(sef_cb_init_fresh); /* Register live update callbacks. */ sef_setcb_lu_prepare(sef_cb_lu_prepare); diff --git a/minix/drivers/system/random/main.c b/minix/drivers/system/random/main.c index ffe46982e..9cdfb8dba 100644 --- a/minix/drivers/system/random/main.c +++ b/minix/drivers/system/random/main.c @@ -71,7 +71,6 @@ static void sef_local_startup() { /* Register init callbacks. */ sef_setcb_init_fresh(sef_cb_init_fresh); - sef_setcb_init_lu(sef_cb_init_fresh); sef_setcb_init_restart(sef_cb_init_fresh); /* Let SEF perform startup. */ diff --git a/minix/include/minix/audio_fw.h b/minix/include/minix/audio_fw.h index 53c3ee57d..7a22739de 100644 --- a/minix/include/minix/audio_fw.h +++ b/minix/include/minix/audio_fw.h @@ -85,7 +85,7 @@ EXTERN special_file_t special_file[]; #define WRITE_DMA 2 EXTERN int sef_cb_lu_prepare(int state); -EXTERN int sef_cb_lu_state_isvalid(int state); +EXTERN int sef_cb_lu_state_isvalid(int state, int flags); EXTERN void sef_cb_lu_state_dump(int state); #endif /* AUDIO_FW_H */ diff --git a/minix/lib/libaudiodriver/audio_fw.c b/minix/lib/libaudiodriver/audio_fw.c index 39410c985..adba6526a 100644 --- a/minix/lib/libaudiodriver/audio_fw.c +++ b/minix/lib/libaudiodriver/audio_fw.c @@ -88,7 +88,6 @@ static void sef_local_startup(void) { /* Register init callbacks. */ sef_setcb_init_fresh(sef_cb_init_fresh); - sef_setcb_init_lu(sef_cb_init_fresh); sef_setcb_init_restart(sef_cb_init_fresh); /* Register live update callbacks. */ diff --git a/minix/lib/libaudiodriver/liveupdate.c b/minix/lib/libaudiodriver/liveupdate.c index 000da3672..e8e0c7459 100644 --- a/minix/lib/libaudiodriver/liveupdate.c +++ b/minix/lib/libaudiodriver/liveupdate.c @@ -78,7 +78,7 @@ int sef_cb_lu_prepare(int state) /*===========================================================================* * sef_cb_lu_state_isvalid * *===========================================================================*/ -int sef_cb_lu_state_isvalid(int state) +int sef_cb_lu_state_isvalid(int state, int __unused flags) { return SEF_LU_STATE_IS_STANDARD(state) || AUDIO_STATE_IS_CUSTOM(state); }