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

Changeset 5863a95 in mainline for kernel/generic/src/console/cmd.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/console/cmd.c

    r70e5ad5 r5863a95  
    601601       
    602602        /* This doesn't have to be very accurate */
    603         unative_t sec = uptime->seconds1;
     603        sysarg_t sec = uptime->seconds1;
    604604       
    605605        printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n",
     
    656656        uintptr_t symaddr;
    657657        char *symbol;
    658         unative_t (*fnc)(void);
     658        sysarg_t (*fnc)(void);
    659659        fncptr_t fptr;
    660660        int rc;
     
    672672
    673673                ipl = interrupts_disable();
    674                 fnc = (unative_t (*)(void)) arch_construct_function(&fptr,
     674                fnc = (sysarg_t (*)(void)) arch_construct_function(&fptr,
    675675                    (void *) symaddr, (void *) cmd_call0);
    676676                printf("Calling %s() (%p)\n", symbol, (void *) symaddr);
     
    720720        uintptr_t symaddr;
    721721        char *symbol;
    722         unative_t (*fnc)(unative_t, ...);
    723         unative_t arg1 = argv[1].intval;
     722        sysarg_t (*fnc)(sysarg_t, ...);
     723        sysarg_t arg1 = argv[1].intval;
    724724        fncptr_t fptr;
    725725        int rc;
     
    737737
    738738                ipl = interrupts_disable();
    739                 fnc = (unative_t (*)(unative_t, ...))
     739                fnc = (sysarg_t (*)(sysarg_t, ...))
    740740                    arch_construct_function(&fptr, (void *) symaddr,
    741741                    (void *) cmd_call1);
     
    756756        uintptr_t symaddr;
    757757        char *symbol;
    758         unative_t (*fnc)(unative_t, unative_t, ...);
    759         unative_t arg1 = argv[1].intval;
    760         unative_t arg2 = argv[2].intval;
     758        sysarg_t (*fnc)(sysarg_t, sysarg_t, ...);
     759        sysarg_t arg1 = argv[1].intval;
     760        sysarg_t arg2 = argv[2].intval;
    761761        fncptr_t fptr;
    762762        int rc;
     
    774774
    775775                ipl = interrupts_disable();
    776                 fnc = (unative_t (*)(unative_t, unative_t, ...))
     776                fnc = (sysarg_t (*)(sysarg_t, sysarg_t, ...))
    777777                    arch_construct_function(&fptr, (void *) symaddr,
    778778                    (void *) cmd_call2);
     
    792792        uintptr_t symaddr;
    793793        char *symbol;
    794         unative_t (*fnc)(unative_t, unative_t, unative_t, ...);
    795         unative_t arg1 = argv[1].intval;
    796         unative_t arg2 = argv[2].intval;
    797         unative_t arg3 = argv[3].intval;
     794        sysarg_t (*fnc)(sysarg_t, sysarg_t, sysarg_t, ...);
     795        sysarg_t arg1 = argv[1].intval;
     796        sysarg_t arg2 = argv[2].intval;
     797        sysarg_t arg3 = argv[3].intval;
    798798        fncptr_t fptr;
    799799        int rc;
     
    811811
    812812                ipl = interrupts_disable();
    813                 fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...))
     813                fnc = (sysarg_t (*)(sysarg_t, sysarg_t, sysarg_t, ...))
    814814                    arch_construct_function(&fptr, (void *) symaddr,
    815815                    (void *) cmd_call3);
Note: See TracChangeset for help on using the changeset viewer.