Diff markup

Differences between /drivers/bochs.h (Article 1) and /drivers/bochs.h (Article 7)

 /* Copyright (C) 2004  David Decotigny             /* Copyright (C) 2004  David Decotigny
    Copyright (C) 1999  Free Software Foundatio << 
                                                    
    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_BOCHS_H_                              #ifndef _SOS_BOCHS_H_
 #define _SOS_BOCHS_H_                              #define _SOS_BOCHS_H_
                                                    
 /**                                                /**
  * @file bochs.h                                    * @file bochs.h
  *                                                  *
  * If you compiled Bochs with the --enable-e9-      * If you compiled Bochs with the --enable-e9-hack, then any character
  * printed to the 0xE9 I/O port is printed to       * printed to the 0xE9 I/O port is printed to the xterm that is
  * running Bochs. This may appear to be a deta      * running Bochs. This may appear to be a detail, but in fact, this
  * functionnality is *VERY* precious for debug      * functionnality is *VERY* precious for debugging purposes. This
  * """driver""" handles this feature.               * """driver""" handles this feature.
  */                                                 */
                                                    
 #include <sos/errno.h>                             #include <sos/errno.h>
 #include <sos/types.h>                             #include <sos/types.h>
                                                    
 sos_ret_t sos_bochs_setup(void);                   sos_ret_t sos_bochs_setup(void);
                                                   >>  
                                                   >>  sos_ret_t sos_bochs_putchar(char c);
                                                    
 sos_ret_t sos_bochs_putstring(const char* str)     sos_ret_t sos_bochs_putstring(const char* str);
                                                    
 /** Print the least signficant 32 (nbytes == 4     /** Print the least signficant 32 (nbytes == 4), 24 (nbytes == 3), 16
     (nbytes == 2) or 8 (nbytes == 1) bits of v         (nbytes == 2) or 8 (nbytes == 1) bits of val in hexadecimal. */
 sos_ret_t sos_bochs_puthex(unsigned val, int n     sos_ret_t sos_bochs_puthex(unsigned val, int nbytes);
                                                    
 /** hexdump-style pretty printing */               /** hexdump-style pretty printing */
 sos_ret_t sos_bochs_hexdump(const void* addr,      sos_ret_t sos_bochs_hexdump(const void* addr, int nbytes);
                                                    
 /**                                                /**
  * Print the formatted string. Very restricted      * Print the formatted string. Very restricted version of printf(3):
  * 1/ can print max 255 chars, 2/ supports onl      * 1/ can print max 255 chars, 2/ supports only %d/%i, %c, %s, %x
  * without any support for flag charachters (e      * without any support for flag charachters (eg %08x).
  */                                                 */
 sos_ret_t sos_bochs_printf(const char *format,     sos_ret_t sos_bochs_printf(const char *format, /* args */...)
      __attribute__ ((format (printf, 1, 2)));           __attribute__ ((format (printf, 1, 2)));
                                                    
 #endif                                             #endif