Index: uspace/app/tester/Makefile =================================================================== --- uspace/app/tester/Makefile (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tester/Makefile (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) @@ -31,6 +31,10 @@ BINARY = tester +LIBS += $(LIBUSB_PREFIX)/libusb.a +EXTRA_CFLAGS += -I$(LIBUSB_PREFIX)/include + SOURCES = \ tester.c \ + adt/usbaddrkeep.c \ thread/thread1.c \ print/print1.c \ @@ -49,4 +53,5 @@ loop/loop1.c \ mm/malloc1.c \ + mm/mapping1.c \ hw/misc/virtchar1.c \ hw/serial/serial1.c Index: uspace/app/tester/adt/usbaddrkeep.c =================================================================== --- uspace/app/tester/adt/usbaddrkeep.c (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) +++ uspace/app/tester/adt/usbaddrkeep.c (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2010 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include "../tester.h" + +#define MAX_ADDRESS 5 + + +const char *test_usbaddrkeep(void) +{ + int rc; + usb_address_keeping_t addresses; + + TPRINTF("Initializing addresses keeping structure...\n"); + usb_address_keeping_init(&addresses, MAX_ADDRESS); + + TPRINTF("Requesting address...\n"); + usb_address_t addr = usb_address_keeping_request(&addresses); + TPRINTF("Address assigned: %d\n", (int) addr); + if (addr != 1) { + return "have not received expected address 1"; + } + + TPRINTF("Releasing not assigned address...\n"); + rc = usb_address_keeping_release(&addresses, 2); + if (rc != ENOENT) { + return "have not received expected ENOENT"; + } + + TPRINTF("Releasing acquired address...\n"); + rc = usb_address_keeping_release(&addresses, addr); + if (rc != EOK) { + return "have not received expected EOK"; + } + + return NULL; +} Index: uspace/app/tester/adt/usbaddrkeep.def =================================================================== --- uspace/app/tester/adt/usbaddrkeep.def (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) +++ uspace/app/tester/adt/usbaddrkeep.def (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) @@ -0,0 +1,6 @@ +{ + "usbaddrkeep", + "USB address keeping structure", + &test_usbaddrkeep, + true +}, Index: uspace/app/tester/mm/mapping1.c =================================================================== --- uspace/app/tester/mm/mapping1.c (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) +++ uspace/app/tester/mm/mapping1.c (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include "../tester.h" + +#define BUFFER1_PAGES 4 +#define BUFFER2_PAGES 2 + +static void *create_as_area(size_t size) +{ + void *result = as_get_mappable_page(size); + TPRINTF("Creating AS area...\n"); + if (as_area_create(result, size, + AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE) != result) { + return NULL; + } + return result; +} + +static void touch_area(void *area, size_t size) +{ + TPRINTF("Touching (faulting-in) AS area...\n"); + + char *ptr = (char *)area; + + while (size > 0) { + *ptr = 0; + size--; + ptr++; + } +} + +#define VERIFY_MAPPING(area, page_count, expected_rc) \ + verify_mapping((area), (page_count), (expected_rc), #expected_rc) + +static bool verify_mapping(void *area, int page_count, int expected_rc, + const char *expected_rc_str) +{ + TPRINTF("Verifying mapping (expected: %s).\n", expected_rc_str); + int i; + for (i = 0; i < page_count; i++) { + void *page_start = ((char *)area) + PAGE_SIZE * i; + int rc = as_get_physical_mapping(page_start, NULL); + if (rc != expected_rc) { + TPRINTF("as_get_physical_mapping() = %d != %d\n", + rc, expected_rc); + return false; + } + } + return true; +} + +const char *test_mapping1(void) +{ + int rc; + + size_t buffer1_len = BUFFER1_PAGES * PAGE_SIZE; + size_t buffer2_len = BUFFER2_PAGES * PAGE_SIZE; + void *buffer1 = create_as_area(buffer1_len); + void *buffer2 = create_as_area(buffer2_len); + if (!buffer1 || !buffer2) { + return "Cannot allocate memory"; + } + + touch_area(buffer1, buffer1_len); + touch_area(buffer2, buffer2_len); + + /* Now verify that mapping to physical frames exist. */ + if (!VERIFY_MAPPING(buffer1, BUFFER1_PAGES, EOK)) { + return "Failed to find mapping (buffer1)"; + } + if (!VERIFY_MAPPING(buffer2, BUFFER2_PAGES, EOK)) { + return "Failed to find mapping (buffer2)"; + } + + /* Let's destroy the buffer1 area and access it again. */ + rc = as_area_destroy(buffer1); + if (rc != EOK) { + return "Failed to destroy AS area"; + } + if (!VERIFY_MAPPING(buffer1, BUFFER1_PAGES, ENOENT)) { + return "Mapping of destroyed area still exists"; + } + + /* clean-up */ + rc = as_area_destroy(buffer2); + if (rc != EOK) { + return "Failed to destroy AS area"; + } + + return NULL; +} Index: uspace/app/tester/mm/mapping1.def =================================================================== --- uspace/app/tester/mm/mapping1.def (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) +++ uspace/app/tester/mm/mapping1.def (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) @@ -0,0 +1,6 @@ +{ + "mapping1", + "Page mapping test", + &test_mapping1, + true +}, Index: uspace/app/tester/tester.c =================================================================== --- uspace/app/tester/tester.c (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tester/tester.c (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) @@ -62,5 +62,7 @@ #include "loop/loop1.def" #include "mm/malloc1.def" +#include "mm/mapping1.def" #include "hw/serial/serial1.def" +#include "adt/usbaddrkeep.def" #include "hw/misc/virtchar1.def" {NULL, NULL, NULL, false} Index: uspace/app/tester/tester.h =================================================================== --- uspace/app/tester/tester.h (revision ffa2c8ef45390c01f3f4be4827bcd41c32f7951c) +++ uspace/app/tester/tester.h (revision da17cf0f62be93cfcd6ddcf6028b03a49898563d) @@ -78,5 +78,7 @@ extern const char *test_loop1(void); extern const char *test_malloc1(void); +extern const char *test_mapping1(void); extern const char *test_serial1(void); +extern const char *test_usbaddrkeep(void); extern const char *test_virtchar1(void);