Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 827d73f in mainline for uspace/srv/hid/fb/serial_console.c


Ignore:
Timestamp:
2010-02-12T14:09:22Z (12 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (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:

Merged the actual head

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/srv/hid/fb/serial_console.c

    r918e9910 r827d73f  
    5757void serial_putchar(wchar_t ch);
    5858
    59 static int scr_width;
    60 static int scr_height;
     59static unsigned int scr_width;
     60static unsigned int scr_height;
    6161static bool color = true;       /** True if producing color output. */
    6262static bool utf8 = false;       /** True if producing UTF8 output. */
     
    108108void serial_putchar(wchar_t ch)
    109109{
    110         uint8_t buf[STR_BOUNDS(1)];
     110        char buf[STR_BOUNDS(1)];
    111111        size_t offs;
    112112        size_t i;
     
    294294}
    295295
    296 int lastcol = 0;
    297 int lastrow = 0;
     296unsigned int lastcol = 0;
     297unsigned int lastrow = 0;
    298298
    299299/**
     
    309309
    310310        wchar_t c;
    311         int col, row, w, h;
     311        unsigned int col;
     312        unsigned int row;
     313        unsigned int w;
     314        unsigned int h;
    312315        int i;
    313316
     
    358361                                break;
    359362                        }
    360                         if (col + w > scr_width || row + h > scr_height) {
     363                        if ((col + w > scr_width) || (row + h > scr_height)) {
    361364                                retval = EINVAL;
    362365                                break;
     
    424427                case FB_SCROLL:
    425428                        i = IPC_GET_ARG1(call);
    426                         if ((i > scr_height) || (i < -scr_height)) {
     429                        if ((i > (int) scr_height) || (i < -((int) scr_height))) {
    427430                                retval = EINVAL;
    428431                                break;
Note: See TracChangeset for help on using the changeset viewer.