diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2013-06-23 12:20:15 +0100 |
|---|---|---|
| committer | Russell King <rmk@arm.linux.org.uk> | 2013-06-23 12:20:15 +0100 |
| commit | e39177a427a4f71ef5a3ff2aee426e395ee86b73 (patch) | |
| tree | 89f57d3143852f69da57df1ba6b1aff3677ec6dd | |
| parent | 791f2728d4030ec8f453463fba95647ce19767b9 (diff) | |
Turn on compiler warnings and fix them
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | vmeta_lib.c | 10 | ||||
| -rw-r--r-- | vmeta_lib.h | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index f311f1c..371482e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -AM_CFLAGS = $(WARN_CFLAGS) +AM_CFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes $(WARN_CFLAGS) libvmeta_la_LTLIBRARIES = libvmeta.la libvmeta_ladir = $(libdir) diff --git a/vmeta_lib.c b/vmeta_lib.c index 0fbe76e..e657860 100644 --- a/vmeta_lib.c +++ b/vmeta_lib.c @@ -67,7 +67,7 @@ typedef struct vdec_os_driver_cb_s { struct { UNSG32 phys; UNSG32 size; - } map[3]; + } map[2]; void *regs; // the vmeta registers void *vdec_obj_va; @@ -262,20 +262,22 @@ static int vmeta_ioctl_ulong(unsigned cmd, unsigned long arg) } // enable vmeta interrupt -void vdec_os_api_irq_enable(void) +static void vdec_os_api_irq_enable(void) { vdec_os_driver_cb_t *vdec = vdec_iface; int irq_on = 1; write(vdec->fd, &irq_on, sizeof(int)); } +#if 0 // Not used // disable vmeta interrupt -void vdec_os_api_irq_disable(void) +static void vdec_os_api_irq_disable(void) { vdec_os_driver_cb_t *vdec = vdec_iface; int irq_on = 0; write(vdec->fd, &irq_on, sizeof(int)); } +#endif SIGN32 vdec_os_api_set_sync_timeout_isr(UNSG32 timeout) { @@ -400,7 +402,7 @@ SIGN32 vdec_os_driver_init(void) goto err_open_fail; } - for (i = 0; i < 3; i++) { + for (i = 0; i < 2; i++) { vdec->map[i].phys = info.map[i].phys; vdec->map[i].size = info.map[i].size; } diff --git a/vmeta_lib.h b/vmeta_lib.h index 9060c32..fe7ac40 100644 --- a/vmeta_lib.h +++ b/vmeta_lib.h @@ -49,6 +49,7 @@ enum dma_data_direction { SIGN32 vdec_os_driver_init(void); SIGN32 vdec_os_driver_clean(void); SIGN32 vdec_os_driver_version(SIGN8 *ver_str); +SIGN32 vdec_os_api_force_ini(void); //--------------------------------------------------------------------------- // Memory operation API @@ -83,7 +84,7 @@ UNSG32 vdec_os_api_get_regbase_addr(void); // return VA // Interrupt register API //--------------------------------------------------------------------------- SIGN32 vdec_os_api_set_sync_timeout_isr(UNSG32 timeout); -SIGN32 vdec_os_api_sync_event(); +SIGN32 vdec_os_api_sync_event(void); //--------------------------------------------------------------------------- // multi-instance operation APIs |