[haiku-commits] haiku: hrev43870 - build/jam src/add-ons/kernel/generic/mpu401

From: korli@xxxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sat, 17 Mar 2012 21:08:53 +0100 (CET)
hrev43870 adds 2 changesets to branch 'master'
old head: 362efe0c9f36d3dd38b22d2c24ac02e54b189d7c
new head: 93e180d06b166b14778dbf1b019d1cc7cef2bf16

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

be111e0: Ticket #8377: Fix page fault using user_memcpy

                               [ Jerome Leveque <leveque.jerome@xxxxxxxxx> ]

93e180d: ice1712: added to the image

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

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

2 files changed, 12 insertions(+), 3 deletions(-)
build/jam/HaikuImage                       |    4 ++--
src/add-ons/kernel/generic/mpu401/mpu401.c |   11 ++++++++++-

############################################################################

Commit:      be111e0787c18801cfdab85631aa7f9657af74e0
URL:         http://cgit.haiku-os.org/haiku/commit/?id=be111e0
Author:      Jerome Leveque <leveque.jerome@xxxxxxxxx>
Date:        Tue Mar 13 22:59:23 2012 UTC
Committer:   Jérôme Duval <jerome.duval@xxxxxxxxx>
Commit-Date: Sat Mar 17 19:54:41 2012 UTC

Ticket:      https://dev.haiku-os.org/ticket/8377

Ticket #8377: Fix page fault using user_memcpy

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

diff --git a/src/add-ons/kernel/generic/mpu401/mpu401.c 
b/src/add-ons/kernel/generic/mpu401/mpu401.c
index 7bf72c9..e68c99e 100644
--- a/src/add-ons/kernel/generic/mpu401/mpu401.c
+++ b/src/add-ons/kernel/generic/mpu401/mpu401.c
@@ -279,7 +279,7 @@ midi_read(void *cookie, off_t pos, void *buffer, size_t 
*num_bytes)
 
        unsigned char *data;
        unsigned int i;
-       cpu_status status;
+       cpu_status status __attribute__((unused));
        status_t bestat;
        mpu401device *mpu_device = (mpu401device *)cookie;
 
@@ -298,8 +298,13 @@ midi_read(void *cookie, off_t pos, void *buffer, size_t 
*num_bytes)
                *num_bytes = 1;
                return B_INTERRUPTED;
        } else {
+#ifdef __HAIKU__
+               if (user_memcpy(data+i, &(mpubuffer[mbuf_start]),
+                       sizeof(unsigned char)) == B_OK) {
+#else
                status = lock();
                *(data+i) = mpubuffer[mbuf_start];
+#endif
                i++;
                mbuf_start++; // pointer to data in ringbuffer
                if (mbuf_start >= (MBUF_ELEMENTS-1))
@@ -307,7 +312,11 @@ midi_read(void *cookie, off_t pos, void *buffer, size_t 
*num_bytes)
                *num_bytes = 1; // How many bytes are being returned in buffer
                if (mbuf_bytes > 0)
                        mbuf_bytes--; // bytes read from buffer, so decrement 
buffer count
+#ifdef __HAIKU__
+               }
+#else
                unlock(status);
+#endif
                //PRINT(("bytes in buffer: %d\n",mbuf_bytes));
        }
 

############################################################################

Revision:    hrev43870
Commit:      93e180d06b166b14778dbf1b019d1cc7cef2bf16
URL:         http://cgit.haiku-os.org/haiku/commit/?id=93e180d
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Sat Mar 17 19:54:57 2012 UTC

ice1712: added to the image

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

diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index c8ef6d1..a9497ee 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -161,14 +161,14 @@ SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR
 ;
 SYSTEM_ADD_ONS_SCREENSAVERS = Butterfly DebugNow $(X86_ONLY)Flurry
        $(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Leaves Message Spider ;
-SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda sis7018 ;
+SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ice1712 sis7018 ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ;
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
        $(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme
        $(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware
        $(X86_ONLY)ati $(X86_ONLY)3dfx $(X86_ONLY)radeon_hd
 ;
-SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki usb_midi ;
+SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki ice1712 usb_midi ;
 SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
        $(X86_ONLY)ar81xx $(X86_ONLY)attansic_l1 $(X86_ONLY)attansic_l2
        $(X86_ONLY)broadcom440x $(X86_ONLY)broadcom570x $(X86_ONLY)dec21xxx 
etherpci
[haiku-commits] haiku: hrev43870 - build/jam src/add-ons/kernel/generic/mpu401

Other related posts:
