From beef46972cdd8294bc9d108aaa1b91b4767253c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 30 Nov 2009 15:42:21 +0000 Subject: [PATCH] * Removed obsolete disk_scanner test app. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34380 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/disk_scanner/DiskScannerTest.cpp | 121 ------------------ src/tests/add-ons/kernel/disk_scanner/Jamfile | 48 ------- .../add-ons/kernel/disk_scanner/fs/Jamfile | 27 ---- .../kernel/disk_scanner/partition/Jamfile | 19 --- .../kernel/disk_scanner/session/Jamfile | 19 --- 5 files changed, 234 deletions(-) delete mode 100644 src/tests/add-ons/kernel/disk_scanner/DiskScannerTest.cpp delete mode 100644 src/tests/add-ons/kernel/disk_scanner/Jamfile delete mode 100644 src/tests/add-ons/kernel/disk_scanner/fs/Jamfile delete mode 100644 src/tests/add-ons/kernel/disk_scanner/partition/Jamfile delete mode 100644 src/tests/add-ons/kernel/disk_scanner/session/Jamfile diff --git a/src/tests/add-ons/kernel/disk_scanner/DiskScannerTest.cpp b/src/tests/add-ons/kernel/disk_scanner/DiskScannerTest.cpp deleted file mode 100644 index 0daa39db2c..0000000000 --- a/src/tests/add-ons/kernel/disk_scanner/DiskScannerTest.cpp +++ /dev/null @@ -1,121 +0,0 @@ -// DiskScannerTest.cpp -// run that program from the current/ top directory - -#include -#include -#include -#include - -#include - -// include the implementation if the disk_scanner functions -#include "disk_scanner.cpp" - -// the test code starts here - -// print_session_info -static -void -print_session_info(const char *prefix, const session_info &info) -{ - printf("%soffset: %lld\n", prefix, info.offset); - printf("%ssize: %lld\n", prefix, info.size); - printf("%sblock size: %ld\n", prefix, info.logical_block_size); - printf("%sindex: %ld\n", prefix, info.index); - printf("%sflags: %lx\n", prefix, info.flags); -} - -// print_partition_info -static -void -print_partition_info(const char *prefix, const extended_partition_info &info) -{ - printf("%soffset: %lld\n", prefix, info.info.offset); - printf("%ssize: %lld\n", prefix, info.info.size); - printf("%sblock size: %ld\n", prefix, info.info.logical_block_size); - printf("%ssession ID: %ld\n", prefix, info.info.session); - printf("%spartition ID: %ld\n", prefix, info.info.partition); - printf("%sdevice: `%s'\n", prefix, info.info.device); - printf("%sflags: %lx\n", prefix, info.flags); - printf("%spartition name: `%s'\n", prefix, info.partition_name); - printf("%spartition type: `%s'\n", prefix, info.partition_type); - printf("%sFS short name: `%s'\n", prefix, info.file_system_short_name); - printf("%sFS long name: `%s'\n", prefix, info.file_system_long_name); - printf("%svolume name: `%s'\n", prefix, info.volume_name); - printf("%sFS flags: 0x%lx\n", prefix, info.file_system_flags); -} - -// main -int -main(int argc, char **argv) -{ - char buffer[B_FILE_NAME_LENGTH]; - const char *deviceName = "/dev/disk/ide/ata/0/master/0/raw"; - - if (argc > 1) { - bool atapi = false; - int32 controller = 0; - bool master = true; - - if (argv[1][0] == '/') { - deviceName = argv[1]; - } else if (strstr(argv[1], "virtual") != NULL) { - deviceName = "/dev/disk/virtual/0/raw"; - } else { - if (strstr(argv[1], "cd") != NULL || strstr(argv[1], "atapi") != NULL) - atapi = true; - if (strstr(argv[1], "slave") != NULL) - master = false; - if (char *digit = strpbrk(argv[1], "0123456789")) - controller = atol(digit); - - sprintf(buffer, "/dev/disk/ide/ata%s/%ld/%s/0/raw", atapi ? "pi" : "", - controller, master ? "master" : "slave"); - - deviceName = buffer; - } - } - - int device = open(deviceName, 0); - if (device < 0) { - fprintf(stderr, "Could not open device \"%s\": %s\n", deviceName, strerror(device)); - return -1; - } - - printf("device: `%s'\n", deviceName); - - session_info sessionInfo; - for (int32 i = 0; ; i++) { - status_t status = get_nth_session_info(device, i, &sessionInfo); - if (status < B_OK) { - if (status != B_ENTRY_NOT_FOUND) - fprintf(stderr, "get_nth_session_info() failed: %s\n", strerror(status)); - break; - } - - printf("session %ld\n", i); - print_session_info(" ", sessionInfo); - - for (int32 k = 0; ; k++) { - extended_partition_info partitionInfo; - char partitionMapName[B_FILE_NAME_LENGTH]; - status = get_nth_partition_info(device, i, k, &partitionInfo, - partitionMapName); - if (status < B_OK) { - if (status != B_ENTRY_NOT_FOUND) - fprintf(stderr, "get_nth_partition_info() failed: %s\n", strerror(status)); - break; - } - - if (k == 0) - printf(" partition map: `%s'\n", partitionMapName); - - printf(" partition %ld_%ld\n", i, k); - print_partition_info(" ", partitionInfo); - } - } - close(device); - - return 0; -} - diff --git a/src/tests/add-ons/kernel/disk_scanner/Jamfile b/src/tests/add-ons/kernel/disk_scanner/Jamfile deleted file mode 100644 index b35db11f31..0000000000 --- a/src/tests/add-ons/kernel/disk_scanner/Jamfile +++ /dev/null @@ -1,48 +0,0 @@ -SubDir HAIKU_TOP src tests add-ons kernel disk_scanner ; - -#UsePrivateHeaders $(DOT) ; -# -# the test app -# -#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system libroot os ] ; -#SimpleTest DiskScannerTest : DiskScannerTest.cpp -# : libkernelland_emu.so be stdc++.r4 ; -#LOCATE on DiskScannerTest = [ on DiskScannerTest return $(LOCATE) ] ; -#Depends DiskScannerTest : DiskScannerTest ; -# -# the add-on -# -#SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel disk_scanner ] ; -# -#{ -# local defines = [ FDefines USERLAND ] ; -# SubDirCcFlags $(defines) ; -# SubDirC++Flags $(defines) ; -#} -# -#Addon disk_scanner : -# disk_scanner.c -#; -#LinkAgainst disk_scanner : libkernelland_emu.so ; -# -# for convenience: this target builds all userland modules -# -#NotFile userland_disk_scanner_modules ; -#Depends userland_disk_scanner_modules : -# # the main module -# disk_scanner -# -# # FS modules -# bfs -# iso9660 -# -# # partition modules -# intel -# -# # session modules -# cdrom -#; -# -#SubInclude HAIKU_TOP src tests add-ons kernel disk_scanner fs ; -#SubInclude HAIKU_TOP src tests add-ons kernel disk_scanner partition ; -#SubInclude HAIKU_TOP src tests add-ons kernel disk_scanner session ; diff --git a/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile b/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile deleted file mode 100644 index 93ca0518e1..0000000000 --- a/src/tests/add-ons/kernel/disk_scanner/fs/Jamfile +++ /dev/null @@ -1,27 +0,0 @@ -SubDir HAIKU_TOP src tests add-ons kernel disk_scanner fs ; - -SEARCH_SOURCE - += [ FDirName $(HAIKU_TOP) src add-ons kernel disk_scanner fs ] ; - -UsePrivateHeaders $(DOT) ; - -{ - local defines = [ FDefines USERLAND ] ; - SubDirCcFlags $(defines) ; - SubDirC++Flags $(defines) ; -} - -# bfs - -Addon bfs : - bfs.c - : libkernelland_emu.so -; - -# iso9660 - -Addon iso9660 : - iso9660.cpp - : libkernelland_emu.so -; - diff --git a/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile b/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile deleted file mode 100644 index fffd3a263b..0000000000 --- a/src/tests/add-ons/kernel/disk_scanner/partition/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src tests add-ons kernel disk_scanner partition ; - -SEARCH_SOURCE - += [ FDirName $(HAIKU_TOP) src add-ons kernel disk_scanner partition ] ; - -UsePrivateHeaders $(DOT) ; - -{ - local defines = [ FDefines USERLAND ] ; - SubDirCcFlags $(defines) ; - SubDirC++Flags $(defines) ; -} - -# intel - -Addon intel : - intel.cpp intel_parameters.cpp intel_partition_map.cpp - : libkernelland_emu.so -; diff --git a/src/tests/add-ons/kernel/disk_scanner/session/Jamfile b/src/tests/add-ons/kernel/disk_scanner/session/Jamfile deleted file mode 100644 index 492ea11d09..0000000000 --- a/src/tests/add-ons/kernel/disk_scanner/session/Jamfile +++ /dev/null @@ -1,19 +0,0 @@ -SubDir HAIKU_TOP src tests add-ons kernel disk_scanner session ; - -SEARCH_SOURCE - += [ FDirName $(HAIKU_TOP) src add-ons kernel disk_scanner session ] ; - -UsePrivateHeaders $(DOT) ; - -{ - local defines = [ FDefines USERLAND ] ; - SubDirCcFlags $(defines) ; - SubDirC++Flags $(defines) ; -} - -# cdrom - -Addon cdrom : - cdrom.cpp - : libkernelland_emu.so -;