Changes in / [ff381a7:5265eea4] in mainline


Ignore:
Files:
1 added
48 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • .bzrignore

    rff381a7 r5265eea4  
    3434uspace/app/dnsres/dnsres
    3535uspace/app/edit/edit
    36 uspace/app/fdisk/fdisk
    3736uspace/app/fontviewer/fontviewer
    3837uspace/app/getterm/getterm
    … …  
    9291uspace/dist/app/dnsres
    9392uspace/dist/app/edit
    94 uspace/dist/app/fdisk
    9593uspace/dist/app/fontviewer
    9694uspace/dist/app/getterm
    … …  
    202200uspace/dist/srv/udf
    203201uspace/dist/srv/udp
    204 uspace/dist/srv/vbd
    205 uspace/dist/srv/volsrv
    206202uspace/dist/test/*
    207203uspace/drv/audio/hdaudio/hdaudio
    … …  
    260256uspace/srv/bd/rd/rd
    261257uspace/srv/bd/sata_bd/sata_bd
    262 uspace/srv/bd/vbd/vbd
    263258uspace/srv/clipboard/clipboard
    264259uspace/srv/devman/devman
    … …  
    295290uspace/srv/ns/ns
    296291uspace/srv/taskmon/taskmon
    297 uspace/srv/volsrv/volsrv
    298292uspace/srv/vfs/vfs
    299293kernel/arch/ia32/_link.ld

  • abi/include/abi/fourcc.h

    rff381a7 r5265eea4  
    3636#define ABI_FOURCC_H_
    3737
    38 #include "../../../common.h"
    39 
    4038#define FOURCC(a, b, c, d) \
    4139        (((UINT32_T) (a)) | (((UINT32_T) (b)) << 8) | \

  • abi/include/abi/ipc/interfaces.h

    rff381a7 r5265eea4  
    174174            FOURCC_COMPACT('m', 'o', 'u', 's') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
    175175        INTERFACE_KBD_CB =
    176             FOURCC_COMPACT('k', 'b', 'd', ' ') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
    177         INTERFACE_VOL =
    178             FOURCC_COMPACT('v', 'o', 'l', ' ') | IFACE_EXCHANGE_SERIALIZE,
    179         INTERFACE_VBD =
    180             FOURCC_COMPACT('v', 'b', 'd', ' ') | IFACE_EXCHANGE_SERIALIZE
     176            FOURCC_COMPACT('k', 'b', 'd', ' ') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK
    181177} iface_t;
    182178

  • boot/Makefile.common

    rff381a7 r5265eea4  
    104104        $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
    105105        $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
    106         $(USPACE_PATH)/srv/bd/vbd/vbd \
    107106        $(USPACE_PATH)/srv/clipboard/clipboard \
    108107        $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
    … …  
    125124        $(USPACE_PATH)/srv/net/tcp/tcp \
    126125        $(USPACE_PATH)/srv/net/udp/udp \
    127         $(USPACE_PATH)/srv/taskmon/taskmon \
    128         $(USPACE_PATH)/srv/volsrv/volsrv
     126        $(USPACE_PATH)/srv/taskmon/taskmon
    129127
    130128RD_DRVS_ESSENTIAL = \
    … …  
    184182        $(USPACE_PATH)/app/download/download \
    185183        $(USPACE_PATH)/app/edit/edit \
    186         $(USPACE_PATH)/app/fdisk/fdisk \
    187184        $(USPACE_PATH)/app/hdisk/hdisk \
    188185        $(USPACE_PATH)/app/inet/inet \

  • uspace/Makefile

    rff381a7 r5265eea4  
    4545        app/download \
    4646        app/edit \
    47         app/fdisk \
    4847        app/fontviewer \
    4948        app/getterm \
    … …  
    115114        srv/bd/part/guid_part \
    116115        srv/bd/part/mbr_part \
    117         srv/bd/vbd \
    118116        srv/fs/exfat \
    119117        srv/fs/udf \
    … …  
    219217        lib/crypto \
    220218        lib/clui \
    221         lib/fdisk \
    222219        lib/fmtutil \
    223220        lib/scsi \
    … …  
    232229        lib/softrend \
    233230        lib/draw \
    234         lib/label \
    235231        lib/math \
    236232        lib/nettl \

  • uspace/Makefile.common

    rff381a7 r5265eea4  
    122122LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto
    123123LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    124 LIBFDISK_PREFIX = $(LIB_PREFIX)/fdisk
    125 LIBLABEL_PREFIX = $(LIB_PREFIX)/label
    126124LIBFS_PREFIX = $(LIB_PREFIX)/fs
    127125LIBCLUI_PREFIX = $(LIB_PREFIX)/clui

  • uspace/app/init/init.c

    rff381a7 r5265eea4  
    337337        srv_start("/srv/s3c24xx_ts");
    338338       
    339         srv_start("/srv/vbd");
    340         srv_start("/srv/volsrv");
    341        
    342339        srv_start("/srv/loopip");
    343340        srv_start("/srv/ethip");

  • uspace/drv/block/ata_bd/main.c

    rff381a7 r5265eea4  
    199199
    200200        ddf_fun_add_to_category(fun, "bd");
    201         ddf_fun_add_to_category(fun, "disk");
    202201
    203202        free(fun_name);

  • uspace/lib/block/block.c

    rff381a7 r5265eea4  
    788788}
    789789
    790 /** Synchronize blocks to persistent storage.
    791  *
    792  * @param service_id    Service ID of the block device.
    793  * @param ba            Address of first block (physical).
    794  * @param cnt           Number of blocks.
    795  *
    796  * @return              EOK on success or negative error code on failure.
    797  */
    798 int block_sync_cache(service_id_t service_id, aoff64_t ba, size_t cnt)
    799 {
    800         devcon_t *devcon;
    801 
    802         devcon = devcon_search(service_id);
    803         assert(devcon);
    804 
    805         return bd_sync_cache(devcon->bd, ba, cnt);
    806 }
    807 
    808790/** Get device block size.
    809791 *

  • uspace/lib/block/block.h

    rff381a7 r5265eea4  
    120120extern int block_read_bytes_direct(service_id_t, aoff64_t, size_t, void *);
    121121extern int block_write_direct(service_id_t, aoff64_t, size_t, const void *);
    122 extern int block_sync_cache(service_id_t, aoff64_t, size_t);
    123122
    124123#endif

  • uspace/lib/c/Makefile

    rff381a7 r5265eea4  
    9595        generic/task.c \
    9696        generic/futex.c \
    97         generic/imath.c \
    9897        generic/inet/addr.c \
    9998        generic/inet/endpoint.c \
    … …  
    153152        generic/stats.c \
    154153        generic/assert.c \
    155         generic/pio_trace.c \
    156         generic/uuid.c \
    157         generic/vbd.c \
    158         generic/vol.c
     154        generic/pio_trace.c
    159155
    160156ifeq ($(CONFIG_RTLD),y)

  • uspace/lib/c/generic/str.c

    rff381a7 r5265eea4  
    519519        wchar_t c1 = 0;
    520520        wchar_t c2 = 0;
    521 
     521       
    522522        size_t off1 = 0;
    523523        size_t off2 = 0;
    … …  
    529529                if (c1 < c2)
    530530                        return -1;
    531 
     531               
    532532                if (c1 > c2)
    533533                        return 1;
    534534
    535535                if (c1 == 0 || c2 == 0)
    536                         break;
     536                        break;         
    537537        }
    538538
    … …  
    566566        wchar_t c1 = 0;
    567567        wchar_t c2 = 0;
    568 
     568       
    569569        size_t off1 = 0;
    570570        size_t off2 = 0;
    571 
     571       
    572572        size_t len = 0;
    573573
    … …  
    578578                c1 = str_decode(s1, &off1, STR_NO_LIMIT);
    579579                c2 = str_decode(s2, &off2, STR_NO_LIMIT);
    580 
    581                 if (c1 < c2)
    582                         return -1;
    583 
    584                 if (c1 > c2)
    585                         return 1;
    586 
    587                 if (c1 == 0 || c2 == 0)
    588                         break;
    589 
    590                 ++len;
    591         }
    592 
    593         return 0;
    594 
    595 }
    596 
    597 /** Compare two NULL terminated strings in case-insensitive manner.
    598  *
    599  * Do a char-by-char comparison of two NULL-terminated strings.
    600  * The strings are considered equal iff their length is equal
    601  * and both strings consist of the same sequence of characters
    602  * when converted to lower case.
    603  *
    604  * A string S1 is less than another string S2 if it has a character with
    605  * lower value at the first character position where the strings differ.
    606  * If the strings differ in length, the shorter one is treated as if
    607  * padded by characters with a value of zero.
    608  *
    609  * @param s1 First string to compare.
    610  * @param s2 Second string to compare.
    611  *
    612  * @return 0 if the strings are equal, -1 if the first is less than the second,
    613  *         1 if the second is less than the first.
    614  *
    615  */
    616 int str_casecmp(const char *s1, const char *s2)
    617 {
    618         wchar_t c1 = 0;
    619         wchar_t c2 = 0;
    620 
    621         size_t off1 = 0;
    622         size_t off2 = 0;
    623 
    624         while (true) {
    625                 c1 = tolower(str_decode(s1, &off1, STR_NO_LIMIT));
    626                 c2 = tolower(str_decode(s2, &off2, STR_NO_LIMIT));
    627 
    628                 if (c1 < c2)
    629                         return -1;
    630 
    631                 if (c1 > c2)
    632                         return 1;
    633 
    634                 if (c1 == 0 || c2 == 0)
    635                         break;
    636         }
    637 
    638         return 0;
    639 }
    640 
    641 /** Compare two NULL terminated strings with length limit in case-insensitive
    642  * manner.
    643  *
    644  * Do a char-by-char comparison of two NULL-terminated strings.
    645  * The strings are considered equal iff
    646  * min(str_length(s1), max_len) == min(str_length(s2), max_len)
    647  * and both strings consist of the same sequence of characters,
    648  * up to max_len characters.
    649  *
    650  * A string S1 is less than another string S2 if it has a character with
    651  * lower value at the first character position where the strings differ.
    652  * If the strings differ in length, the shorter one is treated as if
    653  * padded by characters with a value of zero. Only the first max_len
    654  * characters are considered.
    655  *
    656  * @param s1      First string to compare.
    657  * @param s2      Second string to compare.
    658  * @param max_len Maximum number of characters to consider.
    659  *
    660  * @return 0 if the strings are equal, -1 if the first is less than the second,
    661  *         1 if the second is less than the first.
    662  *
    663  */
    664 int str_lcasecmp(const char *s1, const char *s2, size_t max_len)
    665 {
    666         wchar_t c1 = 0;
    667         wchar_t c2 = 0;
    668        
    669         size_t off1 = 0;
    670         size_t off2 = 0;
    671        
    672         size_t len = 0;
    673 
    674         while (true) {
    675                 if (len >= max_len)
    676                         break;
    677 
    678                 c1 = tolower(str_decode(s1, &off1, STR_NO_LIMIT));
    679                 c2 = tolower(str_decode(s2, &off2, STR_NO_LIMIT));
    680580
    681581                if (c1 < c2)

  • uspace/lib/c/include/ipc/services.h

    rff381a7 r5265eea4  
    5959#define SERVICE_NAME_UDP      "net/udp"
    6060#define SERVICE_NAME_TCP      "net/tcp"
    61 #define SERVICE_NAME_VBD      "vbd"
    62 #define SERVICE_NAME_VOLSRV   "volsrv"
    6361
    6462#endif

  • uspace/lib/c/include/str.h

    rff381a7 r5265eea4  
    8282extern int str_cmp(const char *s1, const char *s2);
    8383extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
    84 extern int str_casecmp(const char *s1, const char *s2);
    85 extern int str_lcasecmp(const char *s1, const char *s2, size_t max_len);
    8684
    8785extern bool str_test_prefix(const char *s, const char *p);

  • uspace/lib/clui/Makefile

    rff381a7 r5265eea4  
    3232
    3333SOURCES = \
    34         nchoice.c \
    3534        tinput.c
    3635

  • uspace/lib/clui/tinput.c

    rff381a7 r5265eea4  
    457457}
    458458
    459 static void tinput_set_str(tinput_t *ti, const char *str)
     459static void tinput_set_str(tinput_t *ti, char *str)
    460460{
    461461        str_to_wstr(ti->buffer, INPUT_MAX_SIZE, str);
    … …  
    853853}
    854854
    855 /** Read in one line of input with initial text provided.
     855/** Read in one line of input.
    856856 *
    857  * @param ti   Text input
    858  * @param istr Initial string
    859  * @param dstr Place to save pointer to new string
     857 * @param ti   Text input.
     858 * @param dstr Place to save pointer to new string.
    860859 *
    861860 * @return EOK on success
    … …  
    864863 *
    865864 */
    866 int tinput_read_i(tinput_t *ti, const char *istr, char **dstr)
     865int tinput_read(tinput_t *ti, char **dstr)
    867866{
    868867        console_flush(ti->console);
    … …  
    870869                return EIO;
    871870       
    872         tinput_set_str(ti, istr);
    873 
     871        ti->pos = 0;
    874872        ti->sel_start = 0;
     873        ti->nc = 0;
     874        ti->buffer[0] = '\0';
    875875        ti->done = false;
    876876        ti->exit_clui = false;
    … …  
    916916}
    917917
    918 /** Read in one line of input.
    919  *
    920  * @param ti   Text input
    921  * @param dstr Place to save pointer to new string.
    922  *
    923  * @return EOK on success
    924  * @return ENOENT if user requested abort
    925  * @return EIO if communication with console failed
    926  *
    927  */
    928 int tinput_read(tinput_t *ti, char **dstr)
    929 {
    930         return tinput_read_i(ti, "", dstr);
    931 }
    932 
    933918static void tinput_key_ctrl(tinput_t *ti, kbd_event_t *ev)
    934919{

  • uspace/lib/clui/tinput.h

    rff381a7 r5265eea4  
    159159extern void tinput_destroy(tinput_t *);
    160160extern int tinput_read(tinput_t *, char **);
    161 extern int tinput_read_i(tinput_t *, const char *, char **);
    162161
    163162#endif

  • uspace/srv/bd/part/guid_part/Makefile

    rff381a7 r5265eea4  
    2929USPACE_PREFIX = ../../../..
    3030LIBS = $(LIBBLOCK_PREFIX)/libblock.a
    31 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBLABEL_PREFIX)/include
     31EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
    3232
    3333# Correct name is 'guid_part' but must use this because of FAT 8.3 names.

  • uspace/srv/bd/part/guid_part/guid_part.c

    rff381a7 r5265eea4  
    6464#include <task.h>
    6565
    66 #include <std/gpt.h>
     66#include "gpt.h"
    6767
    6868#define NAME "guid_part"
    … …  
    250250        }
    251251
    252         rc = block_read_direct(indev_sid, gpt_hdr_ba, 1, gpt_hdr);
     252        rc = block_read_direct(indev_sid, GPT_HDR_BA, 1, gpt_hdr);
    253253        if (rc != EOK) {
    254254                printf(NAME ": Failed reading GPT header block.\n");

  • uspace/srv/locsrv/locsrv.c

    rff381a7 r5265eea4  
    13171317        categ_dir_add_cat(&cdir, cat);
    13181318
    1319         cat = category_new("disk");
    1320         categ_dir_add_cat(&cdir, cat);
    1321 
    1322         cat = category_new("partition");
    1323         categ_dir_add_cat(&cdir, cat);
    1324 
    13251319        cat = category_new("iplink");
    13261320        categ_dir_add_cat(&cdir, cat);
Note: See TracChangeset for help on using the changeset viewer.