diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-10 17:06:40 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-12-10 17:06:40 +0000 |
| commit | 275e64dd87da798fc6758b6ec5d72f5525ace25c (patch) | |
| tree | 5ccc3bdd9ab83295bdbc65dd767372c7051ddcd5 /wcte12xp | |
| parent | 7672aee40409d2053dc953a0b3b0eea08019f23d (diff) | |
fix firmware object names for non-hotplug firmware for wctc4xxp, wcte12xp and wctdm24xxp
add VPM reporting in 'devicetype' to wcte12xp
fix VPM reporting in 'devicetype' for wctdm24xxp so it actually works
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3388 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wcte12xp')
| -rw-r--r-- | wcte12xp/base.c | 2 | ||||
| -rw-r--r-- | wcte12xp/vpmadt032.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/wcte12xp/base.c b/wcte12xp/base.c index 856e5e0..5990892 100644 --- a/wcte12xp/base.c +++ b/wcte12xp/base.c @@ -1317,6 +1317,8 @@ static int t1_software_init(struct t1 *wc) snprintf(wc->span.desc, sizeof(wc->span.desc) - 1, "%s Card %d", wc->variety, wc->num); wc->span.manufacturer = "Digium"; strncpy(wc->span.devicetype, wc->variety, sizeof(wc->span.devicetype) - 1); + if (wc->vpm150m) + strncat(wc->span.devicetype, " with VPMADT032", sizeof(wc->span.devicetype) - 1); snprintf(wc->span.location, sizeof(wc->span.location) - 1, "PCI Bus %02d Slot %02d", wc->dev->bus->number, PCI_SLOT(wc->dev->devfn) + 1); diff --git a/wcte12xp/vpmadt032.c b/wcte12xp/vpmadt032.c index bb55202..e3377bd 100644 --- a/wcte12xp/vpmadt032.c +++ b/wcte12xp/vpmadt032.c @@ -652,8 +652,8 @@ void t1_vpm150m_init(struct t1 *wc) { struct firmware embedded_firmware; const struct firmware *firmware = &embedded_firmware; #if !defined(HOTPLUG_FIRMWARE) - extern void _binary_vpmadt032_bin_size; - extern u8 _binary_vpmadt032_bin_start[]; + extern void _binary_zaptel_fw_vpmadt032_bin_size; + extern u8 _binary_zaptel_fw_vpmadt032_bin_start[]; #else static const char vpmadt032_firmware[] = "zaptel-fw-vpmadt032.bin"; #endif @@ -872,8 +872,8 @@ void t1_vpm150m_init(struct t1 *wc) { return; } #else - embedded_firmware.data = _binary_vpmadt032_bin_start; - embedded_firmware.size = (size_t) &_binary_vpmadt032_bin_size; + embedded_firmware.data = _binary_zaptel_fw_vpmadt032_bin_start; + embedded_firmware.size = (size_t) &_binary_zaptel_fw_vpmadt032_bin_size; #endif fw.fw = firmware; fw.offset = 0; |