[haiku-commits] haiku: hrev43872 - src/add-ons/kernel/drivers/audio/ice1712

From: korli@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sat, 17 Mar 2012 22:47:59 +0100 (CET)
hrev43872 adds 1 changeset to branch 'master'
old head: 64b0784e6c902ea18f238d7918cd600ac06558c9
new head: 0460c54de1854b5896986177b0e8f1573884685a

----------------------------------------------------------------------------

0460c54: ice1712: fixed debug build and warnings.

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev43872
Commit:      0460c54de1854b5896986177b0e8f1573884685a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=0460c54
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Sat Mar 17 21:47:09 2012 UTC

----------------------------------------------------------------------------

4 files changed, 22 insertions(+), 19 deletions(-)
src/add-ons/kernel/drivers/audio/ice1712/debug.h   |    4 +++
src/add-ons/kernel/drivers/audio/ice1712/ice1712.c |   23 +++++++--------
src/add-ons/kernel/drivers/audio/ice1712/ice1712.h |    5 +++-
src/add-ons/kernel/drivers/audio/ice1712/multi.c   |    9 ++----

----------------------------------------------------------------------------

diff --git a/src/add-ons/kernel/drivers/audio/ice1712/debug.h 
b/src/add-ons/kernel/drivers/audio/ice1712/debug.h
index ed98501..c684bc0 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/debug.h
+++ b/src/add-ons/kernel/drivers/audio/ice1712/debug.h
@@ -29,4 +29,8 @@
 #      define TRACE_VV(a...) ;
 #endif
 
+#define ASSERT(a) if (a) {} else TRACE("ASSERT failed! file = %s, line = 
%d\n",\
+       __FILE__,__LINE__)
+       
+
 #endif // _DEBUG_ICE1712_H_
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c 
b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
index 5c6f44c..1a6dd4d 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
+++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.c
@@ -10,23 +10,22 @@
  */
 
 
+#include "ice1712.h"
+#include "ice1712_reg.h"
+#include "io.h"
+#include "multi.h"
+#include "util.h"
+
 #include <KernelExport.h>
 #include <Drivers.h>
-#include <Errors.h>
 #include <OS.h>
-#include <fcntl.h>
-#include <image.h>
 #include <midi_driver.h>
-#include <string.h>
 #include <drivers/driver_settings.h>
 
-#include "ice1712.h"
-#include "ice1712_reg.h"
-#include "io.h"
-#include "multi.h"
-#include "util.h"
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "debug.h"
 
 status_t init_hardware(void);
 status_t init_driver(void);
@@ -135,7 +134,7 @@ ice_1712_int(void *arg)
 static status_t
 ice1712_setup(ice1712 *ice)
 {
-       int result, i;
+       int i;
        uint8 reg8 = 0;
        uint16 mute;
 
@@ -151,7 +150,7 @@ ice1712_setup(ice1712 *ice)
        write_ccs_uint8(ice, CCS_CONTROL_STATUS, 0x01);
        snooze(200000);
 
-       result = read_eeprom(ice, ice->eeprom_data);
+       read_eeprom(ice, ice->eeprom_data);
 
 /*     TRACE("EEprom -> ");
        for (i = 0; i < 32; i++)
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h 
b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
index b848a18..ece826a 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
+++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
@@ -12,9 +12,12 @@
 #define _ICE1712_H_
 
 
-#include <PCI.h>
+#include "debug.h"
 #include "hmulti_audio.h"
 
+#include <PCI.h>
+
+
 #define DRIVER_NAME "ice1712"
 #define VERSION "0.5"
 
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/multi.c 
b/src/add-ons/kernel/drivers/audio/ice1712/multi.c
index bf17e4a..9867e9b 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/multi.c
+++ b/src/add-ons/kernel/drivers/audio/ice1712/multi.c
@@ -332,10 +332,8 @@ ice1712_get_global_format(ice1712 *card, multi_format_info 
*data)
 status_t
 ice1712_set_global_format(ice1712 *card, multi_format_info *data)
 {
-       uint8 i;
-
-       TRACE("Input Sampling Rate = %d\n", (int)data->input.rate);
-       TRACE("Output Sampling Rate = %d\n", (int)data->output.rate);
+       TRACE("Input Sampling Rate = %d\n", data->input.rate);
+       TRACE("Output Sampling Rate = %d\n", data->output.rate);
 
        //We can't have a different rate for input and output
        //so just wait to change our sample rate when
@@ -361,8 +359,7 @@ ice1712_set_global_format(ice1712 *card, multi_format_info 
*data)
                }
                write_mt_uint8(card, MT_SAMPLING_RATE_SELECT, 
card->sampling_rate);
        }
-       i = read_mt_uint8(card, MT_SAMPLING_RATE_SELECT);
-       TRACE("New rate = %#x\n", i);
+       TRACE("New rate = %#x\n", read_mt_uint8(card, MT_SAMPLING_RATE_SELECT));
 
        return B_OK;
 }
[haiku-commits] haiku: hrev43872 - src/add-ons/kernel/drivers/audio/ice1712

Other related posts:
