summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'recipes')
-rw-r--r--recipes/clutter/clutter_0.8+git.bb7
-rw-r--r--recipes/ffmpeg/ffmpeg-0.5/ffmpeg-arm-update.diff495
-rw-r--r--recipes/ffmpeg/ffmpeg_0.5.bb3
-rw-r--r--recipes/libdlo/kernel-module-udlfb.bb19
-rw-r--r--recipes/libdlo/kernel-module-udlfb/Makefile15
-rw-r--r--recipes/libdlo/kernel-module-udlfb/dlfb.h234
-rw-r--r--recipes/libdlo/kernel-module-udlfb/udlfb.c664
-rw-r--r--recipes/libdlo/libdlo_git.bb21
-rw-r--r--recipes/samba/files/tdb.pc11
-rw-r--r--recipes/samba/files/tdbheaderfix.patch14
-rw-r--r--recipes/samba/samba.inc6
-rw-r--r--recipes/samba/samba_3.3.0.bb4
-rw-r--r--recipes/usb-gadget-mode/files/omap3-pandora/usb-gadget.conf3
-rwxr-xr-xrecipes/usb-gadget-mode/files/usb-gadget2
-rw-r--r--recipes/usb-gadget-mode/usb-gadget-mode.bb2
15 files changed, 1492 insertions, 8 deletions
diff --git a/recipes/clutter/clutter_0.8+git.bb b/recipes/clutter/clutter_0.8+git.bb
index b578cbe43d..e31e250431 100644
--- a/recipes/clutter/clutter_0.8+git.bb
+++ b/recipes/clutter/clutter_0.8+git.bb
@@ -1,9 +1,10 @@
require clutter.inc
-CLUTTER_REV = "7129ee4f1b86bfcb65b5fc39021b05b74168785d"
+CLUTTER_REV = "af16378899699376fe7e84c7c11eb3bb5c4668cd"
+
+PV = "0.8.8"
+PR_append = "+gitr${CLUTTER_REV}"
-PV = "0.8.7+gitr${CLUTTER_REV}"
-PR = "r0"
SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8;rev=${CLUTTER_REV} \
file://enable-tests-r2990.patch;patch=1"
diff --git a/recipes/ffmpeg/ffmpeg-0.5/ffmpeg-arm-update.diff b/recipes/ffmpeg/ffmpeg-0.5/ffmpeg-arm-update.diff
new file mode 100644
index 0000000000..7c72ccd665
--- /dev/null
+++ b/recipes/ffmpeg/ffmpeg-0.5/ffmpeg-arm-update.diff
@@ -0,0 +1,495 @@
+ Makefile | 4 +
+ arm/dsputil_neon.c | 16 ++++
+ arm/dsputil_neon_s.S | 178 +++++++++++++++++++++++++++++++++++++------------
+ arm/simple_idct_neon.S | 17 ++++
+ arm/vp3dsp_neon.S | 94 +++++++++++++++++++++++++
+ 5 files changed, 265 insertions(+), 44 deletions(-)
+diff -Nurd ffmpeg.old/libavcodec/arm/dsputil_neon.c ffmpeg-0.5/libavcodec/arm/dsputil_neon.c
+--- ffmpeg.old/libavcodec/arm/dsputil_neon.c 2009-01-31 00:13:19.000000000 +0100
++++ ffmpeg-0.5/libavcodec/arm/dsputil_neon.c 2009-05-30 11:27:54.000000000 +0200
+@@ -41,6 +41,10 @@
+
+ void ff_avg_pixels16_neon(uint8_t *, const uint8_t *, int, int);
+
++void ff_add_pixels_clamped_neon(const DCTELEM *, uint8_t *, int);
++void ff_put_pixels_clamped_neon(const DCTELEM *, uint8_t *, int);
++void ff_put_signed_pixels_clamped_neon(const DCTELEM *, uint8_t *, int);
++
+ void ff_put_h264_qpel16_mc00_neon(uint8_t *, uint8_t *, int);
+ void ff_put_h264_qpel16_mc10_neon(uint8_t *, uint8_t *, int);
+ void ff_put_h264_qpel16_mc20_neon(uint8_t *, uint8_t *, int);
+@@ -146,6 +150,9 @@
+ DCTELEM *block, int stride,
+ const uint8_t nnzc[6*8]);
+
++void ff_vp3_v_loop_filter_neon(uint8_t *, int, int *);
++void ff_vp3_h_loop_filter_neon(uint8_t *, int, int *);
++
+ void ff_vector_fmul_neon(float *dst, const float *src, int len);
+ void ff_vector_fmul_window_neon(float *dst, const float *src0,
+ const float *src1, const float *win,
+@@ -176,6 +183,10 @@
+
+ c->avg_pixels_tab[0][0] = ff_avg_pixels16_neon;
+
++ c->add_pixels_clamped = ff_add_pixels_clamped_neon;
++ c->put_pixels_clamped = ff_put_pixels_clamped_neon;
++ c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_neon;
++
+ c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_neon;
+ c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_neon;
+
+@@ -247,6 +258,11 @@
+ c->h264_idct_add16intra = ff_h264_idct_add16intra_neon;
+ c->h264_idct_add8 = ff_h264_idct_add8_neon;
+
++ if (CONFIG_VP3_DECODER || CONFIG_THEORA_DECODER) {
++ c->vp3_v_loop_filter = ff_vp3_v_loop_filter_neon;
++ c->vp3_h_loop_filter = ff_vp3_h_loop_filter_neon;
++ }
++
+ c->vector_fmul = ff_vector_fmul_neon;
+ c->vector_fmul_window = ff_vector_fmul_window_neon;
+
+diff -Nurd ffmpeg.old/libavcodec/arm/dsputil_neon_s.S ffmpeg-0.5/libavcodec/arm/dsputil_neon_s.S
+--- ffmpeg.old/libavcodec/arm/dsputil_neon_s.S 2009-01-31 00:13:19.000000000 +0100
++++ ffmpeg-0.5/libavcodec/arm/dsputil_neon_s.S 2009-05-30 11:27:54.000000000 +0200
+@@ -38,13 +38,13 @@
+ pld [r1, r2]
+ pld [r1, r2, lsl #1]
+ .if \avg
+- vld1.64 {d16,d17}, [ip], r2
++ vld1.64 {d16,d17}, [ip,:128], r2
+ vrhadd.u8 q0, q0, q8
+- vld1.64 {d18,d19}, [ip], r2
++ vld1.64 {d18,d19}, [ip,:128], r2
+ vrhadd.u8 q1, q1, q9
+- vld1.64 {d20,d21}, [ip], r2
++ vld1.64 {d20,d21}, [ip,:128], r2
+ vrhadd.u8 q2, q2, q10
+- vld1.64 {d22,d23}, [ip], r2
++ vld1.64 {d22,d23}, [ip,:128], r2
+ vrhadd.u8 q3, q3, q11
+ .endif
+ subs r3, r3, #4
+@@ -73,35 +73,29 @@
+ .endm
+
+ .macro pixels16_y2 vhadd=vrhadd.u8
+- push {lr}
+- add ip, r1, r2
+- lsl lr, r2, #1
+- vld1.64 {d0, d1}, [r1], lr
+- vld1.64 {d2, d3}, [ip], lr
++ vld1.64 {d0, d1}, [r1], r2
++ vld1.64 {d2, d3}, [r1], r2
+ 1: subs r3, r3, #2
+ \vhadd q2, q0, q1
+- vld1.64 {d0, d1}, [r1], lr
++ vld1.64 {d0, d1}, [r1], r2
+ \vhadd q3, q0, q1
+- vld1.64 {d2, d3}, [ip], lr
++ vld1.64 {d2, d3}, [r1], r2
+ pld [r1]
+- pld [ip]
++ pld [r1, r2]
+ vst1.64 {d4, d5}, [r0,:128], r2
+ vst1.64 {d6, d7}, [r0,:128], r2
+ bne 1b
+- pop {pc}
++ bx lr
+ .endm
+
+ .macro pixels16_xy2 vshrn=vrshrn.u16 no_rnd=0
+- push {lr}
+- lsl lr, r2, #1
+- add ip, r1, r2
+- vld1.64 {d0-d2}, [r1], lr
+- vld1.64 {d4-d6}, [ip], lr
++ vld1.64 {d0-d2}, [r1], r2
++ vld1.64 {d4-d6}, [r1], r2
+ .if \no_rnd
+ vmov.i16 q13, #1
+ .endif
+ pld [r1]
+- pld [ip]
++ pld [r1, r2]
+ vext.8 q1, q0, q1, #1
+ vext.8 q3, q2, q3, #1
+ vaddl.u8 q8, d0, d2
+@@ -109,7 +103,7 @@
+ vaddl.u8 q9, d4, d6
+ vaddl.u8 q11, d5, d7
+ 1: subs r3, r3, #2
+- vld1.64 {d0-d2}, [r1], lr
++ vld1.64 {d0-d2}, [r1], r2
+ vadd.u16 q12, q8, q9
+ pld [r1]
+ .if \no_rnd
+@@ -123,11 +117,11 @@
+ .endif
+ \vshrn d29, q1, #2
+ vaddl.u8 q8, d0, d30
+- vld1.64 {d2-d4}, [ip], lr
++ vld1.64 {d2-d4}, [r1], r2
+ vaddl.u8 q10, d1, d31
+ vst1.64 {d28,d29}, [r0,:128], r2
+ vadd.u16 q12, q8, q9
+- pld [ip]
++ pld [r1, r2]
+ .if \no_rnd
+ vadd.u16 q12, q12, q13
+ .endif
+@@ -142,7 +136,7 @@
+ vaddl.u8 q11, d3, d5
+ vst1.64 {d30,d31}, [r0,:128], r2
+ bgt 1b
+- pop {pc}
++ bx lr
+ .endm
+
+ .macro pixels8
+@@ -180,41 +174,35 @@
+ .endm
+
+ .macro pixels8_y2 vhadd=vrhadd.u8
+- push {lr}
+- add ip, r1, r2
+- lsl lr, r2, #1
+- vld1.64 {d0}, [r1], lr
+- vld1.64 {d1}, [ip], lr
++ vld1.64 {d0}, [r1], r2
++ vld1.64 {d1}, [r1], r2
+ 1: subs r3, r3, #2
+ \vhadd d4, d0, d1
+- vld1.64 {d0}, [r1], lr
++ vld1.64 {d0}, [r1], r2
+ \vhadd d5, d0, d1
+- vld1.64 {d1}, [ip], lr
++ vld1.64 {d1}, [r1], r2
+ pld [r1]
+- pld [ip]
++ pld [r1, r2]
+ vst1.64 {d4}, [r0,:64], r2
+ vst1.64 {d5}, [r0,:64], r2
+ bne 1b
+- pop {pc}
++ bx lr
+ .endm
+
+ .macro pixels8_xy2 vshrn=vrshrn.u16 no_rnd=0
+- push {lr}
+- lsl lr, r2, #1
+- add ip, r1, r2
+- vld1.64 {d0, d1}, [r1], lr
+- vld1.64 {d2, d3}, [ip], lr
++ vld1.64 {d0, d1}, [r1], r2
++ vld1.64 {d2, d3}, [r1], r2
+ .if \no_rnd
+ vmov.i16 q11, #1
+ .endif
+ pld [r1]
+- pld [ip]
++ pld [r1, r2]
+ vext.8 d4, d0, d1, #1
+ vext.8 d6, d2, d3, #1
+ vaddl.u8 q8, d0, d4
+ vaddl.u8 q9, d2, d6
+ 1: subs r3, r3, #2
+- vld1.64 {d0, d1}, [r1], lr
++ vld1.64 {d0, d1}, [r1], r2
+ pld [r1]
+ vadd.u16 q10, q8, q9
+ vext.8 d4, d0, d1, #1
+@@ -223,9 +211,9 @@
+ .endif
+ vaddl.u8 q8, d0, d4
+ \vshrn d5, q10, #2
+- vld1.64 {d2, d3}, [ip], lr
++ vld1.64 {d2, d3}, [r1], r2
+ vadd.u16 q10, q8, q9
+- pld [ip]
++ pld [r1, r2]
+ .if \no_rnd
+ vadd.u16 q10, q10, q11
+ .endif
+@@ -235,7 +223,7 @@
+ vaddl.u8 q9, d2, d6
+ vst1.64 {d7}, [r0,:64], r2
+ bgt 1b
+- pop {pc}
++ bx lr
+ .endm
+
+ .macro pixfunc pfx name suf rnd_op args:vararg
+@@ -273,6 +261,112 @@
+ pixfunc2 put_ pixels8_y2, _no_rnd, vhadd.u8
+ pixfunc2 put_ pixels8_xy2, _no_rnd, vshrn.u16, 1
+
++function ff_put_pixels_clamped_neon, export=1
++ vld1.64 {d16-d19}, [r0,:128]!
++ vqmovun.s16 d0, q8
++ vld1.64 {d20-d23}, [r0,:128]!
++ vqmovun.s16 d1, q9
++ vld1.64 {d24-d27}, [r0,:128]!
++ vqmovun.s16 d2, q10
++ vld1.64 {d28-d31}, [r0,:128]!
++ vqmovun.s16 d3, q11
++ vst1.64 {d0}, [r1,:64], r2
++ vqmovun.s16 d4, q12
++ vst1.64 {d1}, [r1,:64], r2
++ vqmovun.s16 d5, q13
++ vst1.64 {d2}, [r1,:64], r2
++ vqmovun.s16 d6, q14
++ vst1.64 {d3}, [r1,:64], r2
++ vqmovun.s16 d7, q15
++ vst1.64 {d4}, [r1,:64], r2
++ vst1.64 {d5}, [r1,:64], r2
++ vst1.64 {d6}, [r1,:64], r2
++ vst1.64 {d7}, [r1,:64], r2
++ bx lr
++ .endfunc
++
++function ff_put_signed_pixels_clamped_neon, export=1
++ vmov.u8 d31, #128
++ vld1.64 {d16-d17}, [r0,:128]!
++ vqmovn.s16 d0, q8
++ vld1.64 {d18-d19}, [r0,:128]!
++ vqmovn.s16 d1, q9
++ vld1.64 {d16-d17}, [r0,:128]!
++ vqmovn.s16 d2, q8
++ vld1.64 {d18-d19}, [r0,:128]!
++ vadd.u8 d0, d0, d31
++ vld1.64 {d20-d21}, [r0,:128]!
++ vadd.u8 d1, d1, d31
++ vld1.64 {d22-d23}, [r0,:128]!
++ vadd.u8 d2, d2, d31
++ vst1.64 {d0}, [r1,:64], r2
++ vqmovn.s16 d3, q9
++ vst1.64 {d1}, [r1,:64], r2
++ vqmovn.s16 d4, q10
++ vst1.64 {d2}, [r1,:64], r2
++ vqmovn.s16 d5, q11
++ vld1.64 {d24-d25}, [r0,:128]!
++ vadd.u8 d3, d3, d31
++ vld1.64 {d26-d27}, [r0,:128]!
++ vadd.u8 d4, d4, d31
++ vadd.u8 d5, d5, d31
++ vst1.64 {d3}, [r1,:64], r2
++ vqmovn.s16 d6, q12
++ vst1.64 {d4}, [r1,:64], r2
++ vqmovn.s16 d7, q13
++ vst1.64 {d5}, [r1,:64], r2
++ vadd.u8 d6, d6, d31
++ vadd.u8 d7, d7, d31
++ vst1.64 {d6}, [r1,:64], r2
++ vst1.64 {d7}, [r1,:64], r2
++ bx lr
++ .endfunc
++
++function ff_add_pixels_clamped_neon, export=1
++ mov r3, r1
++ vld1.64 {d16}, [r1,:64], r2
++ vld1.64 {d0-d1}, [r0,:128]!
++ vaddw.u8 q0, q0, d16
++ vld1.64 {d17}, [r1,:64], r2
++ vld1.64 {d2-d3}, [r0,:128]!
++ vqmovun.s16 d0, q0
++ vld1.64 {d18}, [r1,:64], r2
++ vaddw.u8 q1, q1, d17
++ vld1.64 {d4-d5}, [r0,:128]!
++ vaddw.u8 q2, q2, d18
++ vst1.64 {d0}, [r3,:64], r2
++ vqmovun.s16 d2, q1
++ vld1.64 {d19}, [r1,:64], r2
++ vld1.64 {d6-d7}, [r0,:128]!
++ vaddw.u8 q3, q3, d19
++ vqmovun.s16 d4, q2
++ vst1.64 {d2}, [r3,:64], r2
++ vld1.64 {d16}, [r1,:64], r2
++ vqmovun.s16 d6, q3
++ vld1.64 {d0-d1}, [r0,:128]!
++ vaddw.u8 q0, q0, d16
++ vst1.64 {d4}, [r3,:64], r2
++ vld1.64 {d17}, [r1,:64], r2
++ vld1.64 {d2-d3}, [r0,:128]!
++ vaddw.u8 q1, q1, d17
++ vst1.64 {d6}, [r3,:64], r2
++ vqmovun.s16 d0, q0
++ vld1.64 {d18}, [r1,:64], r2
++ vld1.64 {d4-d5}, [r0,:128]!
++ vaddw.u8 q2, q2, d18
++ vst1.64 {d0}, [r3,:64], r2
++ vqmovun.s16 d2, q1
++ vld1.64 {d19}, [r1,:64], r2
++ vqmovun.s16 d4, q2
++ vld1.64 {d6-d7}, [r0,:128]!
++ vaddw.u8 q3, q3, d19
++ vst1.64 {d2}, [r3,:64], r2
++ vqmovun.s16 d6, q3
++ vst1.64 {d4}, [r3,:64], r2
++ vst1.64 {d6}, [r3,:64], r2
++ bx lr
++ .endfunc
++
+ function ff_float_to_int16_neon, export=1
+ subs r2, r2, #8
+ vld1.64 {d0-d1}, [r1,:128]!
+diff -Nurd ffmpeg.old/libavcodec/arm/simple_idct_neon.S ffmpeg-0.5/libavcodec/arm/simple_idct_neon.S
+--- ffmpeg.old/libavcodec/arm/simple_idct_neon.S 2008-12-30 04:13:52.000000000 +0100
++++ ffmpeg-0.5/libavcodec/arm/simple_idct_neon.S 2009-05-30 11:27:54.000000000 +0200
+@@ -68,6 +68,19 @@
+ .text
+ .align 6
+
++function idct_row4_pld_neon
++ pld [r0]
++ add r3, r0, r1, lsl #2
++ pld [r0, r1]
++ pld [r0, r1, lsl #1]
++ pld [r3, -r1]
++ pld [r3]
++ pld [r3, r1]
++ add r3, r3, r1, lsl #1
++ pld [r3]
++ pld [r3, r1]
++ .endfunc
++
+ function idct_row4_neon
+ vmov.i32 q15, #(1<<(ROW_SHIFT-1))
+ vld1.64 {d2-d5}, [r2,:128]!
+@@ -252,7 +265,7 @@
+ function ff_simple_idct_put_neon, export=1
+ idct_start r2
+
+- bl idct_row4_neon
++ bl idct_row4_pld_neon
+ bl idct_row4_neon
+ add r2, r2, #-128
+ bl idct_col4_neon
+@@ -307,7 +320,7 @@
+ function ff_simple_idct_add_neon, export=1
+ idct_start r2
+
+- bl idct_row4_neon
++ bl idct_row4_pld_neon
+ bl idct_row4_neon
+ add r2, r2, #-128
+ bl idct_col4_neon
+diff -Nurd ffmpeg.old/libavcodec/arm/vp3dsp_neon.S ffmpeg-0.5/libavcodec/arm/vp3dsp_neon.S
+--- ffmpeg.old/libavcodec/arm/vp3dsp_neon.S 1970-01-01 01:00:00.000000000 +0100
++++ ffmpeg-0.5/libavcodec/arm/vp3dsp_neon.S 2009-05-30 11:27:54.000000000 +0200
+@@ -0,0 +1,94 @@
++/*
++ * Copyright (c) 2009 David Conrad
++ *
++ * This file is part of FFmpeg.
++ *
++ * FFmpeg is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * FFmpeg is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include "asm.S"
++
++.macro vp3_loop_filter
++ vsubl.u8 q3, d18, d17
++ vsubl.u8 q2, d16, d19
++ vadd.i16 q1, q3, q3
++ vadd.i16 q2, q2, q3
++ vadd.i16 q0, q1, q2
++ vrshr.s16 q0, q0, #3
++ vmovl.u8 q9, d18
++ vdup.u16 q15, r2
++
++ vabs.s16 q1, q0
++ vshr.s16 q0, q0, #15
++ vqsub.u16 q2, q15, q1
++ vqsub.u16 q3, q2, q1
++ vsub.i16 q1, q2, q3
++ veor q1, q1, q0
++ vsub.i16 q0, q1, q0
++
++ vaddw.u8 q2, q0, d17
++ vsub.i16 q3, q9, q0
++ vqmovun.s16 d0, q2
++ vqmovun.s16 d1, q3
++.endm
++
++function ff_vp3_v_loop_filter_neon, export=1
++ sub ip, r0, r1
++ sub r0, r0, r1, lsl #1
++ vld1.64 {d16}, [r0,:64], r1
++ vld1.64 {d17}, [r0,:64], r1
++ vld1.64 {d18}, [r0,:64], r1
++ vld1.64 {d19}, [r0,:64], r1
++ ldrb r2, [r2, #129*4]
++
++ vp3_loop_filter
++
++ vst1.64 {d0}, [ip,:64], r1
++ vst1.64 {d1}, [ip,:64], r1
++ bx lr
++.endfunc
++
++function ff_vp3_h_loop_filter_neon, export=1
++ sub ip, r0, #1
++ sub r0, r0, #2
++ vld1.32 {d16[]}, [r0], r1
++ vld1.32 {d17[]}, [r0], r1
++ vld1.32 {d18[]}, [r0], r1
++ vld1.32 {d19[]}, [r0], r1
++ vld1.32 {d16[1]}, [r0], r1
++ vld1.32 {d17[1]}, [r0], r1
++ vld1.32 {d18[1]}, [r0], r1
++ vld1.32 {d19[1]}, [r0], r1
++ ldrb r2, [r2, #129*4]
++
++ vtrn.8 d16, d17
++ vtrn.8 d18, d19
++ vtrn.16 d16, d18
++ vtrn.16 d17, d19
++
++ vp3_loop_filter
++
++ vtrn.8 d0, d1
++
++ vst1.16 {d0[0]}, [ip], r1
++ vst1.16 {d1[0]}, [ip], r1
++ vst1.16 {d0[1]}, [ip], r1
++ vst1.16 {d1[1]}, [ip], r1
++ vst1.16 {d0[2]}, [ip], r1
++ vst1.16 {d1[2]}, [ip], r1
++ vst1.16 {d0[3]}, [ip], r1
++ vst1.16 {d1[3]}, [ip], r1
++ bx lr
++.endfunc
+diff -Nurd ffmpeg.old/libavcodec/Makefile ffmpeg-0.5/libavcodec/Makefile
+--- ffmpeg.old/libavcodec/Makefile 2009-02-26 03:29:24.000000000 +0100
++++ ffmpeg-0.5/libavcodec/Makefile 2009-05-30 11:29:51.000000000 +0200
+@@ -477,11 +477,15 @@
+ OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \
+ arm/mpegvideo_iwmmxt.o \
+
++NEON-OBJS-$(CONFIG_THEORA_DECODER) += arm/vp3dsp_neon.o
++NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o
++
+ OBJS-$(HAVE_NEON) += arm/dsputil_neon.o \
+ arm/dsputil_neon_s.o \
+ arm/h264dsp_neon.o \
+ arm/h264idct_neon.o \
+ arm/simple_idct_neon.o \
++ $(NEON-OBJS-yes)
+
+ OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \
+ bfin/fdct_bfin.o \
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index 54db0042e3..63549b7ce4 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -3,13 +3,14 @@ require ffmpeg.inc
DEPENDS += "schroedinger libgsm"
PE = "1"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "1"
SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d"
SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2 \
file://armv4.patch;patch=1 \
+ file://ffmpeg-arm-update.diff;patch=1 \
"
#S = "${WORKDIR}/git"
diff --git a/recipes/libdlo/kernel-module-udlfb.bb b/recipes/libdlo/kernel-module-udlfb.bb
new file mode 100644
index 0000000000..f1352ef0c1
--- /dev/null
+++ b/recipes/libdlo/kernel-module-udlfb.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Framebuffer console driver for displaylink based usb devices"
+LICENSE = "GPLv2"
+
+PV = "0.2"
+
+SRC_URI = "file://udlfb.c \
+ file://dlfb.h \
+ file://Makefile \
+"
+
+inherit module
+
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}/lib/modules/${KERNEL_VERSION}/drivers/usb/
+ install -m 0644 *.ko ${D}/lib/modules/${KERNEL_VERSION}/drivers/usb/
+}
+
diff --git a/recipes/libdlo/kernel-module-udlfb/Makefile b/recipes/libdlo/kernel-module-udlfb/Makefile
new file mode 100644
index 0000000000..255d3f5480
--- /dev/null
+++ b/recipes/libdlo/kernel-module-udlfb/Makefile
@@ -0,0 +1,15 @@
+ifndef KERNELRELEASE
+
+PWD := $(shell pwd)
+all:
+ $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+clean:
+ rm -f *.o *.ko *.mod.* .*.cmd Module.symvers
+ rm -rf .tmp_versions
+
+install:
+ $(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules_install
+
+else
+ obj-m := udlfb.o
+endif
diff --git a/recipes/libdlo/kernel-module-udlfb/dlfb.h b/recipes/libdlo/kernel-module-udlfb/dlfb.h
new file mode 100644
index 0000000000..fdc33ca1c4
--- /dev/null
+++ b/recipes/libdlo/kernel-module-udlfb/dlfb.h
@@ -0,0 +1,234 @@
+#define MAX_VMODES 4
+#define FB_BPP 16
+
+#define AF_CONTROL "\xAF\x20\xFF\x00\xAF\x20\x20\x00\xAF\x20\x21\0\xAF\x20\x22\0\xAF\x20\x26\x28\xAF\x20\x27\x00\xAF\x20\x28\x00\xAF\x20\xFF\xFF\xAF\xA0"
+#define STD_CHANNEL "\x57\xCD\xDC\xA7\x1C\x88\x5E\x15\x60\xFE\xC6\x97\x16\x3D\x47\xF2"
+
+// as libdlo
+#define BUF_HIGH_WATER_MARK 1024
+#define BUF_SIZE 64*1024
+
+// Data (and color functions) taken from libdlo (http://freedesktop.org/wiki/Software/libdlo)
+
+
+/** Return red/green component of a 16 bpp colour number. */
+#define DLO_RG16(red, grn) (uint8_t)((((red) & 0xF8) | ((grn) >> 5)) & 0xFF)
+
+/** Return green/blue component of a 16 bpp colour number. */
+#define DLO_GB16(grn, blu) (uint8_t)(((((grn) & 0x1C) << 3) | ((blu) >> 3)) & 0xFF)
+
+/** Return 8 bpp colour number from red, green and blue components. */
+#define DLO_RGB8(red, grn, blu) ((((red) << 5) | (((grn) & 3) << 3) | ((blu) & 7)) & 0xFF)
+
+/** Return a 32 bpp colour number when given the three RGB components. */
+#define DLO_RGB(red,grn,blu) (u32)(((red) & 0xFF) | (((grn) & 0xFF) << 8) | (((blu) & 0xFF) << 16))
+
+/** Read the red component (0..255) of a 32 bpp colour. */
+#define DLO_RGB_GETRED(col) (uint8_t)((col) & 0xFF)
+
+/** Read the green component (0..255) of a 32 bpp colour. */
+#define DLO_RGB_GETGRN(col) (uint8_t)(((col) >> 8) & 0xFF)
+
+/** Read the blue component (0..255) of a 32 bpp colour. */
+#define DLO_RGB_GETBLU(col) (uint8_t)(((col) >> 16) & 0xFF)
+
+
+static u32 read_pixel_565(const uint8_t * const ptr, const bool swap)
+{
+ u32 col;
+ uint16_t *pix = (uint16_t *)ptr;
+ uint8_t red, grn, blu;
+
+ col = *pix;
+ red = (col & 0x001F) << 3;
+ grn = (col & 0x07E0) >> 3;
+ blu = (col & 0xF800) >> 8;
+ red = red | (red >> 5);
+ grn = grn | (grn >> 5);
+ blu = blu | (blu >> 5);
+
+ return swap ? DLO_RGB(blu, grn, red) : DLO_RGB(red, grn, blu);
+}
+
+static u16 rgb16(u32 col)
+{
+ uint8_t red = DLO_RGB_GETRED(col);
+ uint8_t grn = DLO_RGB_GETGRN(col);
+ uint8_t blu = DLO_RGB_GETBLU(col);
+
+ return (DLO_RG16(red, grn) << 8) + DLO_GB16(grn, blu);
+}
+
+
+
+struct dlfb_data {
+ struct usb_device *udev;
+ struct usb_interface *interface;
+ struct urb *tx_urb, *ctrl_urb ;
+ struct usb_ctrlrequest dr;
+ struct fb_info *info;
+ char *buf ;
+ char *bufend;
+ struct mutex bulk_mutex;
+ char edid[128];
+ int screen_size;
+ int line_length;
+};
+
+
+struct dlfb_video_mode {
+
+ int width ;
+ int height;
+ int bpp;
+ int hz;
+
+ char enable_data[146];
+ char data[146];
+};
+
+struct dlfb_video_mode dlfb_video_modes[MAX_VMODES] ;
+
+static void dlfb_bulk_callback(struct urb *urb) {
+
+ struct dlfb_data *dev_info = urb->context;
+
+ mutex_unlock(&dev_info->bulk_mutex);
+
+}
+
+static int dlfb_bulk_msg(struct dlfb_data *dev_info, int len) {
+
+ int clen;
+
+ /*
+ mutex_lock(&dev_info->bulk_mutex);
+
+ usb_fill_bulk_urb(dev_info->tx_urb, dev_info->udev, usb_sndbulkpipe(dev_info->udev, 1), dev_info->buf, len, dlfb_bulk_callback, dev_info);
+
+ dev_info->tx_urb->actual_length = 0;
+
+ return usb_submit_urb(dev_info->tx_urb, GFP_NOIO);
+ */
+
+ return usb_bulk_msg(dev_info->udev, usb_sndbulkpipe(dev_info->udev, 1), dev_info->buf, len, &clen, 0);
+}
+
+
+
+void dlfb_init_modes(void) {
+
+ dlfb_video_modes[0].width = 800 ;
+ dlfb_video_modes[0].height = 480 ;
+ dlfb_video_modes[0].bpp = 16 ;
+ dlfb_video_modes[0].hz = 60 ;
+ memcpy(dlfb_video_modes[0].enable_data,"\x7A\x12\x36\x0B\xEF\x21\x74\xD1\xF0\x06\x8F\x38\xE8\x71\xB4\xCE",16);
+ memcpy(dlfb_video_modes[0].data,"" \
+ "\x78\x67\x19\xF3\xB3\xD6\x5D\x7B\x4C\xCA\x26\x78\x41\x19\x19\xAC" \
+ "\xFF\x38\xB3\x10\x71\x89\x6A\xEC\xA8\xC1\x4F\x1F\x77\x86\x5D\x7E" \
+ "\xCE\xAF\x65\x7D\xFC\x30\x51\x67\x1F\x48\x30\x8E\x7A\x4B\x8A\xD4" \
+ "\xCB\x62\x45\x58\x5C\x22\x1D\x56\x6E\x2F\x60\xE2\x06\x6D\xA1\xE3" \
+ "\x82\x5F\x67\x95\x7A\x9F\x87\x43\xD8\x33\xEF\x0B\x5A\xDA\x09\x4F" \
+ "\xD7\x25\x6F\xBC\xF8\xC7\x09\x9C\x12\xC3\xA7\x6F\xE7\xED\xA8\x70" \
+ "\x8C\xB9\x65\x53\xDD\xA6\x7D\xDE\xD9\x4F\xDD\xD4\x6F\x28\xD6\x14" \
+ "\xDC\x2D\x41\x53\x33\xD9\x0A\x86\x11\x3C\x41\x5A\x56\x48\xF9\x85" \
+ "\x2B\x2F\x22\x66\x20\x39\xDA\xA1\x50\xCB\x5A\x58\x7D\x97\xFA\x2C" \
+ "\x64\x9D",146);
+
+ dlfb_video_modes[1].width = 1024 ;
+ dlfb_video_modes[1].height = 768 ;
+ dlfb_video_modes[1].bpp = 16 ;
+ dlfb_video_modes[1].hz = 60 ;
+ memcpy(dlfb_video_modes[1].enable_data,"\xB6\xF8\xFC\x00\xF3\xE4\x81\x1E\xC5\x60\xA3\x79\xE5\x35\xC5\x15",16);
+ memcpy(dlfb_video_modes[1].data,"" \
+ "\xDD\x2A\x3A\x49\xE9\x99\xE3\xC8\xA0\xBA\x23\x3A\x3D\xEB\x21\xE4" \
+ "\xA5\x54\x25\x0D\x51\xCC\xE6\x52\xA7\xD7\xCD\xFA\xD5\x9B\x5B\x41" \
+ "\x0B\x49\xAB\xC6\xE3\x1A\xF2\x87\x81\x32\xF0\x3E\x40\x00\x51\x40" \
+ "\x9E\x94\xF1\x22\xEE\xAC\xB2\xA2\x6B\x4D\xC4\x41\x5A\x9C\x45\x62" \
+ "\x4F\x4E\x61\xDB\x1F\x0E\x79\x66\xE2\x20\x83\x9E\x2C\xAB\x28\x38" \
+ "\xAC\xC1\x22\x81\xA5\x69\xFD\xFB\x26\x15\xF9\xC9\xFA\x90\xF2\x66" \
+ "\x85\xC5\xAA\xA6\x4D\x8B\xC8\xA6\x03\x32\xDF\x98\xA9\x77\x9E\x57" \
+ "\xEA\xC9\x9E\x29\xED\xFC\xC4\x78\x26\x0B\x2E\xC2\x41\x7C\x4A\xA3" \
+ "\xAB\x66\x01\xA0\xE5\xA4\x8B\x80\xA0\x53\xE5\x5D\x59\x63\x62\xE8" \
+ "\xFE\x6B",146);
+
+ dlfb_video_modes[2].width = 1280 ;
+ dlfb_video_modes[2].height = 1024 ;
+ dlfb_video_modes[2].bpp = 16 ;
+ dlfb_video_modes[2].hz = 60 ;
+ memcpy(dlfb_video_modes[2].enable_data,"\x6A\xF0\x37\x50\x63\xEF\xD2\xA9\x6F\x75\x72\xBB\xC7\x7B\x6F\x1A",16);
+ memcpy(dlfb_video_modes[2].data,"" \
+ "\x23\x4A\x78\x7C\xD1\xB8\x0E\x6B\x15\x93\x96\x77\x78\x44\xCC\x16" \
+ "\x7F\xE3\xD7\x39\x3F\x2E\x99\xD2\xB9\x68\x8E\xC4\x1A\x9B\xF4\x35" \
+ "\x61\xB5\x48\x5C\x94\xA6\x84\xB2\x88\x2B\x47\x84\x84\x73\x7F\x2C" \
+ "\xD0\xC4\x3D\x5D\x20\x61\x4A\xB1\x73\x4C\xDD\x6A\xB4\xFD\xE9\x94" \
+ "\x3C\xD1\x44\x0A\x08\xCD\xF5\xE5\xBD\x0D\x99\xCD\x9C\x2A\xC9\x06" \
+ "\x1D\x22\x1C\xB1\x9A\x94\x95\x65\x3C\x43\x19\x73\x83\xF7\x51\x1F" \
+ "\x5C\x3C\xE1\x59\xD5\xC3\xF2\x27\x28\xCE\x22\x7B\x2A\x70\x04\xE4" \
+ "\xD9\xFE\x8A\x6E\x28\x27\xC5\x40\x4E\xF8\x83\x5B\x82\x41\xA6\x62" \
+ "\xC1\x73\x3A\x5C\xF6\x90\x43\x39\xF2\xF5\x74\x80\x74\x44\xBD\xB1" \
+ "\x08\x53",146);
+
+ dlfb_video_modes[3].width = 1400 ;
+ dlfb_video_modes[3].height = 1050 ;
+ dlfb_video_modes[3].bpp = 16 ;
+ dlfb_video_modes[3].hz = 60 ;
+ memcpy(dlfb_video_modes[3].enable_data,"\x95\xCB\x91\xE5\xA8\x28\xFB\x87\xD5\x92\x1C\x44\x66\x57\x8A\x98",16);
+ memcpy(dlfb_video_modes[3].data,"" \
+ "\xC6\x8C\x42\x4C\x95\xDA\xB4\x2F\xBD\xD9\x9E\xAD\x8F\x7B\x69\x15" \
+ "\x1B\xDA\x06\x79\x23\x9E\x94\xF2\xC2\xE9\xBB\x34\x13\x6B\x9B\xB2" \
+ "\xC1\x4E\xD8\x69\x81\x49\x6E\x64\xAF\xB2\x4E\x69\x24\x1A\xA8\xBB" \
+ "\x4E\x11\x75\x38\xE6\xC9\x3D\xE9\x9A\xCC\x3B\xAA\x1F\xC4\x97\xD5" \
+ "\x4A\x9D\xAA\xE7\x04\xF0\xB6\xD4\xBD\xE4\x41\xCF\xF8\xA2\x77\x0B" \
+ "\x46\x9D\x3A\xBD\x73\xC0\x64\x76\x84\x2B\xD7\x11\xF3\x43\xB5\xF6" \
+ "\xE9\x0B\xB3\x4E\x2B\x80\x98\x15\xDC\xDA\x46\xE8\xEC\xBD\x0B\x0E" \
+ "\x64\x20\xF7\x17\x17\x33\x75\xBA\x30\x26\xDD\xFA\xA0\x99\x23\x11" \
+ "\xF1\xDE\x80\xB7\xD6\xB0\xB7\xA2\xA9\xBD\x6D\x29\x42\x74\x75\x73" \
+ "\xC5\x27",146);
+
+}
+
+int dlfb_set_video_mode(struct dlfb_data *dev_info, int width, int height) {
+
+ int i, ret;
+
+ for(i=0;i<MAX_VMODES;i++) {
+ printk("INIT VIDEO %d %d %d\n",i, dlfb_video_modes[i].width, dlfb_video_modes[i].height);
+ if (dlfb_video_modes[i].width == width && dlfb_video_modes[i].height == height) {
+
+ memcpy(dev_info->buf, STD_CHANNEL, 16);
+ ret = usb_control_msg(dev_info->udev, usb_sndctrlpipe(dev_info->udev, 0), 0x12, (0x02 << 5), 0, 0, dev_info->buf, 16, 0);
+ printk("ret control msg 1 (STD_CHANNEL): %d\n", ret);
+
+ memcpy(dev_info->buf, AF_CONTROL, sizeof(AF_CONTROL)-1);
+ ret = dlfb_bulk_msg(dev_info, sizeof(AF_CONTROL)-1);
+ printk("ret bulk 1: %d\n", ret);
+
+
+ memcpy(dev_info->buf, &dlfb_video_modes[i].enable_data, 16);
+ ret = usb_control_msg(dev_info->udev, usb_sndctrlpipe(dev_info->udev, 0), 0x12, (0x02 << 5), 0, 0, dev_info->buf, 16, 0);
+ printk("ret control msg 2: %d\n", ret);
+
+
+ // MODE_DATA
+ memcpy(dev_info->buf, &dlfb_video_modes[i].data, 146);
+ ret = dlfb_bulk_msg(dev_info, 146);
+ printk("ret bulk 2: %d\n", ret);
+
+ memcpy(dev_info->buf, STD_CHANNEL, sizeof(STD_CHANNEL)-1);
+ ret = usb_control_msg(dev_info->udev, usb_sndctrlpipe(dev_info->udev, 0), 0x12, (0x02 << 5), 0, 0, dev_info->buf, sizeof(STD_CHANNEL)-1, 0);
+ printk("ret control msg 3: %d\n", ret);
+
+ // flush
+ ret = dlfb_bulk_msg(dev_info, 0);
+ printk("ret bulk 3: %d\n", ret);
+
+ dev_info->screen_size = width*height*(FB_BPP/8) ;
+ dev_info->line_length = width*(FB_BPP/8) ;
+
+ return 0;
+ }
+ }
+
+ return -1 ;
+}
diff --git a/recipes/libdlo/kernel-module-udlfb/udlfb.c b/recipes/libdlo/kernel-module-udlfb/udlfb.c
new file mode 100644
index 0000000000..32f2b30134
--- /dev/null
+++ b/recipes/libdlo/kernel-module-udlfb/udlfb.c
@@ -0,0 +1,664 @@
+/*****************************************************************************
+ * DLFB Kernel Driver *
+ * Version 0.2rc1 (udlfb) *
+ * (C) 2009 Roberto De Ioris <roberto@unbit.it> *
+ * *
+ * This file is licensed under the GPLv2. See COPYING in the package. *
+ * Based on the amazing work of Florian Echtler and libdlo 0.1 *
+ * *
+ * *
+ * 22.05.09 First public (ugly) release *
+ *****************************************************************************/
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/usb.h>
+#include <linux/uaccess.h>
+#include <linux/mm.h>
+#include <linux/fb.h>
+#include <linux/mutex.h>
+#include <linux/vmalloc.h>
+
+#include "dlfb.h"
+
+
+#define DRIVER_VERSION "DLFB 0.2rc2"
+
+
+// memory functions taken from vfb
+
+static void *rvmalloc(unsigned long size)
+{
+ void *mem;
+ unsigned long adr;
+
+ size = PAGE_ALIGN(size);
+ mem = vmalloc_32(size);
+ if (!mem)
+ return NULL;
+
+ memset(mem, 0, size); /* Clear the ram out, no junk to the user */
+ adr = (unsigned long) mem;
+ while (size > 0) {
+ SetPageReserved(vmalloc_to_page((void *)adr));
+ adr += PAGE_SIZE;
+ size -= PAGE_SIZE;
+ }
+
+ return mem;
+}
+
+static void rvfree(void *mem, unsigned long size)
+{
+ unsigned long adr;
+
+ if (!mem)
+ return;
+
+ adr = (unsigned long) mem;
+ while ((long) size > 0) {
+ ClearPageReserved(vmalloc_to_page((void *)adr));
+ adr += PAGE_SIZE;
+ size -= PAGE_SIZE;
+ }
+ vfree(mem);
+}
+
+static int dlfb_mmap(struct fb_info *info,
+ struct vm_area_struct *vma)
+{
+ unsigned long start = vma->vm_start;
+ unsigned long size = vma->vm_end - vma->vm_start;
+ unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+ unsigned long page, pos;
+
+ printk("MMAP: %lu %u\n", offset + size, info->fix.smem_len);
+
+ if (offset + size > info->fix.smem_len) {
+ return -EINVAL;
+ }
+
+ pos = (unsigned long)info->fix.smem_start + offset;
+
+ while (size > 0) {
+ page = vmalloc_to_pfn((void *)pos);
+ if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED)) {
+ return -EAGAIN;
+ }
+ start += PAGE_SIZE;
+ pos += PAGE_SIZE;
+ if (size > PAGE_SIZE)
+ size -= PAGE_SIZE;
+ else
+ size = 0;
+ }
+
+ vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */
+ return 0;
+
+}
+
+//
+
+
+//ioctl structure
+struct dloarea {
+ int x,y;
+ int w,h;
+};
+
+/*
+
+static struct usb_device_id id_table [] = {
+ { USB_DEVICE(0x17e9, 0x023d) },
+ { }
+};
+
+*/
+
+static struct usb_device_id id_table [] = {
+ { .idVendor = 0x17e9, .match_flags = USB_DEVICE_ID_MATCH_VENDOR, },
+ { },
+};
+
+
+
+MODULE_DEVICE_TABLE (usb, id_table);
+
+static struct usb_driver dlfb_driver;
+
+static int image_blit(struct dlfb_data *dev_info, int x, int y, int width, int height, char *data) {
+
+ int i,j,base ;
+ int rem = width ;
+ int ret;
+ u32 col;
+ u16 dlocol ;
+
+
+ char *bufptr ;
+
+ if (x+width > dev_info->info->var.xres) {
+ return -EINVAL;
+ }
+
+ if (y+height > dev_info->info->var.yres) {
+ return -EINVAL;
+ }
+
+
+ base = (dev_info->info->var.xres*2*y)+(x*2) ;
+
+ data += (dev_info->info->var.xres*2*y)+(x*2) ;
+
+ //printk("IMAGE_BLIT\n");
+
+ bufptr = dev_info->buf ;
+
+ for(i = y;i<y+height;i++) {
+
+ if (dev_info->bufend - bufptr < BUF_HIGH_WATER_MARK) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ bufptr = dev_info->buf ;
+ }
+
+ rem = width ;
+
+ //printk("WRITING LINE %d\n", i);
+
+ while(rem) {
+
+ if (dev_info->bufend - bufptr < BUF_HIGH_WATER_MARK) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ bufptr = dev_info->buf ;
+ }
+
+ *bufptr++ = 0xAF ;
+ *bufptr++ = 0x68 ;
+
+ *bufptr++ = (char)(base >> 16) ;
+ *bufptr++ = (char)(base >> 8) ;
+ *bufptr++ = (char)(base) ;
+
+ if (rem > 255) {
+ *bufptr++ = 255 ;
+ for(j=0;j<510;j+=2) {
+ col = read_pixel_565(data+j, 1);
+ dlocol = ntohs(rgb16(col));
+ memcpy(bufptr, &dlocol, 2);
+ bufptr+=2;
+ }
+ rem-=255;
+ base+=510;
+ data+= 510;
+ }
+ else {
+ *bufptr++ = rem ;
+ for(j=0;j<rem*2;j+=2) {
+ col = read_pixel_565(data+j, 1);
+ dlocol = ntohs(rgb16(col));
+ memcpy(bufptr, &dlocol, 2);
+ bufptr+=2;
+ }
+ base+= rem*2 ;
+ data+= rem*2;
+ rem = 0 ;
+ }
+
+ }
+
+ base += (dev_info->info->var.xres*2)-(width*2) ;
+ data += (dev_info->info->var.xres*2)-(width*2) ;
+
+ }
+
+ if (bufptr > dev_info->buf) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ }
+
+ return base ;
+}
+
+static int draw_rect(struct dlfb_data *dev_info, int x, int y, int width, int height, unsigned char red, unsigned char green, unsigned char blue) {
+
+ int i,base ;
+ int ret ;
+ unsigned short col = (((((red) & 0xF8) | ((green) >> 5)) & 0xFF) << 8) + (((((green) & 0x1C) << 3) | ((blue) >> 3)) & 0xFF) ;
+ int rem = width ;
+
+ char *bufptr ;
+
+ if (x+width > dev_info->info->var.xres) {
+ return -EINVAL;
+ }
+
+ if (y+height > dev_info->info->var.yres) {
+ return -EINVAL;
+ }
+
+ base = (dev_info->info->var.xres*2*y)+(x*2) ;
+
+ bufptr = dev_info->buf ;
+
+ for(i = y;i<y+height;i++) {
+
+ if (dev_info->bufend - bufptr < BUF_HIGH_WATER_MARK) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ bufptr = dev_info->buf ;
+ }
+
+ rem = width ;
+
+ while(rem) {
+
+ if (dev_info->bufend - bufptr < BUF_HIGH_WATER_MARK) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ bufptr = dev_info->buf ;
+ }
+
+ *bufptr++ = 0xAF ;
+ *bufptr++ = 0x69 ;
+
+ *bufptr++ = (char)(base >> 16) ;
+ *bufptr++ = (char)(base >> 8) ;
+ *bufptr++ = (char)(base) ;
+
+ if (rem > 255) {
+ *bufptr++ = 255 ;
+ *bufptr++ = 255 ;
+ rem-=255;
+ base+=255*2;
+ }
+ else {
+ *bufptr++ = rem ;
+ *bufptr++ = rem ;
+ base+= rem*2 ;
+ rem = 0 ;
+ }
+
+ *bufptr++ = (char) (col >> 8) ;
+ *bufptr++ = (char) (col) ;
+
+ }
+
+ base+= (dev_info->info->var.xres*2)-(width*2) ;
+
+ }
+
+ if (bufptr > dev_info->buf) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ }
+
+ return 1 ;
+}
+
+static int copyarea(struct dlfb_data *dev_info, int dx, int dy, int sx, int sy, int width, int height) {
+
+ int base ;
+ int source ;
+ int rem ;
+ int i, ret;
+
+ char *bufptr ;
+
+ if (dx+width > dev_info->info->var.xres) {
+ return -EINVAL;
+ }
+
+ if (dy+height > dev_info->info->var.yres) {
+ return -EINVAL;
+ }
+
+ base = (dev_info->info->var.xres*2*dy)+(dx*2) ;
+ source = (dev_info->info->var.xres*2*sy)+(sx*2) ;
+
+ bufptr = dev_info->buf ;
+
+ for(i = sy;i<sy+height;i++) {
+
+ if (dev_info->bufend - bufptr < BUF_HIGH_WATER_MARK) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ bufptr = dev_info->buf ;
+ }
+
+ rem = width ;
+
+ while(rem) {
+
+ if (dev_info->bufend - bufptr < BUF_HIGH_WATER_MARK) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ bufptr = dev_info->buf ;
+ }
+
+ *bufptr++ = 0xAF ;
+ *bufptr++ = 0x6A ;
+
+ *bufptr++ = (char)(base >> 16) ;
+ *bufptr++ = (char)(base >> 8) ;
+ *bufptr++ = (char)(base) ;
+
+ if (rem > 255) {
+ *bufptr++ = 255 ;
+ *bufptr++ = (char)(source >> 16) ;
+ *bufptr++ = (char)(source >> 8) ;
+ *bufptr++ = (char)(source) ;
+
+ rem-=255;
+ base+=255*2;
+ source+=255*2;
+
+ }
+ else {
+ *bufptr++ = rem ;
+ *bufptr++ = (char)(source >> 16) ;
+ *bufptr++ = (char)(source >> 8) ;
+ *bufptr++ = (char)(source) ;
+
+ base+= rem*2 ;
+ source+= rem*2 ;
+ rem = 0 ;
+ }
+
+ }
+
+ base+= (dev_info->info->var.xres*2)-(width*2) ;
+ source += (dev_info->info->var.xres*2)-(width*2) ;
+
+ }
+
+ if (bufptr > dev_info->buf) {
+ ret = dlfb_bulk_msg(dev_info, bufptr-dev_info->buf);
+ }
+
+
+ return 1;
+}
+
+void dlfb_copyarea(struct fb_info *info, const struct fb_copyarea *area) {
+
+ struct dlfb_data *dev = info->par;
+
+ copyarea(dev, area->dx, area->dy, area->sx, area->sy, area->width, area->height) ;
+
+
+ //printk("COPY AREA %d %d %d %d %d %d !!!\n", area->dx, area->dy, area->sx, area->sy, area->width, area->height);
+
+}
+
+void dlfb_imageblit(struct fb_info *info, const struct fb_image *image) {
+
+ int ret;
+ struct dlfb_data *dev = info->par;
+ //printk("IMAGE BLIT (1) %d %d %d %d DEPTH %d {%p}!!!\n", image->dx, image->dy, image->width, image->height, image->depth, dev->udev);
+ cfb_imageblit(info, image);
+ ret = image_blit(dev, image->dx, image->dy, image->width, image->height, info->screen_base);
+ //printk("IMAGE BLIT (2) %d %d %d %d DEPTH %d {%p} %d!!!\n", image->dx, image->dy, image->width, image->height, image->depth, dev->udev, ret);
+}
+
+void dlfb_fillrect(struct fb_info *info, const struct fb_fillrect *region) {
+
+ unsigned char red, green, blue ;
+ struct dlfb_data *dev = info->par;
+
+ memcpy(&red, &region->color, 1);
+ memcpy(&green, &region->color+1, 1);
+ memcpy(&blue, &region->color+2, 1);
+ draw_rect(dev, region->dx, region->dy, region->width, region->height, red, green, blue);
+ //printk("FILL RECT %d %d !!!\n", region->dx, region->dy);
+
+}
+
+static int dlfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) {
+
+ struct dlfb_data *dev = info->par;
+ struct dloarea *area ;
+
+
+ area = (struct dloarea *) arg ;
+
+ if (area->x < 0)
+ area->x = 0 ;
+
+ if (area->x > info->var.xres)
+ area->x = info->var.xres ;
+
+ if (area->y < 0)
+ area->y = 0 ;
+
+ if (area->y > info->var.yres)
+ area->y = info->var.yres ;
+
+ //printk("REDRAW IOCTL %d %d %d %d\n", area->x, area->y, area->w, area->h);
+
+ image_blit(dev, area->x, area->y, area->w, area->h, info->screen_base);
+ return 0 ;
+}
+
+
+// taken from vesafb
+
+static int dlfb_setcolreg(unsigned regno, unsigned red, unsigned green,
+ unsigned blue, unsigned transp,
+ struct fb_info *info)
+{
+ int err = 0;
+
+ if (regno >= info->cmap.len)
+ return 1;
+
+ if (regno < 16) {
+ if (info->var.red.offset == 10) {
+ /* 1:5:5:5 */
+ ((u32*) (info->pseudo_palette))[regno] =
+ ((red & 0xf800) >> 1) |
+ ((green & 0xf800) >> 6) |
+ ((blue & 0xf800) >> 11);
+ } else {
+ /* 0:5:6:5 */
+ ((u32*) (info->pseudo_palette))[regno] =
+ ((red & 0xf800) ) |
+ ((green & 0xfc00) >> 5) |
+ ((blue & 0xf800) >> 11);
+ }
+ }
+
+ return err;
+}
+
+static struct fb_ops dlfb_ops = {
+
+ .fb_setcolreg = dlfb_setcolreg,
+ .fb_fillrect = dlfb_fillrect,
+ .fb_copyarea = dlfb_copyarea,
+ .fb_imageblit = dlfb_imageblit,
+ .fb_mmap = dlfb_mmap,
+ .fb_ioctl = dlfb_ioctl,
+};
+
+static int dlfb_probe(struct usb_interface *interface, const struct usb_device_id *id)
+{
+ struct dlfb_data *dev_info ;
+ struct fb_info *info;
+ int i ;
+
+ int ret ;
+ char rbuf[4] ;
+
+
+
+ dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL);
+ if (dev_info == NULL) {
+ printk("cannot allocate dev_info structure.\n");
+ return -ENOMEM;
+ }
+
+ mutex_init(&dev_info->bulk_mutex);
+
+ dev_info->udev = usb_get_dev(interface_to_usbdev(interface));
+ dev_info->interface = interface;
+
+ printk("DisplayLink device attached\n");
+
+ // add framebuffer info to usb interface
+ usb_set_intfdata (interface, dev_info);
+
+
+ dev_info->buf = kmalloc(BUF_SIZE , GFP_KERNEL); //usb_buffer_alloc(dev_info->udev, BUF_SIZE , GFP_KERNEL, &dev_info->tx_urb->transfer_dma);
+
+ if (dev_info->buf == NULL) {
+ printk("unable to allocate memory for dlfb commands\n");
+ goto out;
+ }
+ dev_info->bufend = dev_info->buf + BUF_SIZE ;
+
+
+ ret = usb_control_msg(dev_info->udev, usb_rcvctrlpipe(dev_info->udev, 0), (0x06), (0x80 | (0x02 << 5)), 0, 0, rbuf, 4, 0) ;
+ printk("ret control msg 0: %d %x%x%x%x\n", ret, rbuf[0], rbuf[1], rbuf[2], rbuf[3]);
+
+ for(i=0;i<128;i++) {
+ ret = usb_control_msg(dev_info->udev, usb_rcvctrlpipe(dev_info->udev, 0), (0x02), (0x80 | (0x02 << 5)), i << 8, 0xA1, rbuf, 2, 0) ;
+ //printk("ret control msg edid %d: %d [%d]\n",i, ret, rbuf[1]);
+ dev_info->edid[i] = rbuf[1];
+ }
+
+ info = framebuffer_alloc( sizeof(u32) *256, &dev_info->udev->dev);
+
+ if (!info) {
+ printk("non posso allocare il framebuffer displaylink");
+ goto out;
+ }
+
+ fb_parse_edid(dev_info->edid, &info->var);
+
+ printk("EDID XRES %d YRES %d\n", info->var.xres, info->var.yres);
+
+ if (dlfb_set_video_mode(dev_info, info->var.xres, info->var.yres) != 0) {
+ goto out;
+ }
+
+ printk("found valid mode...\n");
+
+ info->pseudo_palette = info->par;
+ info->par = dev_info ;
+
+ dev_info->info = info ;
+
+ info->flags = FBINFO_DEFAULT | FBINFO_READS_FAST | FBINFO_HWACCEL_IMAGEBLIT | FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT ;
+ info->fbops = &dlfb_ops;
+ info->screen_base = rvmalloc(dev_info->screen_size);
+
+ if (info->screen_base == NULL) {
+ printk("cannot allocate framebuffer virtual memory of %d bytes\n", dev_info->screen_size);
+ goto out0 ;
+ }
+
+ printk("screen base allocated !!!\n");
+ //info->var = dev_info->si;
+
+ info->var.bits_per_pixel = 16;
+ info->var.activate = FB_ACTIVATE_TEST ;
+ info->var.vmode = FB_VMODE_NONINTERLACED;
+
+ info->var.red.offset = 11 ;
+ info->var.red.length = 5 ;
+ info->var.red.msb_right = 0 ;
+
+ info->var.green.offset = 5 ;
+ info->var.green.length = 6 ;
+ info->var.green.msb_right = 0 ;
+
+ info->var.blue.offset = 0 ;
+ info->var.blue.length = 5 ;
+ info->var.blue.msb_right = 0 ;
+
+ //info->var.pixclock = (10000000 / FB_W * 1000 / FB_H)/2 ;
+
+ info->fix.smem_start = (unsigned long) info->screen_base;
+ info->fix.smem_len = PAGE_ALIGN (dev_info->screen_size) ;
+ memcpy(info->fix.id,"DisplayLink FB",14);
+ info->fix.type = FB_TYPE_PACKED_PIXELS ;
+ info->fix.visual = FB_VISUAL_TRUECOLOR ;
+ info->fix.accel = info->flags ;
+ info->fix.line_length = dev_info->line_length ;
+
+ if (fb_alloc_cmap(&info->cmap, 256, 0)<0) {
+ goto out1 ;
+ }
+
+ printk("colormap allocated\n");
+ if (register_framebuffer(info) < 0){
+ goto out2;
+ }
+
+ draw_rect(dev_info, 0, 0, dev_info->info->var.xres, dev_info->info->var.yres, 0x30, 0xff, 0x30) ;
+
+ return 0 ;
+
+out2:
+ fb_dealloc_cmap(&info->cmap);
+out1:
+ rvfree(info->screen_base, dev_info->screen_size);
+out0:
+ framebuffer_release(info);
+out:
+ usb_set_intfdata (interface, NULL);
+ usb_put_dev(dev_info->udev);
+ kfree(dev_info);
+ return -ENOMEM;
+
+}
+
+static void dlfb_disconnect(struct usb_interface *interface)
+{
+ struct dlfb_data *dev_info = usb_get_intfdata (interface);
+
+ if (dev_info->info) {
+ unregister_framebuffer(dev_info->info);
+ fb_dealloc_cmap(&dev_info->info->cmap);
+ rvfree(dev_info->info->screen_base, dev_info->screen_size);
+ framebuffer_release(dev_info->info);
+ }
+
+ usb_set_intfdata(interface, NULL);
+ usb_put_dev(dev_info->udev);
+ kfree(dev_info);
+
+ printk("DisplayLink device disconnected\n");
+}
+
+static struct usb_driver dlfb_driver = {
+ .name = "udlfb",
+ .probe = dlfb_probe,
+ .disconnect = dlfb_disconnect,
+ .id_table = id_table,
+};
+
+static int __init dlfb_init(void)
+{
+ int res;
+
+
+ dlfb_init_modes();
+
+ res = usb_register(&dlfb_driver);
+ if (res)
+ err("usb_register failed. Error number %d", res);
+
+ printk("VMODES initialized\n");
+
+ return res;
+}
+
+
+static void __exit dlfb_exit(void)
+{
+ usb_deregister(&dlfb_driver);
+}
+
+module_init(dlfb_init);
+module_exit(dlfb_exit);
+
+MODULE_AUTHOR("Roberto De Ioris <roberto@unbit.it>");
+MODULE_DESCRIPTION(DRIVER_VERSION);
+MODULE_LICENSE("GPL");
diff --git a/recipes/libdlo/libdlo_git.bb b/recipes/libdlo/libdlo_git.bb
new file mode 100644
index 0000000000..290dcf1aca
--- /dev/null
+++ b/recipes/libdlo/libdlo_git.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Library for controlling displaylink based usb devices"
+LICENSE = "LGPLv2"
+
+SRCREV = "d50f082699787c3c6531df431b35c9ad52a82667"
+PV = "0.1.0"
+PR_append = "+gitr${SRCREV}"
+
+SRC_URI = "git://anongit.freedesktop.org/libdlo;protocol=git"
+S = "${WORKDIR}/git"
+
+inherit lib_package autotools_stage
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_configure_prepend() {
+ sed -i -e s:63:61: configure.ac
+}
+
+do_install_append() {
+ mv ${D}${bindir}/test1 ${D}${bindir}/libdlo-test1
+}
+
diff --git a/recipes/samba/files/tdb.pc b/recipes/samba/files/tdb.pc
new file mode 100644
index 0000000000..6307a20a03
--- /dev/null
+++ b/recipes/samba/files/tdb.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: tdb
+Description: A trivial database
+Version: 1.1.2
+Libs: -L${libdir} -ltdb
+Cflags: -I${includedir}
+URL: http://tdb.samba.org/
diff --git a/recipes/samba/files/tdbheaderfix.patch b/recipes/samba/files/tdbheaderfix.patch
new file mode 100644
index 0000000000..e37c9b0d5c
--- /dev/null
+++ b/recipes/samba/files/tdbheaderfix.patch
@@ -0,0 +1,14 @@
+Index: source/lib/tdb/include/tdb.h
+===================================================================
+--- source.orig/lib/tdb/include/tdb.h 2009-05-17 17:42:41.000000000 +0100
++++ source/lib/tdb/include/tdb.h 2009-05-17 17:42:46.000000000 +0100
+@@ -1,6 +1,9 @@
+ #ifndef __TDB_H__
+ #define __TDB_H__
+
++#include <signal.h>
++
++
+ /*
+ Unix SMB/CIFS implementation.
+
diff --git a/recipes/samba/samba.inc b/recipes/samba/samba.inc
index 36de08beca..ec21ed70b0 100644
--- a/recipes/samba/samba.inc
+++ b/recipes/samba/samba.inc
@@ -6,6 +6,7 @@ SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
file://volatiles.03_samba \
file://smb.conf \
file://init \
+ file://tdb.pc \
"
S = "${WORKDIR}/samba-${PV}/source"
@@ -55,6 +56,8 @@ do_compile () {
}
do_install_append() {
+ install -d ${D}${libdir}/pkgconfig/
+ cp ${WORKDIR}/tdb.pc ${D}${libdir}/pkgconfig/
mv ${D}${libdir}/libsmbclient.so ${D}${libdir}/libsmbclient.so.0 || true
ln -sf libsmbclient.so.0 ${D}${libdir}/libsmbclient.so
mkdir -p ${D}${base_sbindir}
@@ -83,4 +86,7 @@ do_stage() {
oe_libinstall -C bin -a -so libtdb ${STAGING_LIBDIR}
oe_libinstall -C bin -a -so libtalloc ${STAGING_LIBDIR}
oe_libinstall -C bin -so libwbclient ${STAGING_LIBDIR}
+ install -d ${STAGING_LIBDIR}/pkgconfig/
+ install -m 0644 ${WORKDIR}/tdb.pc ${STAGING_LIBDIR}/pkgconfig/
+ install -m 0644 ${S}/lib/tdb/include/*.h ${STAGING_INCDIR}/
}
diff --git a/recipes/samba/samba_3.3.0.bb b/recipes/samba/samba_3.3.0.bb
index c561d95524..87a7c5e7f7 100644
--- a/recipes/samba/samba_3.3.0.bb
+++ b/recipes/samba/samba_3.3.0.bb
@@ -11,9 +11,9 @@ DEFAULT_PREFERENCE = "-1"
SRC_URI += "file://configure-3.3.0.patch;patch=1 \
file://config-h.patch;patch=1 \
file://mtab.patch;patch=1 \
- "
+ file://tdbheaderfix.patch;patch=1 "
-PR = "r2"
+PR = "r3"
EXTRA_OECONF += "\
SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
diff --git a/recipes/usb-gadget-mode/files/omap3-pandora/usb-gadget.conf b/recipes/usb-gadget-mode/files/omap3-pandora/usb-gadget.conf
new file mode 100644
index 0000000000..35ff0d4fa9
--- /dev/null
+++ b/recipes/usb-gadget-mode/files/omap3-pandora/usb-gadget.conf
@@ -0,0 +1,3 @@
+USB_MODE="composite"
+MODULE_OPTIONS=""
+
diff --git a/recipes/usb-gadget-mode/files/usb-gadget b/recipes/usb-gadget-mode/files/usb-gadget
index c9ff2f0485..0e6b39f845 100755
--- a/recipes/usb-gadget-mode/files/usb-gadget
+++ b/recipes/usb-gadget-mode/files/usb-gadget
@@ -26,7 +26,7 @@ go() {
networking) setup_usb g_ether "$MODULE_OPTIONS" ;;
zero) setup_usb g_zero "$MODULE_OPTIONS" ;;
midi) setup_usb g_midi "$MODULE_OPTIONS" ;;
- printer setup_usb g_printer "$MODULE_OPTIONS" ;;
+ printer) setup_usb g_printer "$MODULE_OPTIONS" ;;
gadgetfs) setup_usb gadgetfs "$MODULE_OPTIONS" ;;
composite) setup_usb g_cdc "$MODULE_OPTIONS" ;;
storage) setup_usb g_file_storage "$MODULE_OPTIONS" ;;
diff --git a/recipes/usb-gadget-mode/usb-gadget-mode.bb b/recipes/usb-gadget-mode/usb-gadget-mode.bb
index cc00a887fa..e6e8e51097 100644
--- a/recipes/usb-gadget-mode/usb-gadget-mode.bb
+++ b/recipes/usb-gadget-mode/usb-gadget-mode.bb
@@ -9,7 +9,7 @@ DESCRIPTION = "Manage the default USB gadget mode"
SECTION = "console/network"
LICENSE = "GPL"
PV = "0.0.2"
-PR = "r2"
+PR = "r3"
SRC_URI = "\
file://usb-gadget.conf \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-28 19:22:53 +0000