Diff markup

Differences between /sos/syscall.h (Article 7) and /sos/syscall.h (Article 7.5)

 /* Copyright (C) 2005  David Decotigny             /* Copyright (C) 2005  David Decotigny
                                                    
    This program is free software; you can redi        This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU Genera        modify it under the terms of the GNU General Public License
    as published by the Free Software Foundatio        as published by the Free Software Foundation; either version 2
    of the License, or (at your option) any lat        of the License, or (at your option) any later version.
                                                       
    This program is distributed in the hope tha        This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the         but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details        GNU General Public License for more details.
                                                       
    You should have received a copy of the GNU         You should have received a copy of the GNU General Public License
    along with this program; if not, write to t        along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 3        Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
    USA.                                               USA. 
 */                                                 */
 #ifndef _SOS_SYSCALL_H_                            #ifndef _SOS_SYSCALL_H_
 #define _SOS_SYSCALL_H_                            #define _SOS_SYSCALL_H_
                                                    
 /**                                                /**
  * @file syscall.h                                  * @file syscall.h
  *                                                  *
  * SOS Syscalls identifiers and handler. The h      * SOS Syscalls identifiers and handler. The handler is called by the
  * underlying assembler routine (see hwcore/sy      * underlying assembler routine (see hwcore/syscall.h)
  */                                                 */
                                                    
                                                    
 /**                                                /**
  * The user services offered by the SOS kernel      * The user services offered by the SOS kernel
  */                                                 */
 #define SOS_SYSCALL_ID_EXIT        256 /**< Ar     #define SOS_SYSCALL_ID_EXIT        256 /**< Args: retval, retval=NONE */
                                                    
                                                   >>  
                                                   >>  /**
                                                   >>   * Basic low-level user thread API
                                                   >>   */
                                                   >>  #define SOS_SYSCALL_ID_NEW_THREAD  128 /**< Args: start_func start_arg1 start_arg2 stack_size, retval=errno */
                                                   >>  #define SOS_SYSCALL_ID_NANOSLEEP   129 /**< Args: sec nanosec, retval=errno */
                                                   >>  
                                                   >>  
                                                   >>  /**
                                                   >>   * User memory mappings management
                                                   >>   */
                                                   >>  #define SOS_SYSCALL_ID_FORK        257 /**< Args: NONE, retval={father:child_pd, child:0} */
                                                   >>  #define SOS_SYSCALL_ID_EXEC        258 /**< Args: ptr_exec_path strlen_exec_path, retval=errno */
                                                   >>  #define SOS_SYSCALL_ID_MMAP        259 /**< Args: &hint len prot flags fd uoffs64_hi uoffs64_lo, retval=errno */
                                                   >>  #define SOS_SYSCALL_ID_MUNMAP      260 /**< Args: start_uaddr size, retval=errno */
                                                   >>  #define SOS_SYSCALL_ID_MPROTECT    261 /**< Args: start_uaddr size access_rights, retval=errno */
                                                   >>  #define SOS_SYSCALL_ID_MRESIZE     262 /**< Args: old_uaddr old_size ptr_new_uaddr new_size flags, retval=errno */
                                                   >>  
                                                   >>  
                                                   >>  /**
                                                   >>   * Heap management
                                                   >>   */
                                                   >>  #define SOS_SYSCALL_ID_BRK         263 /**< Args: 0/new_top_heap, retval=top_heap */
                                                   >>  
 #define SOS_SYSCALL_ID_BOCHS_WRITE 43  /**< Ar     #define SOS_SYSCALL_ID_BOCHS_WRITE 43  /**< Args: string, retval=num_printed */
                                                    
                                                    
 #if defined(KERNEL_SOS) && !defined(ASM_SOURCE     #if defined(KERNEL_SOS) && !defined(ASM_SOURCE)
                                                    
 #include <sos/errno.h>                             #include <sos/errno.h>
 #include <hwcore/cpu_context.h>                    #include <hwcore/cpu_context.h>
                                                    
 /**                                                /**
  * "The" SOS syscall handler                        * "The" SOS syscall handler
  *                                                  *
  * @param syscall_id The identifier of the sys      * @param syscall_id The identifier of the syscall service
  * @param user_ctxt The user context making th      * @param user_ctxt The user context making the syscall
  */                                                 */
 sos_ret_t sos_do_syscall(int syscall_id,           sos_ret_t sos_do_syscall(int syscall_id,
                          const struct sos_cpu_                              const struct sos_cpu_state *user_ctxt);
                                                    
 #endif /* defined(KERNEL_SOS) && !defined(ASM_     #endif /* defined(KERNEL_SOS) && !defined(ASM_SOURCE) */
                                                    
 #endif /* _SOS_SYSCALL_H_ */                       #endif /* _SOS_SYSCALL_H_ */