Changeset b0f00a9 in mainline for uspace/dist


Ignore:
Timestamp:
2011-11-06T22:21:05Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
898e847
Parents:
2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Location:
uspace/dist
Files:
22 added
1 edited
2 moved

Legend:

Unmodified
Added
Removed

  • uspace/dist/src/c/demos/tetris/screen.h

    r2bdf8313 rb0f00a9  
    11/*
    2  * Copyright (c) 2009 Jiri Svoboda
     2 * Copyright (c) 2011 Martin Decky
    33 * All rights reserved.
    44 *
    … …  
    2727 */
    2828
    29 /** @addtogroup libc
     29/** Attributations
     30 *
     31 * screen.h 8.1 (Berkeley) 5/31/93
     32 * NetBSD: screen.h,v 1.2 1995/04/22 07:42:42 cgd
     33 * OpenBSD: screen.h,v 1.5 2003/06/03 03:01:41 millert
     34 *
     35 * Based upon BSD Tetris
     36 *
     37 * Copyright (c) 1992, 1993
     38 *      The Regents of the University of California.
     39 *      Distributed under BSD license.
     40 *
     41 * This code is derived from software contributed to Berkeley by
     42 * Chris Torek and Darren F. Provine.
     43 *
     44 */
     45
     46/** @addtogroup tetris
    3047 * @{
    3148 */
    … …  
    3350 */
    3451
    35 #ifndef LIBC_DEVMAP_H_
    36 #define LIBC_DEVMAP_H_
     52/*
     53 * putpad() is for padded strings with count = 1.
     54 */
     55#define putpad(s)  tputs(s, 1, put)
    3756
    38 #include <ipc/devmap.h>
     57#include <sys/types.h>
     58#include <io/console.h>
    3959#include <async.h>
    4060#include <bool.h>
    4161
    42 extern int devmap_get_phone(devmap_interface_t, unsigned int);
    43 extern void devmap_hangup_phone(devmap_interface_t iface);
     62typedef struct {
     63        sysarg_t ws_row;
     64        sysarg_t ws_col;
     65} winsize_t;
    4466
    45 extern int devmap_driver_register(const char *, async_client_conn_t);
    46 extern int devmap_device_register(const char *, devmap_handle_t *);
    47 extern int devmap_device_register_with_iface(const char *, devmap_handle_t *, sysarg_t);
     67extern console_ctrl_t *console;
     68extern winsize_t winsize;
    4869
    49 extern int devmap_device_get_handle(const char *, devmap_handle_t *, unsigned int);
    50 extern int devmap_namespace_get_handle(const char *, devmap_handle_t *, unsigned int);
    51 extern devmap_handle_type_t devmap_handle_probe(devmap_handle_t);
     70extern void moveto(sysarg_t r, sysarg_t c);
     71extern void clear_screen(void);
    5272
    53 extern int devmap_device_connect(devmap_handle_t, unsigned int);
     73extern int put(int);
     74extern void scr_clear(void);
     75extern void scr_end(void);
     76extern void scr_init(void);
     77extern void scr_msg(char *, bool);
     78extern void scr_set(void);
     79extern void scr_update(void);
    5480
    55 extern int devmap_null_create(void);
    56 extern void devmap_null_destroy(int);
    57 
    58 extern size_t devmap_count_namespaces(void);
    59 extern size_t devmap_count_devices(devmap_handle_t);
    60 
    61 extern size_t devmap_get_namespaces(dev_desc_t **);
    62 extern size_t devmap_get_devices(devmap_handle_t, dev_desc_t **);
    63 
    64 #endif
     81extern void tsleep(void);
     82extern int tgetchar(void);
     83extern int twait(void);
    6584
    6685/** @}

  • uspace/dist/src/sysel/demos/htxtfile.sy

    r2bdf8313 rb0f00a9  
    3535                var out_file : TextFile;
    3636
    37                 name = "/readme";
     37                name = "/textdemo";
    3838
    3939                in_file = new TextFile();
Note: See TracChangeset for help on using the changeset viewer.