Diff markup

Differences between /hwcore/segment.h (Article 7.5) and /hwcore/segment.h (Article 6.5)

 /* Copyright (C) 2004  The SOS Team                /* Copyright (C) 2004  The SOS Team
                                                    
    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_HWSEGS_H_                             #ifndef _SOS_HWSEGS_H_
 #define _SOS_HWSEGS_H_                             #define _SOS_HWSEGS_H_
                                                    
 /**                                                /**
  * @file segments.h                                 * @file segments.h
  *                                                  *
  * Global and local (GDT/LDT) segment descript      * Global and local (GDT/LDT) segment descriptor definition and
  * structure. These segments map virtual addre      * structure. These segments map virtual addresses (ie
  * data/instruction addresses, relative to the      * data/instruction addresses, relative to these segment descriptors)
  * to linear addresses (ie addresses in the pa      * to linear addresses (ie addresses in the paged-memory space).
  *                                                  *
  * @see Intel x86 doc, vol 3 chapter 3.             * @see Intel x86 doc, vol 3 chapter 3.
  */                                                 */
                                                    
                                                    
 /*                                                 /*
  * Global segment selectors (GDT) for SOS/x86.      * Global segment selectors (GDT) for SOS/x86.
  *                                                  *
  * @see gdt.h                                       * @see gdt.h
  */                                                 */
 #define SOS_SEG_NULL       0 /* NULL segment,      #define SOS_SEG_NULL       0 /* NULL segment, unused by the procesor */
 #define SOS_SEG_KCODE      1 /* Kernel code se     #define SOS_SEG_KCODE      1 /* Kernel code segment */
 #define SOS_SEG_KDATA      2 /* Kernel data se     #define SOS_SEG_KDATA      2 /* Kernel data segment */
 #define SOS_SEG_UCODE      3 /* User code segm << 
 #define SOS_SEG_UDATA      4 /* User data segm << 
 #define SOS_SEG_KERNEL_TSS 5 /* Kernel TSS for << 
                                                    
                                                    
 #ifndef ASM_SOURCE                                 #ifndef ASM_SOURCE
 /**                                                /**
  * Helper macro that builds a segment register      * Helper macro that builds a segment register's value
  */                                                 */
 #define SOS_BUILD_SEGMENT_REG_VALUE(desc_privi     #define SOS_BUILD_SEGMENT_REG_VALUE(desc_privilege,in_ldt,seg_index) \
   (  (((desc_privilege) & 0x3)  << 0) \              (  (((desc_privilege) & 0x3)  << 0) \
    | (((in_ldt)?1:0)            << 2) \               | (((in_ldt)?1:0)            << 2) \
    | ((seg_index)               << 3) )               | ((seg_index)               << 3) )
 #else                                              #else
 /*                                                 /*
  * Assembler-compliant version.                     * Assembler-compliant version.
  *                                                  *
  * Caution: In assembler code, "in_ldt" MUST b      * Caution: In assembler code, "in_ldt" MUST be either 1 or 0, nothing
  * else.                                            * else.
  */                                                 */
 #define SOS_BUILD_SEGMENT_REG_VALUE(desc_privi     #define SOS_BUILD_SEGMENT_REG_VALUE(desc_privilege,in_ldt,seg_index) \
   (  (((desc_privilege) & 0x3)  << 0) \              (  (((desc_privilege) & 0x3)  << 0) \
    | ((in_ldt & 1)              << 2) \               | ((in_ldt & 1)              << 2) \
    | ((seg_index)               << 3) )               | ((seg_index)               << 3) )
 #endif                                             #endif
                                                    
                                                    
 /*                                                 /*
  * Local segment selectors (LDT) for SOS/x86        * Local segment selectors (LDT) for SOS/x86
  */                                                 */
 /* None */                                         /* None */
                                                    
 #endif /* _SOS_HWSEGS_H_ */                        #endif /* _SOS_HWSEGS_H_ */