diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-19 14:20:41 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-12-19 14:20:41 +0000 |
commit | eba4f554cc53325bb37f0cca97a5dfd024582271 (patch) | |
tree | b258b07bc27d8543641d19753ac7237a6fc2bd61 /main/dahdi-linux-vanilla/zaphfc-dahdi-2.6.0.patch | |
parent | 93a228295b795ffdeea3e7c65525c0c191751a48 (diff) | |
download | aports-eba4f554cc53325bb37f0cca97a5dfd024582271.tar.bz2 aports-eba4f554cc53325bb37f0cca97a5dfd024582271.tar.xz |
*/*-vanilla: remove linux-vanilla. replaced by linux-lts
Users should use linux-lts. We remove linux-vanilla to reduce
reduce the maintenance burden.
Diffstat (limited to 'main/dahdi-linux-vanilla/zaphfc-dahdi-2.6.0.patch')
-rw-r--r-- | main/dahdi-linux-vanilla/zaphfc-dahdi-2.6.0.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/main/dahdi-linux-vanilla/zaphfc-dahdi-2.6.0.patch b/main/dahdi-linux-vanilla/zaphfc-dahdi-2.6.0.patch deleted file mode 100644 index 5a77438462..0000000000 --- a/main/dahdi-linux-vanilla/zaphfc-dahdi-2.6.0.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- dahdi-linux-2.6.0/drivers/dahdi/zaphfc.c.orig 2012-01-25 14:08:58.000000000 +0200 -+++ dahdi-linux-2.6.0/drivers/dahdi/zaphfc.c 2012-01-25 14:29:26.000000000 +0200 -@@ -122,7 +122,10 @@ - } - spin_unlock_irqrestore(&hfctmp->lock,flags); - if (hfctmp->ztdev != NULL) { -- dahdi_unregister(&hfctmp->ztdev->span); -+ if (hfctmp->ztdev->ddev) { -+ dahdi_unregister_device(hfctmp->ztdev->ddev); -+ dahdi_free_device(hfctmp->ztdev->ddev); -+ } - vfree(hfctmp->ztdev); - printk(KERN_INFO "unregistered from DAHDI.\n"); - } -@@ -680,9 +683,15 @@ - struct hfc_card *hfctmp = zthfc->card; - int i; - -+ zthfc->ddev = dahdi_create_device(); -+ if (!zthfc->ddev) -+ return -ENOMEM; -+ -+ zthfc->ddev->manufacturer = "HFC"; -+ - memset(&zthfc->span, 0x0, sizeof(struct dahdi_span)); // you never can tell... - -- sprintf(zthfc->span.name, "ZTHFC%d", hfc_dev_count + 1); -+ sprintf(zthfc->span.name, "ZTHFC/%d", hfc_dev_count + 1); - if (hfctmp->regs.nt_mode == 1) { - sprintf(zthfc->span.desc, "HFC-S PCI A ISDN card %d [NT]", hfc_dev_count + 1); - } else { -@@ -702,13 +711,14 @@ - - for (i = 0; i < zthfc->span.channels; i++) { - memset(&(zthfc->chans[i]), 0x0, sizeof(struct dahdi_chan)); -- sprintf(zthfc->chans[i].name, "ZTHFC%d/%d/%d", hfc_dev_count + 1,0,i + 1); -+ sprintf(zthfc->chans[i].name, "ZTHFC/%d/%d/%d", hfc_dev_count + 1,0,i + 1); - zthfc->chans[i].pvt = zthfc; - zthfc->chans[i].sigcap = DAHDI_SIG_EM | DAHDI_SIG_CLEAR | DAHDI_SIG_FXSLS | DAHDI_SIG_FXSGS | DAHDI_SIG_FXSKS | DAHDI_SIG_FXOLS | DAHDI_SIG_FXOGS | DAHDI_SIG_FXOKS | DAHDI_SIG_CAS | DAHDI_SIG_SF; - zthfc->chans[i].chanpos = i + 1; - } - -- if (dahdi_register(&zthfc->span,0)) { -+ list_add_tail(&zthfc->span.device_node, &zthfc->ddev->spans); -+ if (dahdi_register_device(zthfc->ddev, &zthfc->card->pcidev->dev)) { - printk(KERN_CRIT "unable to register DAHDI device!\n"); - return -1; - } ---- dahdi-linux-2.6.0/drivers/dahdi/zaphfc.h.orig 2012-01-25 14:23:37.000000000 +0200 -+++ dahdi-linux-2.6.0/drivers/dahdi/zaphfc.h 2012-01-25 14:24:33.000000000 +0200 -@@ -339,6 +339,7 @@ - struct dahdi_span span; - struct dahdi_chan chans[3]; - struct dahdi_chan *_chans[3]; -+ struct dahdi_device *ddev; - struct hfc_card *card; - } dahdi_hfc; - |