Remove obsolete PNPX support.
AFAICT this has been abandoned by Microsoft.
This commit is contained in:
Justin Maggard
parent
02b6085380
commit
1f46b53030
@ -575,7 +575,6 @@ AC_ARG_ENABLE(readynas,
|
||||
AC_DEFINE([NETGEAR],[1],[Define to 1 if you want to enable generic NETGEAR device support])
|
||||
AC_DEFINE([READYNAS],[1],[Define to 1 if you want to enable NETGEAR ReadyNAS support])
|
||||
AC_DEFINE([TIVO_SUPPORT], 1, [Define to 1 if you want to enable TiVo support])
|
||||
AC_DEFINE([PNPX],[5],[Define to 5 if you want to enable NETGEAR ReadyNAS PnP-X support])
|
||||
AC_DEFINE_UNQUOTED([OS_URL],"http://www.readynas.com/")
|
||||
AC_DEFINE_UNQUOTED([ROOTDEV_MANUFACTURERURL],"http://www.netgear.com/")
|
||||
AC_DEFINE_UNQUOTED([ROOTDEV_MANUFACTURER],"NETGEAR")
|
||||
|
||||
24
minidlna.c
24
minidlna.c
@ -238,30 +238,6 @@ getfriendlyname(char *buf, int len)
|
||||
}
|
||||
}
|
||||
fclose(info);
|
||||
#if PNPX
|
||||
memcpy(pnpx_hwid+4, "01F2", 4);
|
||||
if (strcmp(modelnumber, "NVX") == 0)
|
||||
memcpy(pnpx_hwid+17, "0101", 4);
|
||||
else if (strcmp(modelnumber, "Pro") == 0 ||
|
||||
strcmp(modelnumber, "Pro 6") == 0 ||
|
||||
strncmp(modelnumber, "Ultra 6", 7) == 0)
|
||||
memcpy(pnpx_hwid+17, "0102", 4);
|
||||
else if (strcmp(modelnumber, "Pro 2") == 0 ||
|
||||
strncmp(modelnumber, "Ultra 2", 7) == 0)
|
||||
memcpy(pnpx_hwid+17, "0103", 4);
|
||||
else if (strcmp(modelnumber, "Pro 4") == 0 ||
|
||||
strncmp(modelnumber, "Ultra 4", 7) == 0)
|
||||
memcpy(pnpx_hwid+17, "0104", 4);
|
||||
else if (strcmp(modelnumber+1, "100") == 0)
|
||||
memcpy(pnpx_hwid+17, "0105", 4);
|
||||
else if (strcmp(modelnumber+1, "200") == 0)
|
||||
memcpy(pnpx_hwid+17, "0106", 4);
|
||||
/* 0107 = Stora */
|
||||
else if (strcmp(modelnumber, "Duo v2") == 0)
|
||||
memcpy(pnpx_hwid+17, "0108", 4);
|
||||
else if (strcmp(modelnumber, "NV+ v2") == 0)
|
||||
memcpy(pnpx_hwid+17, "0109", 4);
|
||||
#endif
|
||||
#else
|
||||
char * logname;
|
||||
logname = getenv("LOGNAME");
|
||||
|
||||
@ -40,9 +40,6 @@ char modelname[] = "MiniDLNA";
|
||||
char modelnumber[] = "1";
|
||||
char presentationurl[] = "http://192.168.0.1:8080/";
|
||||
unsigned int updateID = 0;
|
||||
#if PNPX
|
||||
char pnpx_hwid[] = "VEN_01F2&DEV_0101&REV_01 VEN_0033&DEV_0001&REV_01";
|
||||
#endif
|
||||
|
||||
int getifaddr(const char * ifname, char * buf, int len)
|
||||
{
|
||||
|
||||
@ -115,29 +115,17 @@ static const char xmlver[] =
|
||||
static const char root_service[] =
|
||||
"scpd xmlns=\"urn:schemas-upnp-org:service-1-0\"";
|
||||
static const char root_device[] =
|
||||
"root xmlns=\"urn:schemas-upnp-org:device-1-0\""
|
||||
#if PNPX
|
||||
" xmlns:pnpx=\"http://schemas.microsoft.com/windows/pnpx/2005/11\""
|
||||
" xmlns:df=\"http://schemas.microsoft.com/windows/2008/09/devicefoundation\""
|
||||
#endif
|
||||
;
|
||||
"root xmlns=\"urn:schemas-upnp-org:device-1-0\"";
|
||||
|
||||
/* root Description of the UPnP Device */
|
||||
static const struct XMLElt rootDesc[] =
|
||||
{
|
||||
{root_device, INITHELPER(1,2)},
|
||||
{"specVersion", INITHELPER(3,2)},
|
||||
{"device", INITHELPER(5,(14+PNPX))},
|
||||
{"device", INITHELPER(5,(14))},
|
||||
{"/major", "1"},
|
||||
{"/minor", "0"},
|
||||
{"/deviceType", "urn:schemas-upnp-org:device:MediaServer:1"},
|
||||
#if PNPX == 5
|
||||
{"/pnpx:X_hardwareId", pnpx_hwid},
|
||||
{"/pnpx:X_compatibleId", "MS_DigitalMediaDeviceClass_DMS_V001"},
|
||||
{"/pnpx:X_deviceCategory", "MediaDevices"},
|
||||
{"/df:X_deviceCategory", "Multimedia.DMS"},
|
||||
{"/microsoft:magicPacketWakeSupported xmlns:microsoft=\"urn:schemas-microsoft-com:WMPNSS-1-0\"", "0"},
|
||||
#endif
|
||||
{"/friendlyName", friendly_name}, /* required */
|
||||
{"/manufacturer", ROOTDEV_MANUFACTURER}, /* required */
|
||||
{"/manufacturerURL", ROOTDEV_MANUFACTURERURL}, /* optional */
|
||||
@ -149,12 +137,12 @@ static const struct XMLElt rootDesc[] =
|
||||
{"/UDN", uuidvalue}, /* required */
|
||||
{"/dlna:X_DLNADOC xmlns:dlna=\"urn:schemas-dlna-org:device-1-0\"", "DMS-1.50"},
|
||||
{"/presentationURL", presentationurl}, /* recommended */
|
||||
{"iconList", INITHELPER((19+PNPX),4)},
|
||||
{"serviceList", INITHELPER((43+PNPX),3)},
|
||||
{"icon", INITHELPER((23+PNPX),5)},
|
||||
{"icon", INITHELPER((28+PNPX),5)},
|
||||
{"icon", INITHELPER((33+PNPX),5)},
|
||||
{"icon", INITHELPER((38+PNPX),5)},
|
||||
{"iconList", INITHELPER((19),4)},
|
||||
{"serviceList", INITHELPER((43),3)},
|
||||
{"icon", INITHELPER((23),5)},
|
||||
{"icon", INITHELPER((28),5)},
|
||||
{"icon", INITHELPER((33),5)},
|
||||
{"icon", INITHELPER((38),5)},
|
||||
{"/mimetype", "image/png"},
|
||||
{"/width", "48"},
|
||||
{"/height", "48"},
|
||||
@ -175,9 +163,9 @@ static const struct XMLElt rootDesc[] =
|
||||
{"/height", "120"},
|
||||
{"/depth", "24"},
|
||||
{"/url", "/icons/lrg.jpg"},
|
||||
{"service", INITHELPER((46+PNPX),5)},
|
||||
{"service", INITHELPER((51+PNPX),5)},
|
||||
{"service", INITHELPER((56+PNPX),5)},
|
||||
{"service", INITHELPER((46),5)},
|
||||
{"service", INITHELPER((51),5)},
|
||||
{"service", INITHELPER((56),5)},
|
||||
{"/serviceType", "urn:schemas-upnp-org:service:ContentDirectory:1"},
|
||||
{"/serviceId", "urn:upnp-org:serviceId:ContentDirectory"},
|
||||
{"/controlURL", CONTENTDIRECTORY_CONTROLURL},
|
||||
@ -584,10 +572,10 @@ genRootDescSamsung(int * len)
|
||||
memcpy(str, xmlver, *len + 1);
|
||||
/* Replace the optional modelURL and manufacturerURL fields with Samsung foo */
|
||||
memcpy(&samsungRootDesc, &rootDesc, sizeof(rootDesc));
|
||||
samsungRootDesc[8+PNPX].eltname = "/sec:ProductCap";
|
||||
samsungRootDesc[8+PNPX].data = "smi,DCM10,getMediaInfo.sec,getCaptionInfo.sec";
|
||||
samsungRootDesc[12+PNPX].eltname = "/sec:X_ProductCap";
|
||||
samsungRootDesc[12+PNPX].data = "smi,DCM10,getMediaInfo.sec,getCaptionInfo.sec";
|
||||
samsungRootDesc[8].eltname = "/sec:ProductCap";
|
||||
samsungRootDesc[8].data = "smi,DCM10,getMediaInfo.sec,getCaptionInfo.sec";
|
||||
samsungRootDesc[12].eltname = "/sec:X_ProductCap";
|
||||
samsungRootDesc[12].data = "smi,DCM10,getMediaInfo.sec,getCaptionInfo.sec";
|
||||
str = genXML(str, len, &tmplen, samsungRootDesc);
|
||||
str[*len] = '\0';
|
||||
return str;
|
||||
|
||||
@ -66,9 +66,6 @@ char uuidvalue[] = "uuid:00000000-0000-0000-0000-000000000000";
|
||||
char modelname[MODELNAME_MAX_LEN] = ROOTDEV_MODELNAME;
|
||||
char modelnumber[MODELNUMBER_MAX_LEN] = MINIDLNA_VERSION;
|
||||
char serialnumber[SERIALNUMBER_MAX_LEN] = "00000000";
|
||||
#if PNPX
|
||||
char pnpx_hwid[] = "VEN_0000&DEV_0000&REV_01 VEN_0033&DEV_0001&REV_01";
|
||||
#endif
|
||||
|
||||
/* presentation url :
|
||||
* http://nnn.nnn.nnn.nnn:ppppp/ => max 30 bytes including terminating 0 */
|
||||
|
||||
@ -75,10 +75,6 @@
|
||||
#endif
|
||||
#define THISORNUL(s) (s ? s : "")
|
||||
|
||||
#ifndef PNPX
|
||||
#define PNPX 0
|
||||
#endif
|
||||
|
||||
#define RESOURCE_PROTOCOL_INFO_VALUES \
|
||||
"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_TN," \
|
||||
"http-get:*:image/jpeg:DLNA.ORG_PN=JPEG_SM," \
|
||||
@ -213,10 +209,6 @@ extern char serialnumber[];
|
||||
#define PRESENTATIONURL_MAX_LEN 64
|
||||
extern char presentationurl[];
|
||||
|
||||
#if PNPX
|
||||
extern char pnpx_hwid[];
|
||||
#endif
|
||||
|
||||
/* lan addresses */
|
||||
extern int n_lan_addr;
|
||||
extern struct lan_addr_s lan_addr[];
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user