← Back to branch summary

~ubuntu-branches/ubuntu/karmic/linux-ports/karmic

« back to all changes in this revision

Viewing changes to drivers/isdn/gigaset/ev-layer.c

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich, Luke Yelavich, Michael Casadevall, Tim Gardner, Upstream Kernel Changes
  • Date: 2009-05-06 18:18:55 UTC
  • Revision ID: james.westby@ubuntu.com-20090506181855-t00baeevpnvd9o7a
Tags: 2.6.30-1.1
[ Luke Yelavich ]
* initial release for karmic
* SAUCE: rebase-ports - adjust for the karmic ports kernel
* SAUCE: rebase-ports - also remove abi dirs/files on rebase
* Update configs after rebase against mainline Jaunty tree
* [Config] Disable CONFIG_BLK_DEV_UB and CONFIG_USB_LIBUSUAL as per
  mainline jaunty
* forward-port patch to drbd for powerpc compilation
* [Config] disable CONFIG_LENOVO_SL_LAPTOP for i386 due to FTBFS
* add .o files found in arch/powerpc/lib to all powerpc kernel header
  packages
* [Config] enable CONFIG_DRM_I915_KMS for i386 as per karmic mainline

[ Michael Casadevall ]

* Disable kgdb on sparc64
* [sparc] [Config] Disable GPIO LEDS
* [ia64] Rename -ia64-generic to -ia64 in line with other architectures
* Correct kernel image path for sparc builds
* [hppa] Fix HPPA config files to build modules for all udebian

Rebase on top of karmic mainline 2.6.30-1.1

[ Tim Gardner ]

* [Config] armel: disable staging drivers, fixes FTBS
* [Config] armel imx51: Disable CONFIG_MTD_NAND_MXC, fixes FTBS

[ Upstream Kernel Changes ]

* mpt2sas: Change reset_type enum to avoid namespace collision.
  Submitted upstream.

* Initial release after rebasing against v2.6.30-rc3

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/isdn/gigaset/ev-layer.c
203
203
        {EV_TIMEOUT,  120,121, -1,                  0, 0, {ACT_FAILVER, ACT_INIT}},
204
204
        {RSP_ERROR,   120,121, -1,                  0, 0, {ACT_FAILVER, ACT_INIT}},
205
205
        {RSP_OK,      121,121, -1,                  0, 0, {ACT_GOTVER,  ACT_INIT}},
206
 
#if 0
207
 
        {EV_TIMEOUT,  120,121, -1,                130, 5, {ACT_FAILVER},   "^SGCI=1\r"},
208
 
        {RSP_ERROR,   120,121, -1,                130, 5, {ACT_FAILVER},   "^SGCI=1\r"},
209
 
        {RSP_OK,      121,121, -1,                130, 5, {ACT_GOTVER},    "^SGCI=1\r"},
210
 
 
211
 
        {RSP_OK,      130,130, -1,                  0, 0, {ACT_INIT}},
212
 
        {RSP_ERROR,   130,130, -1,                  0, 0, {ACT_FAILINIT}},
213
 
        {EV_TIMEOUT,  130,130, -1,                  0, 0, {ACT_FAILINIT}},
214
 
#endif
215
206
 
216
207
        /* leave dle mode */
217
208
        {RSP_INIT,      0,  0,SEQ_DLE0,           201, 5, {0},             "^SDLE=0\r"},
260
251
        {RSP_INIT,      0,  0,SEQ_NOCID,            0, 0, {ACT_ABORTCID}},
261
252
 
262
253
        /* reset */
263
 
#if 0
264
 
        {RSP_INIT,      0,  0,SEQ_SHUTDOWN,       503, 5, {0},             "^SGCI=0\r"},
265
 
        {RSP_OK,      503,503, -1,                504, 5, {0},             "Z\r"},
266
 
#endif
267
254
        {RSP_INIT,      0,  0,SEQ_SHUTDOWN,       504, 5, {0},             "Z\r"},
268
255
        {RSP_OK,      504,504, -1,                  0, 0, {ACT_SDOWN}},
269
256
        {RSP_ERROR,   501,599, -1,                  0, 0, {ACT_FAILSDOWN}},
391
378
};
392
379
 
393
380
 
394
 
#if 0
395
 
static struct reply_t tab_nocid[]= /* no dle mode */ //FIXME
396
 
{
397
 
        /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
398
 
 
399
 
        {RSP_ANY,      -1, -1, -1,                 -1,-1, ACT_WARN,         NULL},
400
 
        {RSP_LAST,0,0,0,0,0,0}
401
 
};
402
 
 
403
 
static struct reply_t tab_cid[] = /* no dle mode */ //FIXME
404
 
{
405
 
        /* resp_code, min_ConState, max_ConState, parameter, new_ConState, timeout, action, command */
406
 
 
407
 
        {RSP_ANY,      -1, -1, -1,                 -1,-1, ACT_WARN,         NULL},
408
 
        {RSP_LAST,0,0,0,0,0,0}
409
 
};
410
 
#endif
411
 
 
412
381
static const struct resp_type_t resp_type[] =
413
382
{
414
383
        /*{"",          RSP_EMPTY,      RT_NOTHING},*/
665
634
                                        dev_err(cs->dev, "out of memory\n");
666
635
                                ++curarg;
667
636
                        }
668
 
#ifdef CONFIG_GIGASET_DEBUG
669
 
                        if (!event->ptr)
670
 
                                gig_dbg(DEBUG_CMD, "string==NULL");
671
 
                        else
672
 
                                gig_dbg(DEBUG_CMD, "string==%s",
673
 
                                        (char *) event->ptr);
674
 
#endif
 
637
                        gig_dbg(DEBUG_CMD, "string==%s",
 
638
                                event->ptr ? (char *) event->ptr : "NULL");
675
639
                        break;
676
640
                case RT_ZCAU:
677
641
                        event->parameter = -1;
697
661
                                ++curarg;
698
662
                        } else
699
663
                                event->parameter = -1;
700
 
#ifdef CONFIG_GIGASET_DEBUG
701
664
                        gig_dbg(DEBUG_CMD, "parameter==%d", event->parameter);
702
 
#endif
703
665
                        break;
704
666
                }
705
667