Interne Storage-Devices werden nicht mehr ausgefiltert.

gfaqt.pro

@@ -1,5 +1,5 @@
 TEMPLATE = lib
-VERSION = 1.4
+VERSION = 1.5
 QT += qml quick core
 CONFIG -= app_bundle
 CONFIG += c++11 shared thread

src/qsysinfo.cpp

@@ -8,6 +8,8 @@
 
 #define _countof(a)							(sizeof(a) / sizeof(*a))
 
+#define _STG_DEV_DISPLAY_INTERNAL			1
+
 /////////////////////////////////////////////////////////////////////////////
 
 #define _OPT_STRING(s, o)					(*s ? s : o)
@@ -64,6 +66,12 @@ static const STG_DEV_ROLES g_roles[] =
 
 /////////////////////////////////////////////////////////////////////////////
 
+#if _STG_DEV_DISPLAY_INTERNAL
+static const bool g_bStgDevDisplayInternal = true;
+#else	//	_STG_DEV_DISPLAY_INTERNAL
+static const bool g_bStgDevDisplayInternal = false;
+#endif	//	_STG_DEV_DISPLAY_INTERNAL
+
 QGfaStgDevList::QGfaStgDevList(QObject *pParent) : 	QAbstractTableModel(pParent)
 {
 	memset(&m_stgDevShadowCpy, 0, sizeof(m_stgDevShadowCpy));
@@ -109,7 +117,7 @@ QVariant QGfaStgDevList::data(const QModelIndex &index, int role) const
 			val = _NA_STRING(disk.szDevNode);
 			break;
 		case SDR_DiskBusType:
-			val = _OPT_STRING(disk.szBus, "mmc");
+			val = disk.internal ? "int" : _OPT_STRING(disk.szBus, "mmc");
 			break;
 		case SDR_DiskVendorName:
 			val = _NA_STRING(disk.szVendor);
@@ -201,7 +209,7 @@ void QGfaStgDevList::removePartition(int nDiskIdx, int nPartIdx)
 
 void QGfaStgDevList::diskAdded(int nIndex, const GFA_SYSINFO_DISK &disk)
 {
-	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.disks)) && !disk.internal)
+	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.disks)) && (!disk.internal || g_bStgDevDisplayInternal))
 	{
 		TRACE("Disk [ID=%d] added:   %s [%s]\n", nIndex, disk.szDevNode, *disk.szName ? disk.szName : "Unnamed");
 		memcpy(&m_stgDevShadowCpy.disks[nIndex], &disk, sizeof(GFA_SYSINFO_DISK));
@@ -210,7 +218,7 @@ void QGfaStgDevList::diskAdded(int nIndex, const GFA_SYSINFO_DISK &disk)
 
 void QGfaStgDevList::diskRemoved(int nIndex, const GFA_SYSINFO_DISK &disk)
 {
-	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.disks)) && !disk.internal)
+	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.disks)) && (!disk.internal || g_bStgDevDisplayInternal))
 	{
 		TRACE("Disk [ID=%d] removed: %s [%s]\n", nIndex, disk.szDevNode, *disk.szName ? disk.szName : "Unnamed");
 		m_stgDevShadowCpy.disks[nIndex].valid = false;
@@ -219,7 +227,7 @@ void QGfaStgDevList::diskRemoved(int nIndex, const GFA_SYSINFO_DISK &disk)
 
 void QGfaStgDevList::partitionAdded(int nIndex, const GFA_SYSINFO_PARTITION &part)
 {
-	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.parts)) && !part.internal)
+	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.parts)) && (!part.internal || g_bStgDevDisplayInternal))
 	{
 		TRACE("Partition [ID=%d:%d] added:   %s [%s]\n", part.nDiskIdx, nIndex, part.szDevNode, *part.szFsLabel ? part.szFsLabel : "Unnamed");
 		memcpy(&m_stgDevShadowCpy.parts[nIndex], &part, sizeof(GFA_SYSINFO_PARTITION));
@@ -229,7 +237,7 @@ void QGfaStgDevList::partitionAdded(int nIndex, const GFA_SYSINFO_PARTITION &par
 
 void QGfaStgDevList::partitionRemoved(int nIndex, const GFA_SYSINFO_PARTITION &part)
 {
-	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.parts)) && !part.internal)
+	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.parts)) && (!part.internal || g_bStgDevDisplayInternal))
 	{
 		TRACE("Partition [ID=%d:%d] removed: %s [%s]\n", part.nDiskIdx, nIndex, part.szDevNode, *part.szFsLabel ? part.szFsLabel : "Unnamed");
 		m_stgDevShadowCpy.parts[nIndex].valid = false;
@@ -239,7 +247,7 @@ void QGfaStgDevList::partitionRemoved(int nIndex, const GFA_SYSINFO_PARTITION &p
 
 void QGfaStgDevList::mountAdded(int nIndex, const GFA_SYSINFO_PARTITION &part)
 {
-	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.parts)) && !part.internal)
+	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.parts)) && (!part.internal || g_bStgDevDisplayInternal))
 	{
 		TRACE("Partition [ID=%d:%d] mounted:   %s -> %s\n", part.nDiskIdx, nIndex, part.szDevNode, part.szMntPoint);
 		GFA_SYSINFO_PARTITION &p = m_stgDevShadowCpy.parts[nIndex];
@@ -257,7 +265,7 @@ void QGfaStgDevList::mountAdded(int nIndex, const GFA_SYSINFO_PARTITION &part)
 
 void QGfaStgDevList::mountRemoved(int nIndex, const GFA_SYSINFO_PARTITION &part)
 {
-	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.parts)) && !part.internal)
+	if((nIndex >= 0) && (nIndex < (int)_countof(m_stgDevShadowCpy.parts)) && (!part.internal || g_bStgDevDisplayInternal))
 	{
 		TRACE("Partition [ID=%d:%d] unmounted: %s\n", part.nDiskIdx, nIndex, part.szDevNode);
 		GFA_SYSINFO_PARTITION &p = m_stgDevShadowCpy.parts[nIndex];