Guest User

qdsp5.u8110-u8120.diff

a guest
Jan 12th, 2012
47
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -urw kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_amrnb.c kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_amrnb.c
  2. --- kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_amrnb.c 2010-05-03 22:35:15.000000000 -0400
  3. +++ kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_amrnb.c 2010-09-01 15:41:30.000000000 -0400
  4. @@ -44,8 +44,6 @@
  5. #include <linux/msm_audio.h>
  6. #include "audmgr.h"
  7.  
  8. -#include "../socinfo.h"
  9. -
  10. #include <mach/qdsp5/qdsp5audppcmdi.h>
  11. #include <mach/qdsp5/qdsp5audppmsg.h>
  12. #include <mach/qdsp5/qdsp5audplaycmdi.h>
  13. @@ -203,12 +201,9 @@
  14. cfg.tx_rate = RPC_AUD_DEF_SAMPLE_RATE_NONE;
  15. cfg.rx_rate = RPC_AUD_DEF_SAMPLE_RATE_48000;
  16. cfg.def_method = RPC_AUD_DEF_METHOD_PLAYBACK;
  17. - if (cpu_is_msm7x25())
  18. - cfg.codec = RPC_AUD_DEF_CODEC_VOC_AMR;
  19. - else
  20. cfg.codec = RPC_AUD_DEF_CODEC_AMR_NB;
  21. -
  22. cfg.snd_method = RPC_SND_METHOD_MIDI;
  23. +
  24. rc = audmgr_enable(&audio->audmgr, &cfg);
  25. if (rc < 0)
  26. return rc;
  27. diff -urw kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_evrc.c kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_evrc.c
  28. --- kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_evrc.c 2010-05-03 22:35:24.000000000 -0400
  29. +++ kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_evrc.c 2010-09-01 15:41:30.000000000 -0400
  30. @@ -43,8 +43,6 @@
  31. #include <mach/qdsp5/qdsp5audplaycmdi.h>
  32. #include <mach/qdsp5/qdsp5audplaymsg.h>
  33.  
  34. -#include "../socinfo.h"
  35. -
  36. /* Hold 30 packets of 24 bytes each and 14 bytes of meta in */
  37. #define BUFSZ 734
  38. #define DMASZ (BUFSZ * 2)
  39. @@ -194,12 +192,9 @@
  40. cfg.tx_rate = RPC_AUD_DEF_SAMPLE_RATE_NONE;
  41. cfg.rx_rate = RPC_AUD_DEF_SAMPLE_RATE_48000;
  42. cfg.def_method = RPC_AUD_DEF_METHOD_PLAYBACK;
  43. - if (cpu_is_msm7x25())
  44. - cfg.codec = RPC_AUD_DEF_CODEC_VOC_EVRC;
  45. - else
  46. cfg.codec = RPC_AUD_DEF_CODEC_EVRC;
  47. -
  48. cfg.snd_method = RPC_SND_METHOD_MIDI;
  49. +
  50. rc = audmgr_enable(&audio->audmgr, &cfg);
  51. if (rc < 0)
  52. return rc;
  53. diff -urw kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_qcelp.c kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_qcelp.c
  54. --- kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_qcelp.c 2010-05-03 22:35:37.000000000 -0400
  55. +++ kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/audio_qcelp.c 2010-09-01 15:41:30.000000000 -0400
  56. @@ -42,8 +42,6 @@
  57. #include <mach/qdsp5/qdsp5audplaycmdi.h>
  58. #include <mach/qdsp5/qdsp5audplaymsg.h>
  59.  
  60. -#include "../socinfo.h"
  61. -
  62. #include "audmgr.h"
  63.  
  64. #define BUFSZ 1094 /* QCELP 13K Hold 600ms packet data = 36 * 30 and
  65. @@ -191,11 +189,9 @@
  66. cfg.tx_rate = RPC_AUD_DEF_SAMPLE_RATE_NONE;
  67. cfg.rx_rate = RPC_AUD_DEF_SAMPLE_RATE_48000;
  68. cfg.def_method = RPC_AUD_DEF_METHOD_PLAYBACK;
  69. - if (cpu_is_msm7x25())
  70. - cfg.codec = RPC_AUD_DEF_CODEC_VOC_13K;
  71. - else
  72. cfg.codec = RPC_AUD_DEF_CODEC_13K;
  73. cfg.snd_method = RPC_SND_METHOD_MIDI;
  74. +
  75. rc = audmgr_enable(&audio->audmgr, &cfg);
  76. if (rc < 0)
  77. return rc;
  78. diff -urw kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/snd.c kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/snd.c
  79. --- kernel-2.6.29-U8110-Eclair-ORIG/arch/arm/mach-msm/qdsp5/snd.c 2010-05-03 22:35:43.000000000 -0400
  80. +++ kernel-2.6.29-U8220-Eclair-ORIG/arch/arm/mach-msm/qdsp5/snd.c 2010-09-01 15:41:30.000000000 -0400
  81. @@ -195,12 +195,7 @@
  82.  
  83. vmsg.args.device = cpu_to_be32(vol.device);
  84. vmsg.args.method = cpu_to_be32(vol.method);
  85. -#ifdef CONFIG_HUAWEI_KERNEL
  86. - if (vol.method != SND_METHOD_VOICE&&vol.method != SND_METHOD_MIDI) {
  87. -#else
  88. if (vol.method != SND_METHOD_VOICE) {
  89. -#endif
  90. -
  91. MM_ERR("set volume: invalid method\n");
  92. rc = -EINVAL;
  93. break;
RAW Paste Data

Adblocker detected! Please consider disabling it...

We've detected AdBlock Plus or some other adblocking software preventing Pastebin.com from fully loading.

We don't have any obnoxious sound, or popup ads, we actively block these annoying types of ads!

Please add Pastebin.com to your ad blocker whitelist or disable your adblocking software.

×