- +

typedef __uint32_t u_int32_t typedef __uint32_t uint32_t

diff --git a/doc/html/ufs_8h-source.html b/doc/html/ufs_8h-source.html index 701a924..427356e 100644 --- a/doc/html/ufs_8h-source.html +++ b/doc/html/ufs_8h-source.html @@ -155,9 +155,9 @@ 00124 struct ufs2_dinode { 00125 u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ 00126 int16_t di_nlink; /* 2: File link count. */ -00127 u_int32_t di_uid; /* 4: File owner. */ -00128 u_int32_t di_gid; /* 8: File group. */ -00129 u_int32_t di_blksize; /* 12: Inode blocksize. */ +00127 uint32_t di_uid; /* 4: File owner. */ +00128 uint32_t di_gid; /* 8: File group. */ +00129 uint32_t di_blksize; /* 12: Inode blocksize. */ 00130 u_int64_t di_size; /* 16: File byte count. */ 00131 u_int64_t di_blocks; /* 24: Bytes actually held. */ 00132 ufs_time_t di_atime; /* 32: Last access time. */ @@ -169,8 +169,8 @@ 00138 int32_t di_ctimensec; /* 72: Last inode change time. */ 00139 int32_t di_birthnsec; /* 76: Inode creation time. */ 00140 int32_t di_gen; /* 80: Generation number. */ -00141 u_int32_t di_kernflags; /* 84: Kernel flags. */ -00142 u_int32_t di_flags; /* 88: Status flags (chflags). */ +00141 uint32_t di_kernflags; /* 84: Kernel flags. */ +00142 uint32_t di_flags; /* 88: Status flags (chflags). */ 00143 int32_t di_extsize; /* 92: External attributes block. */ 00144 ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */ 00145 ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ @@ -193,11 +193,11 @@ 00162 int32_t di_ctimensec; /* 36: Last inode change time. */ 00163 ufs1_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */ 00164 ufs1_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */ -00165 u_int32_t di_flags; /* 100: Status flags (chflags). */ +00165 uint32_t di_flags; /* 100: Status flags (chflags). */ 00166 int32_t di_blocks; /* 104: Blocks actually held. */ 00167 int32_t di_gen; /* 108: Generation number. */ -00168 u_int32_t di_uid; /* 112: File owner. */ -00169 u_int32_t di_gid; /* 116: File group. */ +00168 uint32_t di_uid; /* 112: File owner. */ +00169 uint32_t di_gid; /* 116: File group. */ 00170 int32_t di_spare[2]; /* 120: Reserved; currently unused */ 00171 }; 00172 diff --git a/doc/html/vmm_8h-source.html b/doc/html/vmm_8h-source.html index 397a552..82032e9 100644 --- a/doc/html/vmm_8h-source.html +++ b/doc/html/vmm_8h-source.html @@ -83,7 +83,7 @@ 00052 int vmm_init(); 00053 int vmmMemMapInit(); 00054 int countMemory(); -00055 u_int32_t vmmFindFreePage(pidType pid); +00055 uint32_t vmmFindFreePage(pidType pid); 00056 int freePage(uInt32 pageAddr); 00057 int adjustCowCounter(uInt32 baseAddr,int adjustment); 00058 void vmmFreeProcessPages(pidType pid); diff --git a/doc/html/vmm_8h.html b/doc/html/vmm_8h.html index e4b5610..28d360e 100644 --- a/doc/html/vmm_8h.html +++ b/doc/html/vmm_8h.html @@ -94,7 +94,7 @@ int vmm_init () -u_int32_t vmmFindFreePage (pidType pid) +uint32_t vmmFindFreePage (pidType pid) void vmmFreeProcessPages (pidType pid) @@ -353,7 +353,7 @@

- + diff --git a/doc/xml/bcopy_8c.xml b/doc/xml/bcopy_8c.xml index 874b821..aa8ae87 100644 --- a/doc/xml/bcopy_8c.xml +++ b/doc/xml/bcopy_8c.xml @@ -105,8 +105,8 @@ - u_int32_t - typedef u_int32_t uintptr_t + uint32_t + typedef uint32_t uintptr_t uintptr_t @@ -213,7 +213,7 @@ *SOTHATwmaskBELOWISALLONES */ typedefintword;/*"word"usedforoptimalcopyspeed*/ -typedefu_int32_tuintptr_t; +typedefuint32_tuintptr_t; #definewsizesizeof(word) #definewmask(wsize-1) diff --git a/doc/xml/elf_8c.xml b/doc/xml/elf_8c.xml index f07d4d2..c0d9ef3 100644 --- a/doc/xml/elf_8c.xml +++ b/doc/xml/elf_8c.xml @@ -138,7 +138,7 @@ int int elf_loadfile - (kTask_t *p, const char *file, u_int32_t *addr, u_int32_t *entry) + (kTask_t *p, const char *file, uint32_t *addr, uint32_t *entry) elf_loadfile kTask_t * @@ -149,11 +149,11 @@ file - u_int32_t * + uint32_t * addr - u_int32_t * + uint32_t * entry @@ -531,12 +531,12 @@ return((char*)elfRelType[relType].relTypeName); } -intelf_loadfile(kTask_t*p,constchar*file,u_int32_t*addr,u_int32_t*entry){ +intelf_loadfile(kTask_t*p,constchar*file,uint32_t*addr,uint32_t*entry){ inti=0x0; intx=0x0; intnumsegs=0x0; -u_int32_tbase=0x0; -u_int32_tbase_addr=0x0; +uint32_tbase=0x0; +uint32_tbase_addr=0x0; elfHeader*binaryHeader=0x0; elfProgramHeader*programHeader=0x0; fileDescriptor*exec_fd=0x0; diff --git a/doc/xml/elf_8h.xml b/doc/xml/elf_8h.xml index c9424bd..43f0345 100644 --- a/doc/xml/elf_8h.xml +++ b/doc/xml/elf_8h.xml @@ -692,7 +692,7 @@ int int elf_loadfile - (kTask_t *p, const char *file, u_int32_t *addr, u_int32_t *entry) + (kTask_t *p, const char *file, uint32_t *addr, uint32_t *entry) elf_loadfile kTask_t * @@ -703,11 +703,11 @@ file - u_int32_t * + uint32_t * addr - u_int32_t * + uint32_t * entry @@ -964,20 +964,20 @@ typedefstruct{ int32_texecfd; -u_int32_tphdr; -u_int32_tphent; -u_int32_tphnum; -u_int32_tpagesz; -u_int32_tbase; -u_int32_tflags; -u_int32_tentry; -u_int32_ttrace; +uint32_tphdr; +uint32_tphent; +uint32_tphnum; +uint32_tpagesz; +uint32_tbase; +uint32_tflags; +uint32_tentry; +uint32_ttrace; }Elf_Auxargs; char*elfGetShType(int); char*elfGetPhType(int); char*elfGetRelType(int); -intelf_loadfile(kTask_t*p,constchar*file,u_int32_t*addr,u_int32_t*entry); +intelf_loadfile(kTask_t*p,constchar*file,uint32_t*addr,uint32_t*entry); #defineELF32_R_SYM(i)((i)>>8) #defineELF32_R_TYPE(i)((unsignedchar)(i)) diff --git a/doc/xml/exec_8c.xml b/doc/xml/exec_8c.xml index d3413ef..a5672af 100644 --- a/doc/xml/exec_8c.xml +++ b/doc/xml/exec_8c.xml @@ -660,7 +660,7 @@ inti=0x0; intx=0x0; -u_int32_t*tmp=0x0; +uint32_t*tmp=0x0; fileDescriptor*tmpFd=0x0; elfHeader*binaryHeader=0x0; @@ -823,8 +823,8 @@ if(_current->id>4) kprintf("argv[0]:[%s]\n",argv[0]); kprintf("argv:[0x%X]\n",argv); -tmp[0]=(u_int32_t)argv; -tmp[1]=(u_int32_t)argv; +tmp[0]=(uint32_t)argv; +tmp[1]=(uint32_t)argv; /*SwitchBackToTheKernelsVMSpace*/ @@ -1034,7 +1034,7 @@ //if(_current->id>3){ -iFrame->user_esp=((u_int32_t)STACK_ADDR)-(sizeof(u_int32_t)*(argc+3)); +iFrame->user_esp=((uint32_t)STACK_ADDR)-(sizeof(uint32_t)*(argc+3)); tmp=iFrame->user_esp; tmp[0]=argc; @@ -1045,10 +1045,10 @@ tmp[argc+2]=0x1; //} //else{ -//tmp=(u_int32_t*)STACK_ADDR-2; +//tmp=(uint32_t*)STACK_ADDR-2; //tmp[0]=0x1; //tmp[1]=0x0; -//tmp[1]=(u_int32_t)argv; +//tmp[1]=(uint32_t)argv; //} kfree(argvNew); /*NowThatWeRelocatedTheBinaryWeCanUnmapAndFreeHeaderInfo*/ @@ -1063,11 +1063,11 @@ inti=0x0; intx=0x0; intargc=0x0; -u_int32_tseg_size=0x0; -u_int32_tseg_addr=0x0; -u_int32_taddr=0x0; -u_int32_teip=0x0; -u_int32_tproghdr=0x0; +uint32_tseg_size=0x0; +uint32_tseg_addr=0x0; +uint32_taddr=0x0; +uint32_teip=0x0; +uint32_tproghdr=0x0; char*args=0x0; char*interp=0x0; char**argv=0x0; @@ -1191,7 +1191,7 @@ //if(_current->id>3){ -iFrame->user_esp=((u_int32_t)STACK_ADDR)-(sizeof(u_int32_t)*(argc+3+sizeof(Elf_Auxargs))); +iFrame->user_esp=((uint32_t)STACK_ADDR)-(sizeof(uint32_t)*(argc+3+sizeof(Elf_Auxargs))); args=iFrame->user_esp; args[0]=argc; diff --git a/doc/xml/getfreevirtualpage_8c.xml b/doc/xml/getfreevirtualpage_8c.xml index 68415b4..cdac015 100644 --- a/doc/xml/getfreevirtualpage_8c.xml +++ b/doc/xml/getfreevirtualpage_8c.xml @@ -278,7 +278,7 @@ kpanic("InvalidvmStart\n"); if(type==VM_THRD){ -start_page=(u_int32_t)(_current->td.vm_daddr+ctob(_current->td.vm_dsize)); +start_page=(uint32_t)(_current->td.vm_daddr+ctob(_current->td.vm_dsize)); } elseif(type==VM_TASK){ //kprintf("vmStart"); diff --git a/doc/xml/getphysicaladdr_8c.xml b/doc/xml/getphysicaladdr_8c.xml index 6be70e6..84c9843 100644 --- a/doc/xml/getphysicaladdr_8c.xml +++ b/doc/xml/getphysicaladdr_8c.xml @@ -61,8 +61,8 @@ - u_int32_t - u_int32_t vmm_getPhysicalAddr + uint32_t + uint32_t vmm_getPhysicalAddr (uInt32 pageAddr) vmm_getPhysicalAddr @@ -119,7 +119,7 @@ #include<vmm/vmm.h> -u_int32_tvmm_getPhysicalAddr(uInt32pageAddr){ +uint32_tvmm_getPhysicalAddr(uInt32pageAddr){ intpageDirectoryIndex=0x0,pageTableIndex=0x0; uInt32*pageTable=0x0; diff --git a/doc/xml/hd_8h.xml b/doc/xml/hd_8h.xml index 8ddf893..153fab8 100644 --- a/doc/xml/hd_8h.xml +++ b/doc/xml/hd_8h.xml @@ -702,7 +702,7 @@ #defineMAXPARTITIONS8 structbsd_disklabel{ -u_int32_td_magic;/*themagicnumber*/ +uint32_td_magic;/*themagicnumber*/ u_int16_td_type;/*drivetype*/ u_int16_td_subtype;/*controller/d_typespecific*/ chard_typename[16];/*typename,e.g."eagle"*/ @@ -710,12 +710,12 @@ chard_packname[16];/*packidentifier*/ /*diskgeometry:*/ -u_int32_td_secsize;/*#ofbytespersector*/ -u_int32_td_nsectors;/*#ofdatasectorspertrack*/ -u_int32_td_ntracks;/*#oftrackspercylinder*/ -u_int32_td_ncylinders;/*#ofdatacylindersperunit*/ -u_int32_td_secpercyl;/*#ofdatasectorspercylinder*/ -u_int32_td_secperunit;/*#ofdatasectorsperunit*/ +uint32_td_secsize;/*#ofbytespersector*/ +uint32_td_nsectors;/*#ofdatasectorspertrack*/ +uint32_td_ntracks;/*#oftrackspercylinder*/ +uint32_td_ncylinders;/*#ofdatacylindersperunit*/ +uint32_td_secpercyl;/*#ofdatasectorspercylinder*/ +uint32_td_secperunit;/*#ofdatasectorsperunit*/ /* *Spares(badsectorreplacements)belowarenotcountedin @@ -729,7 +729,7 @@ *Alternatecylindersincludemaintenance,replacement,configuration *descriptionareas,etc. */ -u_int32_td_acylinders;/*#ofalt.cylindersperunit*/ +uint32_td_acylinders;/*#ofalt.cylindersperunit*/ /*hardwarecharacteristics:*/ /* @@ -752,24 +752,24 @@ u_int16_td_interleave;/*hardwaresectorinterleave*/ u_int16_td_trackskew;/*sector0skew,pertrack*/ u_int16_td_cylskew;/*sector0skew,percylinder*/ -u_int32_td_headswitch;/*headswitchtime,usec*/ -u_int32_td_trkseek;/*track-to-trackseek,usec*/ -u_int32_td_flags;/*genericflags*/ +uint32_td_headswitch;/*headswitchtime,usec*/ +uint32_td_trkseek;/*track-to-trackseek,usec*/ +uint32_td_flags;/*genericflags*/ #defineNDDATA5 -u_int32_td_drivedata[NDDATA];/*drive-typespecificinformation*/ +uint32_td_drivedata[NDDATA];/*drive-typespecificinformation*/ #defineNSPARE5 -u_int32_td_spare[NSPARE];/*reservedforfutureuse*/ -u_int32_td_magic2;/*themagicnumber(again)*/ +uint32_td_spare[NSPARE];/*reservedforfutureuse*/ +uint32_td_magic2;/*themagicnumber(again)*/ u_int16_td_checksum;/*xorofdataincl.partitions*/ /*filesystemandpartitioninformation:*/ u_int16_td_npartitions;/*numberofpartitionsinfollowing*/ -u_int32_td_bbsize;/*sizeofbootareaatsn0,bytes*/ -u_int32_td_sbsize;/*maxsizeoffssuperblock,bytes*/ +uint32_td_bbsize;/*sizeofbootareaatsn0,bytes*/ +uint32_td_sbsize;/*maxsizeoffssuperblock,bytes*/ structpartition{/*thepartitiontable*/ -u_int32_tp_size;/*numberofsectorsinpartition*/ -u_int32_tp_offset;/*startingsector*/ -u_int32_tp_fsize;/*filesystembasicfragmentsize*/ +uint32_tp_size;/*numberofsectorsinpartition*/ +uint32_tp_offset;/*startingsector*/ +uint32_tp_fsize;/*filesystembasicfragmentsize*/ u_int8_tp_fstype;/*filesystemtype,seebelow*/ u_int8_tp_frag;/*filesystemfragmentsperblock*/ u_int16_tp_cpg;/*filesystemcylinderspergroup*/ diff --git a/doc/xml/include_2ubixos_2types_8h.xml b/doc/xml/include_2ubixos_2types_8h.xml index 46fc34a..9e54d8c 100644 --- a/doc/xml/include_2ubixos_2types_8h.xml +++ b/doc/xml/include_2ubixos_2types_8h.xml @@ -2340,9 +2340,9 @@ __uint32_t - typedef __uint32_t u_int32_t + typedef __uint32_t uint32_t - u_int32_t + uint32_t @@ -2563,7 +2563,7 @@ typedef__uint8_tu_int8_t;/*unsignedintegrals(deprecated)*/ typedef__uint16_tu_int16_t; -typedef__uint32_tu_int32_t; +typedef__uint32_tuint32_t; typedef__uint64_tu_int64_t; //typedeflonglongintquad_t; typedef__uint64_tquad_t; diff --git a/doc/xml/index.xml b/doc/xml/index.xml index 4fa1895..466f856 100644 --- a/doc/xml/index.xml +++ b/doc/xml/index.xml @@ -2134,7 +2134,7 @@ u_char u_int u_int16_t - u_int32_t + uint32_t u_int64_t u_int8_t u_long diff --git a/doc/xml/kern__sysctl_8c.xml b/doc/xml/kern__sysctl_8c.xml index dd82785..ade2742 100644 --- a/doc/xml/kern__sysctl_8c.xml +++ b/doc/xml/kern__sysctl_8c.xml @@ -518,7 +518,7 @@ endTask(_current->id); } -if((u_int32_t)uap->oldlenp<tmpCtl->val_len) +if((uint32_t)uap->oldlenp<tmpCtl->val_len) memcpy(uap->old,tmpCtl->value,(uInt32)uap->oldlenp); else memcpy(uap->old,tmpCtl->value,tmpCtl->val_len); diff --git a/doc/xml/paging_8c.xml b/doc/xml/paging_8c.xml index a23fb64..1c77ec7 100644 --- a/doc/xml/paging_8c.xml +++ b/doc/xml/paging_8c.xml @@ -258,10 +258,10 @@ int int vmm_cleanVirtualSpace - (u_int32_t addr) + (uint32_t addr) vmm_cleanVirtualSpace - u_int32_t + uint32_t addr @@ -1020,7 +1020,7 @@ } intobreak(structthread*td,structobreak_args*uap){ -u_int32_ti=0x0; +uint32_ti=0x0; vm_offset_told=0x0; vm_offset_tbase=0x0; vm_offset_tnew=0x0; @@ -1063,11 +1063,11 @@ return(0x0); } -intvmm_cleanVirtualSpace(u_int32_taddr){ +intvmm_cleanVirtualSpace(uint32_taddr){ intx=0x0; inty=0x0; -u_int32_t*pageTableSrc=0x0; -u_int32_t*pageDir=0x0; +uint32_t*pageTableSrc=0x0; +uint32_t*pageDir=0x0; pageDir=(uInt32*)parentPageDirAddr; diff --git a/doc/xml/sched_8c.xml b/doc/xml/sched_8c.xml index c92cd8d..88abbd0 100644 --- a/doc/xml/sched_8c.xml +++ b/doc/xml/sched_8c.xml @@ -775,7 +775,7 @@ /*HACK*/ for(i=0;i<3;i++){ fp=kmalloc(sizeof(structfile)); -tmpTask->td.o_files[i]=(u_int32_t)fp; +tmpTask->td.o_files[i]=(uint32_t)fp; fp->f_flag=0x4; } diff --git a/doc/xml/structbsd__disklabel.xml b/doc/xml/structbsd__disklabel.xml index 63eaeb8..663f832 100644 --- a/doc/xml/structbsd__disklabel.xml +++ b/doc/xml/structbsd__disklabel.xml @@ -6,8 +6,8 @@ bsd_disklabel::partition - u_int32_t - u_int32_t bsd_disklabel::d_acylinders + uint32_t + uint32_t bsd_disklabel::d_acylinders d_acylinders @@ -19,8 +19,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_bbsize + uint32_t + uint32_t bsd_disklabel::d_bbsize d_bbsize @@ -58,8 +58,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_drivedata[5] + uint32_t + uint32_t bsd_disklabel::d_drivedata[5] [5] d_drivedata @@ -71,8 +71,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_flags + uint32_t + uint32_t bsd_disklabel::d_flags d_flags @@ -84,8 +84,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_headswitch + uint32_t + uint32_t bsd_disklabel::d_headswitch d_headswitch @@ -110,8 +110,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_magic + uint32_t + uint32_t bsd_disklabel::d_magic d_magic @@ -123,8 +123,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_magic2 + uint32_t + uint32_t bsd_disklabel::d_magic2 d_magic2 @@ -136,8 +136,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_ncylinders + uint32_t + uint32_t bsd_disklabel::d_ncylinders d_ncylinders @@ -163,8 +163,8 @@ initHardDisk - u_int32_t - u_int32_t bsd_disklabel::d_nsectors + uint32_t + uint32_t bsd_disklabel::d_nsectors d_nsectors @@ -176,8 +176,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_ntracks + uint32_t + uint32_t bsd_disklabel::d_ntracks d_ntracks @@ -229,8 +229,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_sbsize + uint32_t + uint32_t bsd_disklabel::d_sbsize d_sbsize @@ -242,8 +242,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_secpercyl + uint32_t + uint32_t bsd_disklabel::d_secpercyl d_secpercyl @@ -255,8 +255,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_secperunit + uint32_t + uint32_t bsd_disklabel::d_secperunit d_secperunit @@ -268,8 +268,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_secsize + uint32_t + uint32_t bsd_disklabel::d_secsize d_secsize @@ -281,8 +281,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_spare[5] + uint32_t + uint32_t bsd_disklabel::d_spare[5] [5] d_spare @@ -346,8 +346,8 @@ - u_int32_t - u_int32_t bsd_disklabel::d_trkseek + uint32_t + uint32_t bsd_disklabel::d_trkseek d_trkseek diff --git a/doc/xml/structbsd__disklabel_1_1partition.xml b/doc/xml/structbsd__disklabel_1_1partition.xml index 1ad3fa3..567401b 100644 --- a/doc/xml/structbsd__disklabel_1_1partition.xml +++ b/doc/xml/structbsd__disklabel_1_1partition.xml @@ -31,8 +31,8 @@ - u_int32_t - u_int32_t bsd_disklabel::partition::p_fsize + uint32_t + uint32_t bsd_disklabel::partition::p_fsize p_fsize @@ -58,8 +58,8 @@ initHardDisk - u_int32_t - u_int32_t bsd_disklabel::partition::p_offset + uint32_t + uint32_t bsd_disklabel::partition::p_offset p_offset @@ -72,8 +72,8 @@ initHardDisk - u_int32_t - u_int32_t bsd_disklabel::partition::p_size + uint32_t + uint32_t bsd_disklabel::partition::p_size p_size diff --git a/doc/xml/structthread.xml b/doc/xml/structthread.xml index 0b9d80a..a260eef 100644 --- a/doc/xml/structthread.xml +++ b/doc/xml/structthread.xml @@ -5,8 +5,8 @@ thread.h - u_int32_t - u_int32_t thread::o_files[64] + uint32_t + uint32_t thread::o_files[64] [64] o_files diff --git a/doc/xml/structufs1__dinode.xml b/doc/xml/structufs1__dinode.xml index 820ebb2..7518155 100644 --- a/doc/xml/structufs1__dinode.xml +++ b/doc/xml/structufs1__dinode.xml @@ -83,8 +83,8 @@ - u_int32_t - u_int32_t ufs1_dinode::di_flags + uint32_t + uint32_t ufs1_dinode::di_flags di_flags @@ -109,8 +109,8 @@ - u_int32_t - u_int32_t ufs1_dinode::di_gid + uint32_t + uint32_t ufs1_dinode::di_gid di_gid @@ -226,8 +226,8 @@ - u_int32_t - u_int32_t ufs1_dinode::di_uid + uint32_t + uint32_t ufs1_dinode::di_uid di_uid diff --git a/doc/xml/structufs2__dinode.xml b/doc/xml/structufs2__dinode.xml index afbcca3..39dfc4d 100644 --- a/doc/xml/structufs2__dinode.xml +++ b/doc/xml/structufs2__dinode.xml @@ -57,8 +57,8 @@ - u_int32_t - u_int32_t ufs2_dinode::di_blksize + uint32_t + uint32_t ufs2_dinode::di_blksize di_blksize @@ -149,8 +149,8 @@ - u_int32_t - u_int32_t ufs2_dinode::di_flags + uint32_t + uint32_t ufs2_dinode::di_flags di_flags @@ -175,8 +175,8 @@ - u_int32_t - u_int32_t ufs2_dinode::di_gid + uint32_t + uint32_t ufs2_dinode::di_gid di_gid @@ -202,8 +202,8 @@ fsread - u_int32_t - u_int32_t ufs2_dinode::di_kernflags + uint32_t + uint32_t ufs2_dinode::di_kernflags di_kernflags @@ -294,8 +294,8 @@ - u_int32_t - u_int32_t ufs2_dinode::di_uid + uint32_t + uint32_t ufs2_dinode::di_uid di_uid diff --git a/doc/xml/thread_8h.xml b/doc/xml/thread_8h.xml index 3090c52..cb88d20 100644 --- a/doc/xml/thread_8h.xml +++ b/doc/xml/thread_8h.xml @@ -739,7 +739,7 @@ structthread{ inttd_retval[2]; -u_int32_to_files[O_FILES]; +uint32_to_files[O_FILES]; char*vm_daddr; int32_tvm_dsize; }; diff --git a/doc/xml/ufs_8h.xml b/doc/xml/ufs_8h.xml index 5377b8b..ee86a40 100644 --- a/doc/xml/ufs_8h.xml +++ b/doc/xml/ufs_8h.xml @@ -838,9 +838,9 @@ structufs2_dinode{ u_int16_tdi_mode;/*0:IFMT,permissions;seebelow.*/ int16_tdi_nlink;/*2:Filelinkcount.*/ -u_int32_tdi_uid;/*4:Fileowner.*/ -u_int32_tdi_gid;/*8:Filegroup.*/ -u_int32_tdi_blksize;/*12:Inodeblocksize.*/ +uint32_tdi_uid;/*4:Fileowner.*/ +uint32_tdi_gid;/*8:Filegroup.*/ +uint32_tdi_blksize;/*12:Inodeblocksize.*/ u_int64_tdi_size;/*16:Filebytecount.*/ u_int64_tdi_blocks;/*24:Bytesactuallyheld.*/ ufs_time_tdi_atime;/*32:Lastaccesstime.*/ @@ -852,8 +852,8 @@ int32_tdi_ctimensec;/*72:Lastinodechangetime.*/ int32_tdi_birthnsec;/*76:Inodecreationtime.*/ int32_tdi_gen;/*80:Generationnumber.*/ -u_int32_tdi_kernflags;/*84:Kernelflags.*/ -u_int32_tdi_flags;/*88:Statusflags(chflags).*/ +uint32_tdi_kernflags;/*84:Kernelflags.*/ +uint32_tdi_flags;/*88:Statusflags(chflags).*/ int32_tdi_extsize;/*92:Externalattributesblock.*/ ufs2_daddr_tdi_extb[NXADDR];/*96:Externalattributesblock.*/ ufs2_daddr_tdi_db[NDADDR];/*112:Directdiskblocks.*/ @@ -876,11 +876,11 @@ int32_tdi_ctimensec;/*36:Lastinodechangetime.*/ ufs1_daddr_tdi_db[NDADDR];/*40:Directdiskblocks.*/ ufs1_daddr_tdi_ib[NIADDR];/*88:Indirectdiskblocks.*/ -u_int32_tdi_flags;/*100:Statusflags(chflags).*/ +uint32_tdi_flags;/*100:Statusflags(chflags).*/ int32_tdi_blocks;/*104:Blocksactuallyheld.*/ int32_tdi_gen;/*108:Generationnumber.*/ -u_int32_tdi_uid;/*112:Fileowner.*/ -u_int32_tdi_gid;/*116:Filegroup.*/ +uint32_tdi_uid;/*112:Fileowner.*/ +uint32_tdi_gid;/*116:Filegroup.*/ int32_tdi_spare[2];/*120:Reserved;currentlyunused*/ }; diff --git a/doc/xml/vmm_8h.xml b/doc/xml/vmm_8h.xml index 000249e..ca38651 100644 --- a/doc/xml/vmm_8h.xml +++ b/doc/xml/vmm_8h.xml @@ -396,8 +396,8 @@ vmmMemMapInit - u_int32_t - u_int32_t vmmFindFreePage + uint32_t + uint32_t vmmFindFreePage (pidType pid) vmmFindFreePage @@ -603,7 +603,7 @@ intvmm_init(); intvmmMemMapInit(); intcountMemory(); -u_int32_tvmmFindFreePage(pidTypepid); +uint32_tvmmFindFreePage(pidTypepid); intfreePage(uInt32pageAddr); intadjustCowCounter(uInt32baseAddr,intadjustment); voidvmmFreeProcessPages(pidTypepid); diff --git a/src/include.new/altq/altq.h b/src/include.new/altq/altq.h index 3875043..b6220d9 100644 --- a/src/include.new/altq/altq.h +++ b/src/include.new/altq/altq.h @@ -108,7 +108,7 @@ struct in_addr fi_src; /* src address */ u_int16_t fi_dport; /* dest port */ u_int16_t fi_sport; /* src port */ - u_int32_t fi_gpi; /* generalized port id for ipsec */ + uint32_t fi_gpi; /* generalized port id for ipsec */ u_int8_t _pad[28]; /* make the size equal to flowinfo_in6 */ }; @@ -119,10 +119,10 @@ u_char fi6_family; /* AF_INET6 */ u_int8_t fi6_proto; /* IPPROTO_XXX */ u_int8_t fi6_tclass; /* traffic class */ - u_int32_t fi6_flowlabel; /* ipv6 flowlabel */ + uint32_t fi6_flowlabel; /* ipv6 flowlabel */ u_int16_t fi6_dport; /* dest port */ u_int16_t fi6_sport; /* src port */ - u_int32_t fi6_gpi; /* generalized port id */ + uint32_t fi6_gpi; /* generalized port id */ struct in6_addr fi6_dst; /* dest address */ struct in6_addr fi6_src; /* src address */ }; diff --git a/src/include.new/altq/altq_cbq.h b/src/include.new/altq/altq_cbq.h index 30a15c7..723bebb 100644 --- a/src/include.new/altq/altq_cbq.h +++ b/src/include.new/altq/altq_cbq.h @@ -68,7 +68,7 @@ #define CBQ_MAXPRI RM_MAXPRIO typedef struct _cbq_class_stats_ { - u_int32_t handle; + uint32_t handle; u_int depth; struct pktcntr xmit_cnt; /* packets sent in this class */ @@ -116,8 +116,8 @@ u_int maxidle; int minidle; u_int offtime; - u_int32_t parent_class_handle; - u_int32_t borrow_class_handle; + uint32_t parent_class_handle; + uint32_t borrow_class_handle; u_int pktsize; int flags; @@ -127,24 +127,24 @@ struct cbq_interface cbq_iface; cbq_class_spec_t cbq_class; - u_int32_t cbq_class_handle; + uint32_t cbq_class_handle; }; struct cbq_delete_class { struct cbq_interface cbq_iface; - u_int32_t cbq_class_handle; + uint32_t cbq_class_handle; }; struct cbq_modify_class { struct cbq_interface cbq_iface; cbq_class_spec_t cbq_class; - u_int32_t cbq_class_handle; + uint32_t cbq_class_handle; }; struct cbq_add_filter { struct cbq_interface cbq_iface; - u_int32_t cbq_class_handle; + uint32_t cbq_class_handle; struct flow_filter cbq_filter; u_long cbq_filter_handle; diff --git a/src/include.new/altq/altq_cdnr.h b/src/include.new/altq/altq_cdnr.h index d55402f..f22fec7 100644 --- a/src/include.new/altq/altq_cdnr.h +++ b/src/include.new/altq/altq_cdnr.h @@ -144,9 +144,9 @@ /* time sliding window three-color marker operations */ struct cdnr_add_tswtcm { struct cdnr_interface iface; - u_int32_t cmtd_rate; /* committed rate (bits/sec) */ - u_int32_t peak_rate; /* peak rate (bits/sec) */ - u_int32_t avg_interval; /* averaging interval (msec) */ + uint32_t cmtd_rate; /* committed rate (bits/sec) */ + uint32_t peak_rate; /* peak rate (bits/sec) */ + uint32_t avg_interval; /* averaging interval (msec) */ struct tc_action green_action; /* action for green packets */ struct tc_action yellow_action; /* action for yellow packets */ struct tc_action red_action; /* action for red packets */ @@ -157,9 +157,9 @@ struct cdnr_modify_tswtcm { struct cdnr_interface iface; u_long cdnr_handle; - u_int32_t cmtd_rate; /* committed rate (bits/sec) */ - u_int32_t peak_rate; /* peak rate (bits/sec) */ - u_int32_t avg_interval; /* averaging interval (msec) */ + uint32_t cmtd_rate; /* committed rate (bits/sec) */ + uint32_t peak_rate; /* peak rate (bits/sec) */ + uint32_t avg_interval; /* averaging interval (msec) */ }; struct cdnr_add_filter { @@ -313,12 +313,12 @@ struct tswtcm { struct cdnr_block cdnrblk; /* conditioner block */ - u_int32_t avg_rate; /* average rate (bytes/sec) */ + uint32_t avg_rate; /* average rate (bytes/sec) */ u_int64_t t_front; /* timestamp of last update */ u_int64_t timewin; /* average interval */ - u_int32_t cmtd_rate; /* committed target rate */ - u_int32_t peak_rate; /* peak target rate */ + uint32_t cmtd_rate; /* committed target rate */ + uint32_t peak_rate; /* peak target rate */ struct tc_action green_action; struct tc_action yellow_action; struct tc_action red_action; diff --git a/src/include.new/altq/altq_hfsc.h b/src/include.new/altq/altq_hfsc.h index d04b378..f343477 100644 --- a/src/include.new/altq/altq_hfsc.h +++ b/src/include.new/altq/altq_hfsc.h @@ -66,7 +66,7 @@ struct hfsc_classstats { u_int class_id; - u_int32_t class_handle; + uint32_t class_handle; struct service_curve rsc; struct service_curve fsc; struct service_curve usc; /* upper limit service curve */ @@ -89,7 +89,7 @@ u_int64_t myfadj; /* cl_myfadj */ u_int64_t vtadj; /* cl_vtadj */ u_int64_t cur_time; - u_int32_t machclk_freq; + uint32_t machclk_freq; u_int qlength; u_int qlimit; @@ -118,29 +118,29 @@ struct hfsc_add_class { struct hfsc_interface iface; - u_int32_t parent_handle; + uint32_t parent_handle; struct service_curve service_curve; int qlimit; int flags; - u_int32_t class_handle; /* return value */ + uint32_t class_handle; /* return value */ }; struct hfsc_delete_class { struct hfsc_interface iface; - u_int32_t class_handle; + uint32_t class_handle; }; struct hfsc_modify_class { struct hfsc_interface iface; - u_int32_t class_handle; + uint32_t class_handle; struct service_curve service_curve; int sctype; }; struct hfsc_add_filter { struct hfsc_interface iface; - u_int32_t class_handle; + uint32_t class_handle; struct flow_filter filter; u_long filter_handle; /* return value */ @@ -156,7 +156,7 @@ int nskip; /* skip # of classes */ int nclasses; /* # of class stats (WR) */ u_int64_t cur_time; /* current time */ - u_int32_t machclk_freq; /* machine clock frequency */ + uint32_t machclk_freq; /* machine clock frequency */ u_int hif_classes; /* # of classes in the tree */ u_int hif_packets; /* # of packets in the tree */ struct hfsc_classstats *stats; /* pointer to stats array */ @@ -220,7 +220,7 @@ struct hfsc_class { u_int cl_id; /* class id (just for debug) */ - u_int32_t cl_handle; /* class handle */ + uint32_t cl_handle; /* class handle */ struct hfsc_if *cl_hif; /* back pointer to struct hfsc_if */ int cl_flags; /* misc flags */ diff --git a/src/include.new/altq/altq_priq.h b/src/include.new/altq/altq_priq.h index 481d31b..2851702 100644 --- a/src/include.new/altq/altq_priq.h +++ b/src/include.new/altq/altq_priq.h @@ -51,7 +51,7 @@ int qlimit; /* queue size limit */ int flags; /* misc flags (see below) */ - u_int32_t class_handle; /* return value */ + uint32_t class_handle; /* return value */ }; #endif /* ALTQ3_COMPAT */ @@ -68,12 +68,12 @@ #ifdef ALTQ3_COMPAT struct priq_delete_class { struct priq_interface iface; - u_int32_t class_handle; + uint32_t class_handle; }; struct priq_modify_class { struct priq_interface iface; - u_int32_t class_handle; + uint32_t class_handle; int pri; int qlimit; int flags; @@ -81,7 +81,7 @@ struct priq_add_filter { struct priq_interface iface; - u_int32_t class_handle; + uint32_t class_handle; struct flow_filter filter; u_long filter_handle; /* return value */ @@ -94,7 +94,7 @@ #endif /* ALTQ3_COMPAT */ struct priq_classstats { - u_int32_t class_handle; + uint32_t class_handle; u_int qlength; u_int qlimit; @@ -132,7 +132,7 @@ #ifdef _KERNEL struct priq_class { - u_int32_t cl_handle; /* class handle */ + uint32_t cl_handle; /* class handle */ class_queue_t *cl_q; /* class queue structure */ struct red *cl_red; /* RED state */ int cl_pri; /* priority */ diff --git a/src/include.new/altq/altq_var.h b/src/include.new/altq/altq_var.h index fc7f995..75f9c8b 100644 --- a/src/include.new/altq/altq_var.h +++ b/src/include.new/altq/altq_var.h @@ -43,7 +43,7 @@ LIST_ENTRY(acc_filter) f_chain; void *f_class; /* pointer to the class */ u_long f_handle; /* filter id */ - u_int32_t f_fbmask; /* filter bitmask */ + uint32_t f_fbmask; /* filter bitmask */ struct flow_filter f_filter; /* filter value */ }; @@ -77,7 +77,7 @@ #endif struct acc_classifier { - u_int32_t acc_fbmask; + uint32_t acc_fbmask; LIST_HEAD(filt, acc_filter) acc_filters[ACC_FILTER_TABLESIZE]; #if (__FreeBSD_version > 500000) @@ -119,8 +119,8 @@ * a 64bit high resolution time counter. */ extern int machclk_usepcc; -extern u_int32_t machclk_freq; -extern u_int32_t machclk_per_tick; +extern uint32_t machclk_freq; +extern uint32_t machclk_per_tick; extern void init_machclk(void); extern u_int64_t read_machclk(void); @@ -215,7 +215,7 @@ void *altq_lookup(char *, int); #ifdef ALTQ3_CLFIER_COMPAT -int altq_extractflow(struct mbuf *, int, struct flowinfo *, u_int32_t); +int altq_extractflow(struct mbuf *, int, struct flowinfo *, uint32_t); int acc_add_filter(struct acc_classifier *, struct flow_filter *, void *, u_long *); int acc_delete_filter(struct acc_classifier *, u_long); diff --git a/src/include.new/altq/if_altq.h b/src/include.new/altq/if_altq.h index 6e50b91..0b71eaf 100644 --- a/src/include.new/altq/if_altq.h +++ b/src/include.new/altq/if_altq.h @@ -107,7 +107,7 @@ * mbuf tag to carry a queue id (and hints for ECN). */ struct altq_tag { - u_int32_t qid; /* queue id */ + uint32_t qid; /* queue id */ /* hints for ecn */ int af; /* address family */ void *hdr; /* saved header position in mbuf */ diff --git a/src/include.new/arpa/nameser.h b/src/include.new/arpa/nameser.h index c286cae..fb22cf6 100644 --- a/src/include.new/arpa/nameser.h +++ b/src/include.new/arpa/nameser.h @@ -83,7 +83,7 @@ #define NS_HFIXEDSZ 12 /*%< #/bytes of fixed data in header */ #define NS_QFIXEDSZ 4 /*%< #/bytes of fixed data in query */ #define NS_RRFIXEDSZ 10 /*%< #/bytes of fixed data in r record */ -#define NS_INT32SZ 4 /*%< #/bytes of data in a u_int32_t */ +#define NS_INT32SZ 4 /*%< #/bytes of data in a uint32_t */ #define NS_INT16SZ 2 /*%< #/bytes of data in a u_int16_t */ #define NS_INT8SZ 1 /*%< #/bytes of data in a u_int8_t */ #define NS_INADDRSZ 4 /*%< IPv4 T_A */ @@ -161,7 +161,7 @@ char name[NS_MAXDNAME]; u_int16_t type; u_int16_t rr_class; - u_int32_t ttl; + uint32_t ttl; u_int16_t rdlength; const u_char * rdata; } ns_rr; @@ -491,10 +491,10 @@ #define NS_GET32(l, cp) do { \ register const u_char *t_cp = (const u_char *)(cp); \ - (l) = ((u_int32_t)t_cp[0] << 24) \ - | ((u_int32_t)t_cp[1] << 16) \ - | ((u_int32_t)t_cp[2] << 8) \ - | ((u_int32_t)t_cp[3]) \ + (l) = ((uint32_t)t_cp[0] << 24) \ + | ((uint32_t)t_cp[1] << 16) \ + | ((uint32_t)t_cp[2] << 8) \ + | ((uint32_t)t_cp[3]) \ ; \ (cp) += NS_INT32SZ; \ } while (0) @@ -508,7 +508,7 @@ } while (0) #define NS_PUT32(l, cp) do { \ - register u_int32_t t_l = (u_int32_t)(l); \ + register uint32_t t_l = (uint32_t)(l); \ register u_char *t_cp = (u_char *)(cp); \ *t_cp++ = t_l >> 24; \ *t_cp++ = t_l >> 16; \ @@ -599,7 +599,7 @@ int ns_format_ttl(u_long, char *, size_t); int ns_parse_ttl(const char *, u_long *); #if 0 -u_int32_t ns_datetosecs(const char *cp, int *errp); +uint32_t ns_datetosecs(const char *cp, int *errp); #endif int ns_name_ntol(const u_char *, u_char *, size_t); int ns_name_ntop(const u_char *, char *, size_t); @@ -659,7 +659,7 @@ ns_type qtype, ns_class qclass); int ns_newmsg_rr(ns_newmsg *handle, ns_sect sect, ns_nname_ct name, ns_type type, - ns_class rr_class, u_int32_t ttl, + ns_class rr_class, uint32_t ttl, u_int16_t rdlen, const u_char *rdata); size_t ns_newmsg_done(ns_newmsg *handle); ssize_t ns_rdata_unpack(const u_char *, const u_char *, ns_type, diff --git a/src/include.new/bsm/audit.h b/src/include.new/bsm/audit.h index 1be13f5..853d2b7 100644 --- a/src/include.new/bsm/audit.h +++ b/src/include.new/bsm/audit.h @@ -172,19 +172,19 @@ typedef pid_t au_asid_t; typedef u_int16_t au_event_t; typedef u_int16_t au_emod_t; -typedef u_int32_t au_class_t; +typedef uint32_t au_class_t; typedef u_int64_t au_asflgs_t __attribute__ ((aligned (8))); struct au_tid { dev_t port; - u_int32_t machine; + uint32_t machine; }; typedef struct au_tid au_tid_t; struct au_tid_addr { dev_t at_port; - u_int32_t at_type; - u_int32_t at_addr[4]; + uint32_t at_type; + uint32_t at_addr[4]; }; typedef struct au_tid_addr au_tid_addr_t; diff --git a/src/include.new/bsm/audit_internal.h b/src/include.new/bsm/audit_internal.h index ae2a4e3..61fc712 100644 --- a/src/include.new/bsm/audit_internal.h +++ b/src/include.new/bsm/audit_internal.h @@ -72,9 +72,9 @@ * token structures may contain pointers of whose contents we do not know the * size (e.g text tokens). */ -#define AUDIT_HEADER_EX_SIZE(a) ((a)->ai_termid.at_type+18+sizeof(u_int32_t)) +#define AUDIT_HEADER_EX_SIZE(a) ((a)->ai_termid.at_type+18+sizeof(uint32_t)) #define AUDIT_HEADER_SIZE 18 -#define MAX_AUDIT_HEADER_SIZE (5*sizeof(u_int32_t)+18) +#define MAX_AUDIT_HEADER_SIZE (5*sizeof(uint32_t)+18) #define AUDIT_TRAILER_SIZE 7 /* @@ -98,7 +98,7 @@ #define ADD_U_INT32(loc, val) \ do { \ be32enc((loc), (val)); \ - (loc) += sizeof(u_int32_t); \ + (loc) += sizeof(uint32_t); \ } while(0) #define ADD_U_INT64(loc, val) \ diff --git a/src/include.new/bsm/libbsm.h b/src/include.new/bsm/libbsm.h index 5e92583..b678a23 100644 --- a/src/include.new/bsm/libbsm.h +++ b/src/include.new/bsm/libbsm.h @@ -161,25 +161,25 @@ __BEGIN_DECLS typedef struct au_tid32 { - u_int32_t port; - u_int32_t addr; + uint32_t port; + uint32_t addr; } au_tid32_t; typedef struct au_tid64 { u_int64_t port; - u_int32_t addr; + uint32_t addr; } au_tid64_t; typedef struct au_tidaddr32 { - u_int32_t port; - u_int32_t type; - u_int32_t addr[4]; + uint32_t port; + uint32_t type; + uint32_t addr[4]; } au_tidaddr32_t; typedef struct au_tidaddr64 { u_int64_t port; - u_int32_t type; - u_int32_t addr[4]; + uint32_t type; + uint32_t addr[4]; } au_tidaddr64_t; /* @@ -190,7 +190,7 @@ */ typedef struct { u_char no; - u_int32_t val; + uint32_t val; u_int16_t len; char *text; } au_arg32_t; @@ -224,19 +224,19 @@ * device 4 bytes/8 bytes (32-bit/64-bit) */ typedef struct { - u_int32_t mode; - u_int32_t uid; - u_int32_t gid; - u_int32_t fsid; + uint32_t mode; + uint32_t uid; + uint32_t gid; + uint32_t fsid; u_int64_t nid; - u_int32_t dev; + uint32_t dev; } au_attr32_t; typedef struct { - u_int32_t mode; - u_int32_t uid; - u_int32_t gid; - u_int32_t fsid; + uint32_t mode; + uint32_t uid; + uint32_t gid; + uint32_t fsid; u_int64_t nid; u_int64_t dev; } au_attr64_t; @@ -246,7 +246,7 @@ * text count null-terminated string(s) */ typedef struct { - u_int32_t count; + uint32_t count; char *text[AUDIT_MAX_ARGS]; } au_execarg_t; @@ -255,7 +255,7 @@ * text count null-terminated string(s) */ typedef struct { - u_int32_t count; + uint32_t count; char *text[AUDIT_MAX_ENV]; } au_execenv_t; @@ -264,8 +264,8 @@ * return value 4 bytes */ typedef struct { - u_int32_t status; - u_int32_t ret; + uint32_t status; + uint32_t ret; } au_exit_t; /* @@ -275,8 +275,8 @@ * file pathname N bytes + 1 terminating NULL byte */ typedef struct { - u_int32_t s; - u_int32_t ms; + uint32_t s; + uint32_t ms; u_int16_t len; char *name; } au_file_t; @@ -288,7 +288,7 @@ */ typedef struct { u_int16_t no; - u_int32_t list[AUDIT_MAX_GROUPS]; + uint32_t list[AUDIT_MAX_GROUPS]; } au_groups_t; /* @@ -300,12 +300,12 @@ * milliseconds of time 4 bytes/8 bytes (32-bit/64-bit value) */ typedef struct { - u_int32_t size; + uint32_t size; u_char version; u_int16_t e_type; u_int16_t e_mod; - u_int32_t s; - u_int32_t ms; + uint32_t s; + uint32_t ms; } au_header32_t; /* @@ -319,18 +319,18 @@ * nanoseconds of time 4 bytes/8 bytes (32/64-bits) */ typedef struct { - u_int32_t size; + uint32_t size; u_char version; u_int16_t e_type; u_int16_t e_mod; - u_int32_t ad_type; - u_int32_t addr[4]; - u_int32_t s; - u_int32_t ms; + uint32_t ad_type; + uint32_t addr[4]; + uint32_t s; + uint32_t ms; } au_header32_ex_t; typedef struct { - u_int32_t size; + uint32_t size; u_char version; u_int16_t e_type; u_int16_t e_mod; @@ -339,12 +339,12 @@ } au_header64_t; typedef struct { - u_int32_t size; + uint32_t size; u_char version; u_int16_t e_type; u_int16_t e_mod; - u_int32_t ad_type; - u_int32_t addr[4]; + uint32_t ad_type; + uint32_t addr[4]; u_int64_t s; u_int64_t ms; } au_header64_ex_t; @@ -353,7 +353,7 @@ * internet address 4 bytes */ typedef struct { - u_int32_t addr; + uint32_t addr; } au_inaddr_t; /* @@ -361,8 +361,8 @@ * internet address 16 bytes */ typedef struct { - u_int32_t type; - u_int32_t addr[4]; + uint32_t type; + uint32_t addr[4]; } au_inaddr_ex_t; /* @@ -386,8 +386,8 @@ u_char ttl; u_char prot; u_int16_t chksm; - u_int32_t src; - u_int32_t dest; + uint32_t src; + uint32_t dest; } au_ip_t; /* @@ -396,7 +396,7 @@ */ typedef struct { u_char type; - u_int32_t id; + uint32_t id; } au_ipc_t; /* @@ -409,13 +409,13 @@ * key 4 bytes */ typedef struct { - u_int32_t uid; - u_int32_t gid; - u_int32_t puid; - u_int32_t pgid; - u_int32_t mode; - u_int32_t seq; - u_int32_t key; + uint32_t uid; + uint32_t gid; + uint32_t puid; + uint32_t pgid; + uint32_t mode; + uint32_t seq; + uint32_t key; } au_ipcperm_t; /* @@ -456,24 +456,24 @@ * machine address 4 bytes */ typedef struct { - u_int32_t auid; - u_int32_t euid; - u_int32_t egid; - u_int32_t ruid; - u_int32_t rgid; - u_int32_t pid; - u_int32_t sid; + uint32_t auid; + uint32_t euid; + uint32_t egid; + uint32_t ruid; + uint32_t rgid; + uint32_t pid; + uint32_t sid; au_tid32_t tid; } au_proc32_t; typedef struct { - u_int32_t auid; - u_int32_t euid; - u_int32_t egid; - u_int32_t ruid; - u_int32_t rgid; - u_int32_t pid; - u_int32_t sid; + uint32_t auid; + uint32_t euid; + uint32_t egid; + uint32_t ruid; + uint32_t rgid; + uint32_t pid; + uint32_t sid; au_tid64_t tid; } au_proc64_t; @@ -491,24 +491,24 @@ * machine address 16 bytes */ typedef struct { - u_int32_t auid; - u_int32_t euid; - u_int32_t egid; - u_int32_t ruid; - u_int32_t rgid; - u_int32_t pid; - u_int32_t sid; + uint32_t auid; + uint32_t euid; + uint32_t egid; + uint32_t ruid; + uint32_t rgid; + uint32_t pid; + uint32_t sid; au_tidaddr32_t tid; } au_proc32ex_t; typedef struct { - u_int32_t auid; - u_int32_t euid; - u_int32_t egid; - u_int32_t ruid; - u_int32_t rgid; - u_int32_t pid; - u_int32_t sid; + uint32_t auid; + uint32_t euid; + uint32_t egid; + uint32_t ruid; + uint32_t rgid; + uint32_t pid; + uint32_t sid; au_tidaddr64_t tid; } au_proc64ex_t; @@ -518,7 +518,7 @@ */ typedef struct { u_char status; - u_int32_t ret; + uint32_t ret; } au_ret32_t; typedef struct { @@ -530,7 +530,7 @@ * sequence number 4 bytes */ typedef struct { - u_int32_t seqno; + uint32_t seqno; } au_seq_t; /* @@ -543,9 +543,9 @@ typedef struct { u_int16_t type; u_int16_t l_port; - u_int32_t l_addr; + uint32_t l_addr; u_int16_t r_port; - u_int32_t r_addr; + uint32_t r_addr; } au_socket_t; /* @@ -562,9 +562,9 @@ u_int16_t type; u_int16_t atype; u_int16_t l_port; - u_int32_t l_addr[4]; - u_int32_t r_port; - u_int32_t r_addr[4]; + uint32_t l_addr[4]; + uint32_t r_port; + uint32_t r_addr[4]; } au_socket_ex32_t; /* @@ -575,13 +575,13 @@ typedef struct { u_int16_t family; u_int16_t port; - u_int32_t addr[4]; + uint32_t addr[4]; } au_socketinet_ex32_t; typedef struct { u_int16_t family; u_int16_t port; - u_int32_t addr; + uint32_t addr; } au_socketinet32_t; /* @@ -606,24 +606,24 @@ * machine address 4 bytes */ typedef struct { - u_int32_t auid; - u_int32_t euid; - u_int32_t egid; - u_int32_t ruid; - u_int32_t rgid; - u_int32_t pid; - u_int32_t sid; + uint32_t auid; + uint32_t euid; + uint32_t egid; + uint32_t ruid; + uint32_t rgid; + uint32_t pid; + uint32_t sid; au_tid32_t tid; } au_subject32_t; typedef struct { - u_int32_t auid; - u_int32_t euid; - u_int32_t egid; - u_int32_t ruid; - u_int32_t rgid; - u_int32_t pid; - u_int32_t sid; + uint32_t auid; + uint32_t euid; + uint32_t egid; + uint32_t ruid; + uint32_t rgid; + uint32_t pid; + uint32_t sid; au_tid64_t tid; } au_subject64_t; @@ -641,24 +641,24 @@ * machine address 16 bytes */ typedef struct { - u_int32_t auid; - u_int32_t euid; - u_int32_t egid; - u_int32_t ruid; - u_int32_t rgid; - u_int32_t pid; - u_int32_t sid; + uint32_t auid; + uint32_t euid; + uint32_t egid; + uint32_t ruid; + uint32_t rgid; + uint32_t pid; + uint32_t sid; au_tidaddr32_t tid; } au_subject32ex_t; typedef struct { - u_int32_t auid; - u_int32_t euid; - u_int32_t egid; - u_int32_t ruid; - u_int32_t rgid; - u_int32_t pid; - u_int32_t sid; + uint32_t auid; + uint32_t euid; + uint32_t egid; + uint32_t ruid; + uint32_t rgid; + uint32_t pid; + uint32_t sid; au_tidaddr64_t tid; } au_subject64ex_t; @@ -706,11 +706,11 @@ } au_zonename_t; typedef struct { - u_int32_t ident; + uint32_t ident; u_int16_t filter; u_int16_t flags; - u_int32_t fflags; - u_int32_t data; + uint32_t fflags; + uint32_t data; } au_kevent_t; typedef struct { @@ -724,7 +724,7 @@ */ typedef struct { u_int16_t magic; - u_int32_t count; + uint32_t count; } au_trailer_t; struct tokenstr { diff --git a/src/include.new/bsnmp/snmp_netgraph.h b/src/include.new/bsnmp/snmp_netgraph.h index ef95fe5..780c5b4 100644 --- a/src/include.new/bsnmp/snmp_netgraph.h +++ b/src/include.new/bsnmp/snmp_netgraph.h @@ -42,7 +42,7 @@ typedef void ng_cookie_f(const struct ng_mesg *, const char *, ng_ID_t, void *); typedef void ng_hook_f(const char *, const u_char *, size_t, void *); -void *ng_register_cookie(const struct lmodule *, u_int32_t cookie, +void *ng_register_cookie(const struct lmodule *, uint32_t cookie, ng_ID_t, ng_cookie_f *, void *); void ng_unregister_cookie(void *reg); diff --git a/src/include.new/bsnmp/snmpmod.h b/src/include.new/bsnmp/snmpmod.h index ad73566..4abc460 100644 --- a/src/include.new/bsnmp/snmpmod.h +++ b/src/include.new/bsnmp/snmpmod.h @@ -317,8 +317,8 @@ u_char *contact; u_char *name; u_char *location; - u_int32_t services; - u_int32_t or_last_change; + uint32_t services; + uint32_t or_last_change; }; extern struct systemg systemg; diff --git a/src/include.new/cam/ata/ata_all.h b/src/include.new/cam/ata/ata_all.h index adcfc54..f7a7eae 100644 --- a/src/include.new/cam/ata/ata_all.h +++ b/src/include.new/cam/ata/ata_all.h @@ -147,22 +147,22 @@ void semb_print_ident_short(struct sep_identify_data *ident_data); void semb_receive_diagnostic_results(struct ccb_ataio *ataio, - u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*), + uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*), uint8_t tag_action, int pcv, uint8_t page_code, uint8_t *data_ptr, uint16_t allocation_length, uint32_t timeout); void semb_send_diagnostic(struct ccb_ataio *ataio, - u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), uint8_t tag_action, uint8_t *data_ptr, uint16_t param_list_length, uint32_t timeout); void semb_read_buffer(struct ccb_ataio *ataio, - u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*), + uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*), uint8_t tag_action, uint8_t page_code, uint8_t *data_ptr, uint16_t allocation_length, uint32_t timeout); void semb_write_buffer(struct ccb_ataio *ataio, - u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), + uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), uint8_t tag_action, uint8_t *data_ptr, uint16_t param_list_length, uint32_t timeout); diff --git a/src/include.new/cam/cam.h b/src/include.new/cam/cam.h index dda7e19..e65d893 100644 --- a/src/include.new/cam/cam.h +++ b/src/include.new/cam/cam.h @@ -85,15 +85,15 @@ * the queue giving round robin per priority level scheduling. */ typedef struct { - u_int32_t priority; + uint32_t priority; #define CAM_PRIORITY_HOST ((CAM_RL_HOST << 8) + 0x80) #define CAM_PRIORITY_BUS ((CAM_RL_BUS << 8) + 0x80) #define CAM_PRIORITY_XPT ((CAM_RL_XPT << 8) + 0x80) #define CAM_PRIORITY_DEV ((CAM_RL_DEV << 8) + 0x80) #define CAM_PRIORITY_OOB (CAM_RL_DEV << 8) #define CAM_PRIORITY_NORMAL ((CAM_RL_NORMAL << 8) + 0x80) -#define CAM_PRIORITY_NONE (u_int32_t)-1 - u_int32_t generation; +#define CAM_PRIORITY_NONE (uint32_t)-1 + uint32_t generation; int index; #define CAM_UNQUEUED_INDEX -1 #define CAM_ACTIVE_INDEX -2 diff --git a/src/include.new/cam/cam_ccb.h b/src/include.new/cam/cam_ccb.h index 1f7fc41..b2c4bb4 100644 --- a/src/include.new/cam/cam_ccb.h +++ b/src/include.new/cam/cam_ccb.h @@ -317,22 +317,22 @@ camq_entry xpt_links; /* For chaining in the XPT layer */ camq_entry sim_links; /* For chaining in the SIM layer */ camq_entry periph_links; /* For chaining in the type driver */ - u_int32_t retry_count; + uint32_t retry_count; void (*cbfcnp)(struct cam_periph *, union ccb *); /* Callback on completion function */ xpt_opcode func_code; /* XPT function code */ - u_int32_t status; /* Status returned by CAM subsystem */ + uint32_t status; /* Status returned by CAM subsystem */ struct cam_path *path; /* Compiled path for this ccb */ path_id_t path_id; /* Path ID for the request */ target_id_t target_id; /* Target device ID */ lun_id_t target_lun; /* Target LUN number */ lun64_id_t ext_lun; /* 64bit extended/multi-level LUNs */ - u_int32_t flags; /* ccb_flags */ - u_int32_t xflags; /* Extended flags */ + uint32_t flags; /* ccb_flags */ + uint32_t xflags; /* Extended flags */ ccb_ppriv_area periph_priv; ccb_spriv_area sim_priv; ccb_qos_area qos; - u_int32_t timeout; /* Hard timeout value in mseconds */ + uint32_t timeout; /* Hard timeout value in mseconds */ struct timeval softtimeout; /* Soft timeout value in sec + usec */ }; @@ -376,9 +376,9 @@ struct ccb_getdevlist { struct ccb_hdr ccb_h; char periph_name[DEV_IDLEN]; - u_int32_t unit_number; + uint32_t unit_number; unsigned int generation; - u_int32_t index; + uint32_t index; ccb_getdevlist_status_e status; }; @@ -394,7 +394,7 @@ struct periph_match_pattern { char periph_name[DEV_IDLEN]; - u_int32_t unit_number; + uint32_t unit_number; path_id_t path_id; target_id_t target_id; lun_id_t target_lun; @@ -439,8 +439,8 @@ struct bus_match_pattern { path_id_t path_id; char dev_name[DEV_IDLEN]; - u_int32_t unit_number; - u_int32_t bus_id; + uint32_t unit_number; + uint32_t bus_id; bus_pattern_flags flags; }; @@ -463,7 +463,7 @@ struct periph_match_result { char periph_name[DEV_IDLEN]; - u_int32_t unit_number; + uint32_t unit_number; path_id_t path_id; target_id_t target_id; lun_id_t target_lun; @@ -487,8 +487,8 @@ struct bus_match_result { path_id_t path_id; char dev_name[DEV_IDLEN]; - u_int32_t unit_number; - u_int32_t bus_id; + uint32_t unit_number; + uint32_t bus_id; }; union match_result { @@ -543,11 +543,11 @@ struct ccb_dev_match { struct ccb_hdr ccb_h; ccb_dev_match_status status; - u_int32_t num_patterns; - u_int32_t pattern_buf_len; + uint32_t num_patterns; + uint32_t pattern_buf_len; struct dev_match_pattern *patterns; - u_int32_t num_matches; - u_int32_t match_buf_len; + uint32_t num_matches; + uint32_t match_buf_len; struct dev_match_result *matches; struct ccb_dev_position pos; }; @@ -597,12 +597,12 @@ struct ccb_pathinq_settings_fc { u_int64_t wwnn; /* world wide node name */ u_int64_t wwpn; /* world wide port name */ - u_int32_t port; /* 24 bit port id, if known */ - u_int32_t bitrate; /* Mbps */ + uint32_t port; /* 24 bit port id, if known */ + uint32_t bitrate; /* Mbps */ }; struct ccb_pathinq_settings_sas { - u_int32_t bitrate; /* Mbps */ + uint32_t bitrate; /* Mbps */ }; #define PATHINQ_SETTINGS_SIZE 128 @@ -611,21 +611,21 @@ u_int8_t version_num; /* Version number for the SIM/HBA */ u_int8_t hba_inquiry; /* Mimic of INQ byte 7 for the HBA */ u_int16_t target_sprt; /* Flags for target mode support */ - u_int32_t hba_misc; /* Misc HBA features */ + uint32_t hba_misc; /* Misc HBA features */ u_int16_t hba_eng_cnt; /* HBA engine count */ /* Vendor Unique capabilities */ u_int8_t vuhba_flags[VUHBALEN]; - u_int32_t max_target; /* Maximum supported Target */ - u_int32_t max_lun; /* Maximum supported Lun */ - u_int32_t async_flags; /* Installed Async handlers */ + uint32_t max_target; /* Maximum supported Target */ + uint32_t max_lun; /* Maximum supported Lun */ + uint32_t async_flags; /* Installed Async handlers */ path_id_t hpath_id; /* Highest Path ID in the subsystem */ target_id_t initiator_id; /* ID of the HBA on the SCSI bus */ char sim_vid[SIM_IDLEN]; /* Vendor ID of the SIM */ char hba_vid[HBA_IDLEN]; /* Vendor ID of the HBA */ char dev_name[DEV_IDLEN];/* Device name for SIM */ - u_int32_t unit_number; /* Unit number for SIM */ - u_int32_t bus_id; /* Bus ID for SIM */ - u_int32_t base_transfer_speed;/* Base bus speed in KB/sec */ + uint32_t unit_number; /* Unit number for SIM */ + uint32_t bus_id; /* Bus ID for SIM */ + uint32_t base_transfer_speed;/* Base bus speed in KB/sec */ cam_proto protocol; u_int protocol_version; cam_xport transport; @@ -699,7 +699,7 @@ union ccb *next_ccb; /* Ptr for next CCB for action */ u_int8_t *req_map; /* Ptr to mapping info */ u_int8_t *data_ptr; /* Ptr to the data buf/SG list */ - u_int32_t dxfer_len; /* Data transfer length */ + uint32_t dxfer_len; /* Data transfer length */ /* Autosense storage */ struct scsi_sense_data sense_data; u_int8_t sense_len; /* Number of bytes to autosense */ @@ -707,7 +707,7 @@ u_int16_t sglist_cnt; /* Number of SG list entries */ u_int8_t scsi_status; /* Returned SCSI status */ u_int8_t sense_resid; /* Autosense resid length: 2's comp */ - u_int32_t resid; /* Transfer residual length: 2's comp */ + uint32_t resid; /* Transfer residual length: 2's comp */ cdb_t cdb_io; /* Union for CDB bytes/pointer */ u_int8_t *msg_ptr; /* Pointer to the message buffer */ u_int16_t msg_len; /* Number of bytes for the Message */ @@ -731,8 +731,8 @@ struct ata_cmd cmd; /* ATA command register set */ struct ata_res res; /* ATA result register set */ u_int8_t *data_ptr; /* Ptr to the data buf/SG list */ - u_int32_t dxfer_len; /* Data transfer length */ - u_int32_t resid; /* Transfer residual length: 2's comp */ + uint32_t dxfer_len; /* Data transfer length */ + uint32_t resid; /* Transfer residual length: 2's comp */ u_int8_t tag_action; /* What to do for tag queueing */ /* * The tag action should be either the define below (to send a @@ -758,14 +758,14 @@ /* Release SIM Queue */ struct ccb_relsim { struct ccb_hdr ccb_h; - u_int32_t release_flags; + uint32_t release_flags; #define RELSIM_ADJUST_OPENINGS 0x01 #define RELSIM_RELEASE_AFTER_TIMEOUT 0x02 #define RELSIM_RELEASE_AFTER_CMDCMPLT 0x04 #define RELSIM_RELEASE_AFTER_QEMPTY 0x08 - u_int32_t openings; - u_int32_t release_timeout; /* Abstract argument. */ - u_int32_t qfrozen_cnt; + uint32_t openings; + uint32_t release_timeout; /* Abstract argument. */ + uint32_t qfrozen_cnt; }; /* @@ -788,7 +788,7 @@ AC_BUS_RESET = 0x001 /* A SCSI bus reset occurred */ } ac_code; -typedef void ac_callback_t (void *softc, u_int32_t code, +typedef void ac_callback_t (void *softc, uint32_t code, struct cam_path *path, void *args); /* @@ -806,7 +806,7 @@ #define AC_CONTRACT_DEV_CHG 1 struct ac_device_changed { u_int64_t wwpn; - u_int32_t port; + uint32_t port; target_id_t target; u_int8_t arrived; }; @@ -814,7 +814,7 @@ /* Set Asynchronous Callback CCB */ struct ccb_setasync { struct ccb_hdr ccb_h; - u_int32_t event_enable; /* Async Event enables */ + uint32_t event_enable; /* Async Event enables */ ac_callback_t *callback; void *callback_arg; }; @@ -894,14 +894,14 @@ #define CTS_FC_VALID_SPEED 0x1000 u_int64_t wwnn; /* world wide node name */ u_int64_t wwpn; /* world wide port name */ - u_int32_t port; /* 24 bit port id, if known */ - u_int32_t bitrate; /* Mbps */ + uint32_t port; /* 24 bit port id, if known */ + uint32_t bitrate; /* Mbps */ }; struct ccb_trans_settings_sas { u_int valid; /* Which fields to honor */ #define CTS_SAS_VALID_SPEED 0x1000 - u_int32_t bitrate; /* Mbps */ + uint32_t bitrate; /* Mbps */ }; struct ccb_trans_settings_pata { @@ -975,9 +975,9 @@ */ struct ccb_calc_geometry { struct ccb_hdr ccb_h; - u_int32_t block_size; + uint32_t block_size; u_int64_t volume_size; - u_int32_t cylinders; + uint32_t cylinders; u_int8_t heads; u_int8_t secs_per_track; }; @@ -1103,7 +1103,7 @@ u_int16_t eng_num; /* The engine number for this inquiry */ ei_type eng_type; /* Returned engine type */ ei_algo eng_algo; /* Returned engine algorithm type */ - u_int32_t eng_memeory; /* Returned engine memory size */ + uint32_t eng_memeory; /* Returned engine memory size */ }; struct ccb_eng_exec { /* This structure must match SCSIIO size */ @@ -1111,13 +1111,13 @@ u_int8_t *pdrv_ptr; /* Ptr used by the peripheral driver */ u_int8_t *req_map; /* Ptr for mapping info on the req. */ u_int8_t *data_ptr; /* Pointer to the data buf/SG list */ - u_int32_t dxfer_len; /* Data transfer length */ + uint32_t dxfer_len; /* Data transfer length */ u_int8_t *engdata_ptr; /* Pointer to the engine buffer data */ u_int16_t sglist_cnt; /* Num of scatter gather list entries */ - u_int32_t dmax_len; /* Destination data maximum length */ - u_int32_t dest_len; /* Destination data length */ + uint32_t dmax_len; /* Destination data maximum length */ + uint32_t dest_len; /* Destination data length */ int32_t src_resid; /* Source residual length: 2's comp */ - u_int32_t timeout; /* Timeout value */ + uint32_t timeout; /* Timeout value */ u_int16_t eng_num; /* Engine number for this request */ u_int16_t vu_flags; /* Vendor Unique flags */ }; @@ -1214,26 +1214,26 @@ __BEGIN_DECLS static __inline void -cam_fill_csio(struct ccb_scsiio *csio, u_int32_t retries, +cam_fill_csio(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int32_t flags, u_int8_t tag_action, - u_int8_t *data_ptr, u_int32_t dxfer_len, + uint32_t flags, u_int8_t tag_action, + u_int8_t *data_ptr, uint32_t dxfer_len, u_int8_t sense_len, u_int8_t cdb_len, - u_int32_t timeout); + uint32_t timeout); static __inline void -cam_fill_ctio(struct ccb_scsiio *csio, u_int32_t retries, +cam_fill_ctio(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int32_t flags, u_int tag_action, u_int tag_id, + uint32_t flags, u_int tag_action, u_int tag_id, u_int init_id, u_int scsi_status, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int32_t timeout); + uint32_t dxfer_len, uint32_t timeout); static __inline void -cam_fill_ataio(struct ccb_ataio *ataio, u_int32_t retries, +cam_fill_ataio(struct ccb_ataio *ataio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int32_t flags, u_int tag_action, - u_int8_t *data_ptr, u_int32_t dxfer_len, - u_int32_t timeout); + uint32_t flags, u_int tag_action, + u_int8_t *data_ptr, uint32_t dxfer_len, + uint32_t timeout); static __inline void cam_fill_smpio(struct ccb_smpio *smpio, uint32_t retries, @@ -1243,12 +1243,12 @@ uint32_t timeout); static __inline void -cam_fill_csio(struct ccb_scsiio *csio, u_int32_t retries, +cam_fill_csio(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int32_t flags, u_int8_t tag_action, - u_int8_t *data_ptr, u_int32_t dxfer_len, + uint32_t flags, u_int8_t tag_action, + u_int8_t *data_ptr, uint32_t dxfer_len, u_int8_t sense_len, u_int8_t cdb_len, - u_int32_t timeout) + uint32_t timeout) { csio->ccb_h.func_code = XPT_SCSI_IO; csio->ccb_h.flags = flags; @@ -1264,11 +1264,11 @@ } static __inline void -cam_fill_ctio(struct ccb_scsiio *csio, u_int32_t retries, +cam_fill_ctio(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int32_t flags, u_int tag_action, u_int tag_id, + uint32_t flags, u_int tag_action, u_int tag_id, u_int init_id, u_int scsi_status, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int32_t timeout) + uint32_t dxfer_len, uint32_t timeout) { csio->ccb_h.func_code = XPT_CONT_TARGET_IO; csio->ccb_h.flags = flags; @@ -1285,11 +1285,11 @@ } static __inline void -cam_fill_ataio(struct ccb_ataio *ataio, u_int32_t retries, +cam_fill_ataio(struct ccb_ataio *ataio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int32_t flags, u_int tag_action, - u_int8_t *data_ptr, u_int32_t dxfer_len, - u_int32_t timeout) + uint32_t flags, u_int tag_action, + u_int8_t *data_ptr, uint32_t dxfer_len, + uint32_t timeout) { ataio->ccb_h.func_code = XPT_ATA_IO; ataio->ccb_h.flags = flags; diff --git a/src/include.new/cam/cam_compat.h b/src/include.new/cam/cam_compat.h index c28aa08..51c8909 100644 --- a/src/include.new/cam/cam_compat.h +++ b/src/include.new/cam/cam_compat.h @@ -58,18 +58,18 @@ camq_entry xpt_links; /* For chaining in the XPT layer */ camq_entry sim_links; /* For chaining in the SIM layer */ camq_entry periph_links; /* For chaining in the type driver */ - u_int32_t retry_count; + uint32_t retry_count; void (*cbfcnp)(struct cam_periph *, union ccb *); xpt_opcode func_code; /* XPT function code */ - u_int32_t status; /* Status returned by CAM subsystem */ + uint32_t status; /* Status returned by CAM subsystem */ struct cam_path *path; /* Compiled path for this ccb */ path_id_t path_id; /* Path ID for the request */ target_id_t target_id; /* Target device ID */ lun_id_t target_lun; /* Target LUN number */ - u_int32_t flags; /* ccb_flags */ + uint32_t flags; /* ccb_flags */ ccb_ppriv_area periph_priv; ccb_spriv_area sim_priv; - u_int32_t timeout; /* Hard timeout value in seconds */ + uint32_t timeout; /* Hard timeout value in seconds */ struct callout_handle timeout_ch; }; @@ -82,17 +82,17 @@ u_int16_t hba_eng_cnt; /* HBA engine count */ /* Vendor Unique capabilities */ u_int8_t vuhba_flags[VUHBALEN]; - u_int32_t max_target; /* Maximum supported Target */ - u_int32_t max_lun; /* Maximum supported Lun */ - u_int32_t async_flags; /* Installed Async handlers */ + uint32_t max_target; /* Maximum supported Target */ + uint32_t max_lun; /* Maximum supported Lun */ + uint32_t async_flags; /* Installed Async handlers */ path_id_t hpath_id; /* Highest Path ID in the subsystem */ target_id_t initiator_id; /* ID of the HBA on the SCSI bus */ char sim_vid[SIM_IDLEN]; /* Vendor ID of the SIM */ char hba_vid[HBA_IDLEN]; /* Vendor ID of the HBA */ char dev_name[DEV_IDLEN];/* Device name for SIM */ - u_int32_t unit_number; /* Unit number for SIM */ - u_int32_t bus_id; /* Bus ID for SIM */ - u_int32_t base_transfer_speed;/* Base bus speed in KB/sec */ + uint32_t unit_number; /* Unit number for SIM */ + uint32_t bus_id; /* Bus ID for SIM */ + uint32_t base_transfer_speed;/* Base bus speed in KB/sec */ cam_proto protocol; u_int protocol_version; cam_xport transport; diff --git a/src/include.new/cam/cam_debug.h b/src/include.new/cam/cam_debug.h index 93d7ed9..17107ec 100644 --- a/src/include.new/cam/cam_debug.h +++ b/src/include.new/cam/cam_debug.h @@ -77,9 +77,9 @@ /* Path we want to debug */ extern struct cam_path *cam_dpath; /* Current debug levels set */ -extern u_int32_t cam_dflags; +extern uint32_t cam_dflags; /* Printf delay value (to prevent scrolling) */ -extern u_int32_t cam_debug_delay; +extern uint32_t cam_debug_delay; /* Debugging macros. */ #define CAM_DEBUGGED(path, flag) \ diff --git a/src/include.new/cam/cam_periph.h b/src/include.new/cam/cam_periph.h index 5af7f45..83e8557 100644 --- a/src/include.new/cam/cam_periph.h +++ b/src/include.new/cam/cam_periph.h @@ -111,9 +111,9 @@ struct cam_path *path; /* Compiled path to device */ void *softc; struct cam_sim *sim; - u_int32_t unit_number; + uint32_t unit_number; cam_periph_type type; - u_int32_t flags; + uint32_t flags; #define CAM_PERIPH_RUNNING 0x01 #define CAM_PERIPH_LOCKED 0x02 #define CAM_PERIPH_LOCK_WANTED 0x04 @@ -127,7 +127,7 @@ uint32_t immediate_priority; int periph_allocating; int periph_allocated; - u_int32_t refcount; + uint32_t refcount; SLIST_HEAD(, ccb_hdr) ccb_list; /* For "immediate" requests */ SLIST_ENTRY(cam_periph) periph_links; TAILQ_ENTRY(cam_periph) unit_links; @@ -164,24 +164,24 @@ void cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo); union ccb *cam_periph_getccb(struct cam_periph *periph, - u_int32_t priority); + uint32_t priority); void cam_periph_ccbwait(union ccb *ccb); int cam_periph_runccb(union ccb *ccb, int (*error_routine)(union ccb *ccb, cam_flags camflags, - u_int32_t sense_flags), - cam_flags camflags, u_int32_t sense_flags, + uint32_t sense_flags), + cam_flags camflags, uint32_t sense_flags, struct devstat *ds); int cam_periph_ioctl(struct cam_periph *periph, u_long cmd, caddr_t addr, int (*error_routine)(union ccb *ccb, cam_flags camflags, - u_int32_t sense_flags)); + uint32_t sense_flags)); void cam_freeze_devq(struct cam_path *path); -u_int32_t cam_release_devq(struct cam_path *path, u_int32_t relsim_flags, - u_int32_t opening_reduction, u_int32_t arg, +uint32_t cam_release_devq(struct cam_path *path, uint32_t relsim_flags, + uint32_t opening_reduction, uint32_t arg, int getcount_only); -void cam_periph_async(struct cam_periph *periph, u_int32_t code, +void cam_periph_async(struct cam_periph *periph, uint32_t code, struct cam_path *path, void *arg); void cam_periph_bus_settle(struct cam_periph *periph, u_int bus_settle_ms); @@ -189,7 +189,7 @@ struct timeval* event_time, u_int duration_ms); int cam_periph_error(union ccb *ccb, cam_flags camflags, - u_int32_t sense_flags, union ccb *save_ccb); + uint32_t sense_flags, union ccb *save_ccb); static __inline struct mtx * cam_periph_mtx(struct cam_periph *periph) diff --git a/src/include.new/cam/cam_queue.h b/src/include.new/cam/cam_queue.h index de7c4e8..293b537 100644 --- a/src/include.new/cam/cam_queue.h +++ b/src/include.new/cam/cam_queue.h @@ -49,8 +49,8 @@ cam_pinfo **queue_array; int array_size; int entries; - u_int32_t generation; - u_int32_t qfrozen_cnt; + uint32_t generation; + uint32_t qfrozen_cnt; }; TAILQ_HEAD(ccb_hdr_tailq, ccb_hdr); @@ -84,14 +84,14 @@ void cam_devq_free(struct cam_devq *devq); -u_int32_t cam_devq_resize(struct cam_devq *camq, int openings); +uint32_t cam_devq_resize(struct cam_devq *camq, int openings); /* * Allocate a cam_ccb_queue structure and initialize it. */ struct cam_ccbq *cam_ccbq_alloc(int openings); -u_int32_t cam_ccbq_resize(struct cam_ccbq *ccbq, int devices); +uint32_t cam_ccbq_resize(struct cam_ccbq *ccbq, int devices); int cam_ccbq_init(struct cam_ccbq *ccbq, int openings); @@ -107,7 +107,7 @@ /* * Resize a cam queue */ -u_int32_t camq_resize(struct camq *queue, int new_size); +uint32_t camq_resize(struct camq *queue, int new_size); /* * Initialize a camq structure. Return 0 on success, 1 on failure. @@ -151,7 +151,7 @@ * maintaining queue order. */ void camq_change_priority(struct camq *queue, int index, - u_int32_t new_priority); + uint32_t new_priority); static __inline int cam_ccbq_pending_ccb_count(struct cam_ccbq *ccbq); diff --git a/src/include.new/cam/cam_sim.h b/src/include.new/cam/cam_sim.h index d009dfc..e70e719 100644 --- a/src/include.new/cam/cam_sim.h +++ b/src/include.new/cam/cam_sim.h @@ -48,14 +48,14 @@ typedef void (*sim_action_func)(struct cam_sim *sim, union ccb *ccb); typedef void (*sim_poll_func)(struct cam_sim *sim); -struct cam_devq * cam_simq_alloc(u_int32_t max_sim_transactions); +struct cam_devq * cam_simq_alloc(uint32_t max_sim_transactions); void cam_simq_free(struct cam_devq *devq); struct cam_sim * cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll, const char *sim_name, void *softc, - u_int32_t unit, + uint32_t unit, struct mtx *mtx, int max_dev_transactions, int max_tagged_dev_transactions, @@ -65,16 +65,16 @@ void cam_sim_release(struct cam_sim *sim); /* Optional sim attributes may be set with these. */ -void cam_sim_set_path(struct cam_sim *sim, u_int32_t path_id); +void cam_sim_set_path(struct cam_sim *sim, uint32_t path_id); /* Convenience routines for accessing sim attributes. */ -static __inline u_int32_t cam_sim_path(struct cam_sim *sim); +static __inline uint32_t cam_sim_path(struct cam_sim *sim); static __inline const char * cam_sim_name(struct cam_sim *sim); static __inline void * cam_sim_softc(struct cam_sim *sim); -static __inline u_int32_t cam_sim_unit(struct cam_sim *sim); -static __inline u_int32_t cam_sim_bus(struct cam_sim *sim); +static __inline uint32_t cam_sim_unit(struct cam_sim *sim); +static __inline uint32_t cam_sim_bus(struct cam_sim *sim); @@ -96,12 +96,12 @@ struct mtx *mtx; TAILQ_HEAD(, ccb_hdr) sim_doneq; TAILQ_ENTRY(cam_sim) links; - u_int32_t path_id;/* The Boot device may set this to 0? */ - u_int32_t unit_number; - u_int32_t bus_id; + uint32_t path_id;/* The Boot device may set this to 0? */ + uint32_t unit_number; + uint32_t bus_id; int max_tagged_dev_openings; int max_dev_openings; - u_int32_t flags; + uint32_t flags; #define CAM_SIM_REL_TIMEOUT_PENDING 0x01 #define CAM_SIM_MPSAFE 0x02 struct callout callout; @@ -112,7 +112,7 @@ #define CAM_SIM_LOCK(sim) mtx_lock((sim)->mtx) #define CAM_SIM_UNLOCK(sim) mtx_unlock((sim)->mtx) -static __inline u_int32_t +static __inline uint32_t cam_sim_path(struct cam_sim *sim) { return (sim->path_id); @@ -130,13 +130,13 @@ return (sim->softc); } -static __inline u_int32_t +static __inline uint32_t cam_sim_unit(struct cam_sim *sim) { return (sim->unit_number); } -static __inline u_int32_t +static __inline uint32_t cam_sim_bus(struct cam_sim *sim) { return (sim->bus_id); diff --git a/src/include.new/cam/cam_xpt.h b/src/include.new/cam/cam_xpt.h index 0dd85ef..90267d8 100644 --- a/src/include.new/cam/cam_xpt.h +++ b/src/include.new/cam/cam_xpt.h @@ -55,9 +55,9 @@ */ struct async_node { SLIST_ENTRY(async_node) links; - u_int32_t event_enable; /* Async Event enables */ - u_int32_t event_lock; /* Take SIM lock for handlers. */ - void (*callback)(void *arg, u_int32_t code, + uint32_t event_enable; /* Async Event enables */ + uint32_t event_lock; /* Take SIM lock for handlers. */ + void (*callback)(void *arg, uint32_t code, struct cam_path *path, void *args); void *callback_arg; }; @@ -72,7 +72,7 @@ void xpt_free_ccb(union ccb *free_ccb); void xpt_setup_ccb(struct ccb_hdr *ccb_h, struct cam_path *path, - u_int32_t priority); + uint32_t priority); void xpt_merge_ccb(union ccb *master_ccb, union ccb *slave_ccb); cam_status xpt_create_path(struct cam_path **new_path_ptr, @@ -104,7 +104,7 @@ int xpt_path_legacy_ata_id(struct cam_path *path); struct cam_sim *xpt_path_sim(struct cam_path *path); struct cam_periph *xpt_path_periph(struct cam_path *path); -void xpt_async(u_int32_t async_code, struct cam_path *path, +void xpt_async(uint32_t async_code, struct cam_path *path, void *async_arg); void xpt_rescan(union ccb *ccb); void xpt_hold_boot(void); diff --git a/src/include.new/cam/cam_xpt_internal.h b/src/include.new/cam/cam_xpt_internal.h index 28eaf9a..372f637 100644 --- a/src/include.new/cam/cam_xpt_internal.h +++ b/src/include.new/cam/cam_xpt_internal.h @@ -41,7 +41,7 @@ lun_id_t lun_id); typedef void (*xpt_release_device_func)(struct cam_ed *device); typedef void (*xpt_action_func)(union ccb *start_ccb); -typedef void (*xpt_dev_async_func)(u_int32_t async_code, +typedef void (*xpt_dev_async_func)(uint32_t async_code, struct cam_eb *bus, struct cam_et *target, struct cam_ed *device, @@ -99,7 +99,7 @@ u_int8_t queue_flags; /* Queue flags from the control page */ u_int8_t serial_num_len; u_int8_t *serial_num; - u_int32_t flags; + uint32_t flags; #define CAM_DEV_UNCONFIGURED 0x01 #define CAM_DEV_REL_TIMEOUT_PENDING 0x02 #define CAM_DEV_REL_ON_COMPLETE 0x04 @@ -109,10 +109,10 @@ #define CAM_DEV_IN_DV 0x80 #define CAM_DEV_DV_HIT_BOTTOM 0x100 #define CAM_DEV_IDENTIFY_DATA_VALID 0x200 - u_int32_t tag_delay_count; + uint32_t tag_delay_count; #define CAM_TAG_DELAY_COUNT 5 - u_int32_t tag_saved_openings; - u_int32_t refcount; + uint32_t tag_saved_openings; + uint32_t refcount; struct callout callout; STAILQ_ENTRY(cam_ed) highpowerq_entry; struct mtx device_mtx; @@ -130,7 +130,7 @@ TAILQ_ENTRY(cam_et) links; struct cam_eb *bus; target_id_t target_id; - u_int32_t refcount; + uint32_t refcount; u_int generation; struct timeval last_reset; u_int rpl_size; @@ -149,9 +149,9 @@ path_id_t path_id; struct cam_sim *sim; struct timeval last_reset; - u_int32_t flags; + uint32_t flags; #define CAM_EB_RUNQ_SCHEDULED 0x01 - u_int32_t refcount; + uint32_t refcount; u_int generation; device_t parent_dev; struct xpt_xport *xport; @@ -173,7 +173,7 @@ lun_id_t lun_id); void xpt_acquire_device(struct cam_ed *device); void xpt_release_device(struct cam_ed *device); -u_int32_t xpt_dev_ccbq_resize(struct cam_path *path, int newopenings); +uint32_t xpt_dev_ccbq_resize(struct cam_path *path, int newopenings); void xpt_start_tags(struct cam_path *path); void xpt_stop_tags(struct cam_path *path); diff --git a/src/include.new/cam/cam_xpt_periph.h b/src/include.new/cam/cam_xpt_periph.h index ced6ccb..8ad3b96 100644 --- a/src/include.new/cam/cam_xpt_periph.h +++ b/src/include.new/cam/cam_xpt_periph.h @@ -40,7 +40,7 @@ #ifdef _KERNEL void xpt_polled_action(union ccb *ccb); void xpt_release_ccb(union ccb *released_ccb); -void xpt_schedule(struct cam_periph *perph, u_int32_t new_priority); +void xpt_schedule(struct cam_periph *perph, uint32_t new_priority); int32_t xpt_add_periph(struct cam_periph *periph); void xpt_remove_periph(struct cam_periph *periph); void xpt_announce_periph(struct cam_periph *periph, diff --git a/src/include.new/cam/cam_xpt_sim.h b/src/include.new/cam/cam_xpt_sim.h index 31292c9..d949421 100644 --- a/src/include.new/cam/cam_xpt_sim.h +++ b/src/include.new/cam/cam_xpt_sim.h @@ -38,11 +38,11 @@ /* Functions accessed by SIM drivers */ #ifdef _KERNEL int32_t xpt_bus_register(struct cam_sim *sim, device_t parent, - u_int32_t bus); + uint32_t bus); int32_t xpt_bus_deregister(path_id_t path_id); -u_int32_t xpt_freeze_simq(struct cam_sim *sim, u_int count); +uint32_t xpt_freeze_simq(struct cam_sim *sim, u_int count); void xpt_release_simq(struct cam_sim *sim, int run_queue); -u_int32_t xpt_freeze_devq(struct cam_path *path, u_int count); +uint32_t xpt_freeze_devq(struct cam_path *path, u_int count); void xpt_release_devq(struct cam_path *path, u_int count, int run_queue); void xpt_done(union ccb *done_ccb); diff --git a/src/include.new/cam/scsi/scsi_all.h b/src/include.new/cam/scsi/scsi_all.h index f9270de..98f57df 100644 --- a/src/include.new/cam/scsi/scsi_all.h +++ b/src/include.new/cam/scsi/scsi_all.h @@ -1193,8 +1193,8 @@ struct scsi_attrib_table_entry { - u_int32_t id; - u_int32_t flags; + uint32_t id; + uint32_t flags; const char *desc; const char *suffix; int (*to_str)(struct sbuf *sb, struct scsi_mam_attribute_header *hdr, @@ -3431,20 +3431,20 @@ struct sense_key_table_entry { u_int8_t sense_key; - u_int32_t action; + uint32_t action; const char *desc; }; struct asc_table_entry { u_int8_t asc; u_int8_t ascq; - u_int32_t action; + uint32_t action; const char *desc; }; struct op_table_entry { u_int8_t opcode; - u_int32_t opmask; + uint32_t opmask; const char *desc; }; @@ -3490,7 +3490,7 @@ const char **sense_key_desc, const char **asc_desc); scsi_sense_action scsi_error_action(struct ccb_scsiio* csio, struct scsi_inquiry_data *inq_data, - u_int32_t sense_flags); + uint32_t sense_flags); const char * scsi_status_string(struct ccb_scsiio *csio); void scsi_desc_iterate(struct scsi_sense_data_desc *sense, u_int sense_len, @@ -3732,84 +3732,84 @@ size_t num_user_entries, int prefer_user_table, uint32_t output_flags, char *error_str, int error_str_len); -void scsi_test_unit_ready(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_test_unit_ready(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t sense_len, uint32_t timeout); -void scsi_request_sense(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_request_sense(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), void *data_ptr, u_int8_t dxfer_len, u_int8_t tag_action, u_int8_t sense_len, - u_int32_t timeout); + uint32_t timeout); -void scsi_inquiry(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_inquiry(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t *inq_buf, - u_int32_t inq_len, int evpd, u_int8_t page_code, - u_int8_t sense_len, u_int32_t timeout); + uint32_t inq_len, int evpd, u_int8_t page_code, + u_int8_t sense_len, uint32_t timeout); -void scsi_mode_sense(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_mode_sense(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int dbd, u_int8_t page_code, u_int8_t page, - u_int8_t *param_buf, u_int32_t param_len, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t *param_buf, uint32_t param_len, + u_int8_t sense_len, uint32_t timeout); -void scsi_mode_sense_len(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_mode_sense_len(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int dbd, u_int8_t page_code, u_int8_t page, - u_int8_t *param_buf, u_int32_t param_len, + u_int8_t *param_buf, uint32_t param_len, int minimum_cmd_size, u_int8_t sense_len, - u_int32_t timeout); + uint32_t timeout); -void scsi_mode_select(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_mode_select(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int scsi_page_fmt, int save_pages, u_int8_t *param_buf, - u_int32_t param_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t param_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_mode_select_len(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_mode_select_len(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int scsi_page_fmt, int save_pages, u_int8_t *param_buf, - u_int32_t param_len, int minimum_cmd_size, - u_int8_t sense_len, u_int32_t timeout); + uint32_t param_len, int minimum_cmd_size, + u_int8_t sense_len, uint32_t timeout); -void scsi_log_sense(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_log_sense(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t page_code, u_int8_t page, int save_pages, int ppc, - u_int32_t paramptr, u_int8_t *param_buf, - u_int32_t param_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t paramptr, u_int8_t *param_buf, + uint32_t param_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_log_select(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_log_select(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t page_code, int save_pages, int pc_reset, u_int8_t *param_buf, - u_int32_t param_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t param_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_prevent(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_prevent(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t action, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t sense_len, uint32_t timeout); -void scsi_read_capacity(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_read_capacity(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, struct scsi_read_capacity_data *, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t sense_len, uint32_t timeout); void scsi_read_capacity_16(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), uint8_t tag_action, @@ -3817,36 +3817,36 @@ uint8_t *rcap_buf, int rcap_buf_len, uint8_t sense_len, uint32_t timeout); -void scsi_report_luns(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_report_luns(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t select_report, struct scsi_report_luns_data *rpl_buf, - u_int32_t alloc_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t alloc_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_report_target_group(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_report_target_group(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t pdf, void *buf, - u_int32_t alloc_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t alloc_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_set_target_group(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_set_target_group(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, void *buf, - u_int32_t alloc_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t alloc_len, u_int8_t sense_len, + uint32_t timeout); void scsi_synchronize_cache(struct ccb_scsiio *csio, - u_int32_t retries, + uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, - u_int32_t begin_lba, u_int16_t lb_count, - u_int8_t sense_len, u_int32_t timeout); + uint32_t begin_lba, u_int16_t lb_count, + u_int8_t sense_len, uint32_t timeout); -void scsi_receive_diagnostic_results(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_receive_diagnostic_results(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*), uint8_t tag_action, int pcv, @@ -3854,7 +3854,7 @@ uint16_t allocation_length, uint8_t sense_len, uint32_t timeout); -void scsi_send_diagnostic(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_send_diagnostic(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), uint8_t tag_action, int unit_offline, int device_offline, int self_test, int page_format, @@ -3862,17 +3862,17 @@ uint16_t param_list_length, uint8_t sense_len, uint32_t timeout); -void scsi_read_buffer(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_read_buffer(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*), uint8_t tag_action, int mode, - uint8_t buffer_id, u_int32_t offset, + uint8_t buffer_id, uint32_t offset, uint8_t *data_ptr, uint32_t allocation_length, uint8_t sense_len, uint32_t timeout); -void scsi_write_buffer(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_write_buffer(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), uint8_t tag_action, int mode, - uint8_t buffer_id, u_int32_t offset, + uint8_t buffer_id, uint32_t offset, uint8_t *data_ptr, uint32_t param_list_length, uint8_t sense_len, uint32_t timeout); @@ -3880,64 +3880,64 @@ #define SCSI_RW_WRITE 0x0002 #define SCSI_RW_DIRMASK 0x0003 #define SCSI_RW_BIO 0x1000 -void scsi_read_write(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_read_write(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int readop, u_int8_t byte2, int minimum_cmd_size, u_int64_t lba, - u_int32_t block_count, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t block_count, u_int8_t *data_ptr, + uint32_t dxfer_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_write_same(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_write_same(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t byte2, int minimum_cmd_size, u_int64_t lba, - u_int32_t block_count, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t block_count, u_int8_t *data_ptr, + uint32_t dxfer_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_ata_identify(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_ata_identify(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t *data_ptr, u_int16_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t timeout); -void scsi_ata_trim(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_ata_trim(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int16_t block_count, u_int8_t *data_ptr, u_int16_t dxfer_len, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t sense_len, uint32_t timeout); -void scsi_ata_pass_16(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_ata_pass_16(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int32_t flags, u_int8_t tag_action, + uint32_t flags, u_int8_t tag_action, u_int8_t protocol, u_int8_t ata_flags, u_int16_t features, u_int16_t sector_count, uint64_t lba, u_int8_t command, u_int8_t control, u_int8_t *data_ptr, u_int16_t dxfer_len, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t sense_len, uint32_t timeout); -void scsi_unmap(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_unmap(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t byte2, u_int8_t *data_ptr, u_int16_t dxfer_len, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t sense_len, uint32_t timeout); -void scsi_start_stop(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_start_stop(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int start, int load_eject, - int immediate, u_int8_t sense_len, u_int32_t timeout); -void scsi_read_attribute(struct ccb_scsiio *csio, u_int32_t retries, + int immediate, u_int8_t sense_len, uint32_t timeout); +void scsi_read_attribute(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t service_action, uint32_t element, u_int8_t elem_type, int logical_volume, int partition, - u_int32_t first_attribute, int cache, u_int8_t *data_ptr, - u_int32_t length, int sense_len, u_int32_t timeout); -void scsi_write_attribute(struct ccb_scsiio *csio, u_int32_t retries, + uint32_t first_attribute, int cache, u_int8_t *data_ptr, + uint32_t length, int sense_len, uint32_t timeout); +void scsi_write_attribute(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, uint32_t element, int logical_volume, int partition, int wtc, u_int8_t *data_ptr, - u_int32_t length, int sense_len, u_int32_t timeout); + uint32_t length, int sense_len, uint32_t timeout); void scsi_security_protocol_in(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), @@ -3986,9 +3986,9 @@ int show_errors); int scsi_get_ascq(struct scsi_sense_data *sense, u_int sense_len, int show_errors); -static __inline void scsi_ulto2b(u_int32_t val, u_int8_t *bytes); -static __inline void scsi_ulto3b(u_int32_t val, u_int8_t *bytes); -static __inline void scsi_ulto4b(u_int32_t val, u_int8_t *bytes); +static __inline void scsi_ulto2b(uint32_t val, u_int8_t *bytes); +static __inline void scsi_ulto3b(uint32_t val, u_int8_t *bytes); +static __inline void scsi_ulto4b(uint32_t val, u_int8_t *bytes); static __inline void scsi_u64to8b(u_int64_t val, u_int8_t *bytes); static __inline uint32_t scsi_2btoul(const uint8_t *bytes); static __inline uint32_t scsi_3btoul(const uint8_t *bytes); @@ -3999,7 +3999,7 @@ static __inline void *find_mode_page_10(struct scsi_mode_header_10 *mode_header); static __inline void -scsi_ulto2b(u_int32_t val, u_int8_t *bytes) +scsi_ulto2b(uint32_t val, u_int8_t *bytes) { bytes[0] = (val >> 8) & 0xff; @@ -4007,7 +4007,7 @@ } static __inline void -scsi_ulto3b(u_int32_t val, u_int8_t *bytes) +scsi_ulto3b(uint32_t val, u_int8_t *bytes) { bytes[0] = (val >> 16) & 0xff; @@ -4016,7 +4016,7 @@ } static __inline void -scsi_ulto4b(u_int32_t val, u_int8_t *bytes) +scsi_ulto4b(uint32_t val, u_int8_t *bytes) { bytes[0] = (val >> 24) & 0xff; diff --git a/src/include.new/cam/scsi/scsi_cd.h b/src/include.new/cam/scsi/scsi_cd.h index 132bd25..8c4abed 100644 --- a/src/include.new/cam/scsi/scsi_cd.h +++ b/src/include.new/cam/scsi/scsi_cd.h @@ -720,26 +720,26 @@ }; __BEGIN_DECLS -void scsi_report_key(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_report_key(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int32_t lba, u_int8_t agid, + u_int8_t tag_action, uint32_t lba, u_int8_t agid, u_int8_t key_format, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t dxfer_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_send_key(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_send_key(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t agid, u_int8_t key_format, - u_int8_t *data_ptr, u_int32_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + u_int8_t *data_ptr, uint32_t dxfer_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_read_dvd_structure(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_read_dvd_structure(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int32_t address, + u_int8_t tag_action, uint32_t address, u_int8_t layer_number, u_int8_t format, u_int8_t agid, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t dxfer_len, u_int8_t sense_len, + uint32_t timeout); __END_DECLS diff --git a/src/include.new/cam/scsi/scsi_ch.h b/src/include.new/cam/scsi/scsi_ch.h index 6b37cde..239d7bb 100644 --- a/src/include.new/cam/scsi/scsi_ch.h +++ b/src/include.new/cam/scsi/scsi_ch.h @@ -468,43 +468,43 @@ }; __BEGIN_DECLS -void scsi_move_medium(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_move_medium(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int32_t tea, u_int32_t src, - u_int32_t dst, int invert, u_int8_t sense_len, - u_int32_t timeout); + u_int8_t tag_action, uint32_t tea, uint32_t src, + uint32_t dst, int invert, u_int8_t sense_len, + uint32_t timeout); -void scsi_exchange_medium(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_exchange_medium(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int32_t tea, u_int32_t src, - u_int32_t dst1, u_int32_t dst2, int invert1, - int invert2, u_int8_t sense_len, u_int32_t timeout); + u_int8_t tag_action, uint32_t tea, uint32_t src, + uint32_t dst1, uint32_t dst2, int invert1, + int invert2, u_int8_t sense_len, uint32_t timeout); -void scsi_position_to_element(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_position_to_element(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int32_t tea, u_int32_t dst, + u_int8_t tag_action, uint32_t tea, uint32_t dst, int invert, u_int8_t sense_len, - u_int32_t timeout); + uint32_t timeout); -void scsi_read_element_status(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_read_element_status(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, int voltag, u_int32_t sea, + u_int8_t tag_action, int voltag, uint32_t sea, int curdata, int dvcid, - u_int32_t count, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + uint32_t count, u_int8_t *data_ptr, + uint32_t dxfer_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_initialize_element_status(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_initialize_element_status(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t sense_len, - u_int32_t timeout); -void scsi_send_volume_tag(struct ccb_scsiio *csio, u_int32_t retries, + uint32_t timeout); +void scsi_send_volume_tag(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int16_t element_address, u_int8_t send_action_code, struct scsi_send_volume_tag_parameters *parameters, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t sense_len, uint32_t timeout); __END_DECLS #endif /* _SCSI_SCSI_CH_H */ diff --git a/src/include.new/cam/scsi/scsi_da.h b/src/include.new/cam/scsi/scsi_da.h index dc5224b..6f9a8f3 100644 --- a/src/include.new/cam/scsi/scsi_da.h +++ b/src/include.new/cam/scsi/scsi_da.h @@ -561,11 +561,11 @@ * be moved so they are included both in the kernel and userland. */ #ifndef _KERNEL -void scsi_format_unit(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_format_unit(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t byte2, u_int16_t ileave, - u_int8_t *data_ptr, u_int32_t dxfer_len, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t *data_ptr, uint32_t dxfer_len, + u_int8_t sense_len, uint32_t timeout); void scsi_read_defects(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), @@ -574,11 +574,11 @@ uint32_t dxfer_len, int minimum_cmd_size, uint8_t sense_len, uint32_t timeout); -void scsi_sanitize(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_sanitize(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, u_int8_t byte2, u_int16_t control, - u_int8_t *data_ptr, u_int32_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + u_int8_t *data_ptr, uint32_t dxfer_len, u_int8_t sense_len, + uint32_t timeout); #endif /* !_KERNEL */ __END_DECLS diff --git a/src/include.new/cam/scsi/scsi_sa.h b/src/include.new/cam/scsi/scsi_sa.h index a4ccf5e..59f15f8 100644 --- a/src/include.new/cam/scsi/scsi_sa.h +++ b/src/include.new/cam/scsi/scsi_sa.h @@ -958,110 +958,110 @@ #define SCSI_DENSITY_QIC_3080 0x29 __BEGIN_DECLS -void scsi_read_block_limits(struct ccb_scsiio *, u_int32_t, +void scsi_read_block_limits(struct ccb_scsiio *, uint32_t, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t, struct scsi_read_block_limits_data *, - u_int8_t , u_int32_t); + u_int8_t , uint32_t); -void scsi_sa_read_write(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_sa_read_write(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int readop, int sli, - int fixed, u_int32_t length, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int8_t sense_len, - u_int32_t timeout); + int fixed, uint32_t length, u_int8_t *data_ptr, + uint32_t dxfer_len, u_int8_t sense_len, + uint32_t timeout); -void scsi_rewind(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_rewind(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int immediate, u_int8_t sense_len, - u_int32_t timeout); + uint32_t timeout); -void scsi_space(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_space(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, scsi_space_code code, - u_int32_t count, u_int8_t sense_len, u_int32_t timeout); + uint32_t count, u_int8_t sense_len, uint32_t timeout); -void scsi_load_unload(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_load_unload(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int immediate, int eot, int reten, int load, u_int8_t sense_len, - u_int32_t timeout); + uint32_t timeout); -void scsi_write_filemarks(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_write_filemarks(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int immediate, int setmark, - u_int32_t num_marks, u_int8_t sense_len, - u_int32_t timeout); + uint32_t num_marks, u_int8_t sense_len, + uint32_t timeout); -void scsi_reserve_release_unit(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_reserve_release_unit(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int third_party, int third_party_id, - u_int8_t sense_len, u_int32_t timeout, + u_int8_t sense_len, uint32_t timeout, int reserve); -void scsi_erase(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_erase(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int immediate, int long_erase, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t sense_len, uint32_t timeout); void scsi_data_comp_page(struct scsi_data_compression_page *page, u_int8_t dce, u_int8_t dde, u_int8_t red, - u_int32_t comp_algorithm, - u_int32_t decomp_algorithm); + uint32_t comp_algorithm, + uint32_t decomp_algorithm); -void scsi_read_position(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_read_position(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int hardsoft, struct scsi_tape_position_data *sbp, - u_int8_t sense_len, u_int32_t timeout); -void scsi_read_position_10(struct ccb_scsiio *csio, u_int32_t retries, + u_int8_t sense_len, uint32_t timeout); +void scsi_read_position_10(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int service_action, - u_int8_t *data_ptr, u_int32_t length, - u_int32_t sense_len, u_int32_t timeout); + u_int8_t *data_ptr, uint32_t length, + uint32_t sense_len, uint32_t timeout); -void scsi_set_position(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_set_position(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, int hardsoft, u_int32_t blkno, - u_int8_t sense_len, u_int32_t timeout); + u_int8_t tag_action, int hardsoft, uint32_t blkno, + u_int8_t sense_len, uint32_t timeout); -void scsi_locate_10(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_locate_10(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int immed, int cp, int hard, - int64_t partition, u_int32_t block_address, - int sense_len, u_int32_t timeout); + int64_t partition, uint32_t block_address, + int sense_len, uint32_t timeout); -void scsi_locate_16(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_locate_16(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int immed, int cp, u_int8_t dest_type, int bam, int64_t partition, u_int64_t logical_id, int sense_len, - u_int32_t timeout); + uint32_t timeout); -void scsi_report_density_support(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_report_density_support(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int media, int medium_type, u_int8_t *data_ptr, - u_int32_t length, u_int32_t sense_len, - u_int32_t timeout); + uint32_t length, uint32_t sense_len, + uint32_t timeout); -void scsi_set_capacity(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_set_capacity(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, int byte1, u_int32_t proportion, - u_int32_t sense_len, u_int32_t timeout); + u_int8_t tag_action, int byte1, uint32_t proportion, + uint32_t sense_len, uint32_t timeout); -void scsi_format_medium(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_format_medium(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int byte1, int byte2, - u_int8_t *data_ptr, u_int32_t length, - u_int32_t sense_len, u_int32_t timeout); + u_int8_t *data_ptr, uint32_t length, + uint32_t sense_len, uint32_t timeout); -void scsi_allow_overwrite(struct ccb_scsiio *csio, u_int32_t retries, +void scsi_allow_overwrite(struct ccb_scsiio *csio, uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int allow_overwrite, int partition, u_int64_t logical_id, - u_int32_t sense_len, u_int32_t timeout); + uint32_t sense_len, uint32_t timeout); __END_DECLS diff --git a/src/include.new/camlib.h b/src/include.new/camlib.h index 782d0a1..c337b10 100644 --- a/src/include.new/camlib.h +++ b/src/include.new/camlib.h @@ -94,7 +94,7 @@ * Device name given by * the user. */ - u_int32_t given_unit_number; /* + uint32_t given_unit_number; /* * Unit number given by * the user. */ @@ -102,14 +102,14 @@ * Name of the device, * e.g. 'pass' */ - u_int32_t dev_unit_num; /* Unit number of the passthrough + uint32_t dev_unit_num; /* Unit number of the passthrough * device associated with this * particular device. */ char sim_name[SIM_IDLEN+1]; /* Controller name, e.g. 'ahc' */ - u_int32_t sim_unit_number; /* Controller unit number */ - u_int32_t bus_id; /* Controller bus number */ + uint32_t sim_unit_number; /* Controller unit number */ + uint32_t bus_id; /* Controller bus number */ lun_id_t target_lun; /* Logical Unit Number */ target_id_t target_id; /* Target ID */ path_id_t path_id; /* System SCSI bus number */ @@ -161,10 +161,10 @@ void (*arg_put)(void *, int, void *, int, char *), void *puthook); int csio_build(struct ccb_scsiio *csio, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int32_t flags, int retry_count, + uint32_t dxfer_len, uint32_t flags, int retry_count, int timeout, const char *cmd_spec, ...); int csio_build_visit(struct ccb_scsiio *csio, u_int8_t *data_ptr, - u_int32_t dxfer_len, u_int32_t flags, int retry_count, + uint32_t dxfer_len, uint32_t flags, int retry_count, int timeout, const char *cmd_spec, int (*arg_get)(void *hook, char *field_name), void *gethook); diff --git a/src/include.new/crypto/cast.h b/src/include.new/crypto/cast.h index ae66844..b8c3134 100644 --- a/src/include.new/crypto/cast.h +++ b/src/include.new/crypto/cast.h @@ -12,7 +12,7 @@ #define _CAST_H_ typedef struct { - u_int32_t xkey[32]; /* Key, after expansion */ + uint32_t xkey[32]; /* Key, after expansion */ int rounds; /* Number of rounds to use, 12 or 16 */ } cast_key; diff --git a/src/include.new/crypto/castsb.h b/src/include.new/crypto/castsb.h index 2c76886..04a4214 100644 --- a/src/include.new/crypto/castsb.h +++ b/src/include.new/crypto/castsb.h @@ -7,7 +7,7 @@ * Released 1997.10.11 */ -static const u_int32_t cast_sbox1[256] = { +static const uint32_t cast_sbox1[256] = { 0x30FB40D4, 0x9FA0FF0B, 0x6BECCD2F, 0x3F258C7A, 0x1E213F2F, 0x9C004DD3, 0x6003E540, 0xCF9FC949, 0xBFD4AF27, 0x88BBBDB5, 0xE2034090, 0x98D09675, @@ -74,7 +74,7 @@ 0x427B169C, 0x5AC9F049, 0xDD8F0F00, 0x5C8165BF }; -static const u_int32_t cast_sbox2[256] = { +static const uint32_t cast_sbox2[256] = { 0x1F201094, 0xEF0BA75B, 0x69E3CF7E, 0x393F4380, 0xFE61CF7A, 0xEEC5207A, 0x55889C94, 0x72FC0651, 0xADA7EF79, 0x4E1D7235, 0xD55A63CE, 0xDE0436BA, @@ -141,7 +141,7 @@ 0x7160A539, 0x73BFBE70, 0x83877605, 0x4523ECF1 }; -static const u_int32_t cast_sbox3[256] = { +static const uint32_t cast_sbox3[256] = { 0x8DEFC240, 0x25FA5D9F, 0xEB903DBF, 0xE810C907, 0x47607FFF, 0x369FE44B, 0x8C1FC644, 0xAECECA90, 0xBEB1F9BF, 0xEEFBCAEA, 0xE8CF1950, 0x51DF07AE, @@ -208,7 +208,7 @@ 0xDFEF4636, 0xA133C501, 0xE9D3531C, 0xEE353783 }; -static const u_int32_t cast_sbox4[256] = { +static const uint32_t cast_sbox4[256] = { 0x9DB30420, 0x1FB6E9DE, 0xA7BE7BEF, 0xD273A298, 0x4A4F7BDB, 0x64AD8C57, 0x85510443, 0xFA020ED1, 0x7E287AFF, 0xE60FB663, 0x095F35A1, 0x79EBF120, @@ -275,7 +275,7 @@ 0x13ECF0B0, 0xD3FFB372, 0x3F85C5C1, 0x0AEF7ED2 }; -static const u_int32_t cast_sbox5[256] = { +static const uint32_t cast_sbox5[256] = { 0x7EC90C04, 0x2C6E74B9, 0x9B0E66DF, 0xA6337911, 0xB86A7FFF, 0x1DD358F5, 0x44DD9D44, 0x1731167F, 0x08FBF1FA, 0xE7F511CC, 0xD2051B00, 0x735ABA00, @@ -342,7 +342,7 @@ 0x5E76FFA8, 0xB1534546, 0x6D47DE08, 0xEFE9E7D4 }; -static const u_int32_t cast_sbox6[256] = { +static const uint32_t cast_sbox6[256] = { 0xF6FA8F9D, 0x2CAC6CE1, 0x4CA34867, 0xE2337F7C, 0x95DB08E7, 0x016843B4, 0xECED5CBC, 0x325553AC, 0xBF9F0960, 0xDFA1E2ED, 0x83F0579D, 0x63ED86B9, @@ -409,7 +409,7 @@ 0x48392905, 0xA65B1DB8, 0x851C97BD, 0xD675CF2F }; -static const u_int32_t cast_sbox7[256] = { +static const uint32_t cast_sbox7[256] = { 0x85E04019, 0x332BF567, 0x662DBFFF, 0xCFC65693, 0x2A8D7F6F, 0xAB9BC912, 0xDE6008A1, 0x2028DA1F, 0x0227BCE7, 0x4D642916, 0x18FAC300, 0x50F18B82, @@ -476,7 +476,7 @@ 0xF2A279C7, 0x94E01BE8, 0x90716F4B, 0x954B8AA3 }; -static const u_int32_t cast_sbox8[256] = { +static const uint32_t cast_sbox8[256] = { 0xE216300D, 0xBBDDFFFC, 0xA7EBDABD, 0x35648095, 0x7789F8B7, 0xE6C1121B, 0x0E241600, 0x052CE8B5, 0x11A9CFB0, 0xE5952F11, 0xECE7990A, 0x9386D174, diff --git a/src/include.new/crypto/cryptodev.h b/src/include.new/crypto/cryptodev.h index b826691..e54c36a 100644 --- a/src/include.new/crypto/cryptodev.h +++ b/src/include.new/crypto/cryptodev.h @@ -144,33 +144,33 @@ /* NB: deprecated */ struct session_op { - u_int32_t cipher; /* ie. CRYPTO_DES_CBC */ - u_int32_t mac; /* ie. CRYPTO_MD5_HMAC */ + uint32_t cipher; /* ie. CRYPTO_DES_CBC */ + uint32_t mac; /* ie. CRYPTO_MD5_HMAC */ - u_int32_t keylen; /* cipher key */ + uint32_t keylen; /* cipher key */ caddr_t key; int mackeylen; /* mac key */ caddr_t mackey; - u_int32_t ses; /* returns: session # */ + uint32_t ses; /* returns: session # */ }; struct session2_op { - u_int32_t cipher; /* ie. CRYPTO_DES_CBC */ - u_int32_t mac; /* ie. CRYPTO_MD5_HMAC */ + uint32_t cipher; /* ie. CRYPTO_DES_CBC */ + uint32_t mac; /* ie. CRYPTO_MD5_HMAC */ - u_int32_t keylen; /* cipher key */ + uint32_t keylen; /* cipher key */ caddr_t key; int mackeylen; /* mac key */ caddr_t mackey; - u_int32_t ses; /* returns: session # */ + uint32_t ses; /* returns: session # */ int crid; /* driver id + flags (rw) */ int pad[4]; /* for future expansion */ }; struct crypt_op { - u_int32_t ses; + uint32_t ses; u_int16_t op; /* i.e. COP_ENCRYPT */ #define COP_ENCRYPT 1 #define COP_DECRYPT 2 @@ -226,16 +226,16 @@ * done against open of /dev/crypto, to get a cloned descriptor. * Please use F_SETFD against the cloned descriptor. */ -#define CRIOGET _IOWR('c', 100, u_int32_t) +#define CRIOGET _IOWR('c', 100, uint32_t) #define CRIOASYMFEAT CIOCASYMFEAT #define CRIOFINDDEV CIOCFINDDEV /* the following are done against the cloned descriptor */ #define CIOCGSESSION _IOWR('c', 101, struct session_op) -#define CIOCFSESSION _IOW('c', 102, u_int32_t) +#define CIOCFSESSION _IOW('c', 102, uint32_t) #define CIOCCRYPT _IOWR('c', 103, struct crypt_op) #define CIOCKEY _IOWR('c', 104, struct crypt_kop) -#define CIOCASYMFEAT _IOR('c', 105, u_int32_t) +#define CIOCASYMFEAT _IOR('c', 105, uint32_t) #define CIOCGSESSION2 _IOWR('c', 106, struct session2_op) #define CIOCKEY2 _IOWR('c', 107, struct crypt_kop) #define CIOCFINDDEV _IOWR('c', 108, struct crypt_find_op) @@ -244,18 +244,18 @@ struct timespec acc; /* total accumulated time */ struct timespec min; /* min time */ struct timespec max; /* max time */ - u_int32_t count; /* number of observations */ + uint32_t count; /* number of observations */ }; struct cryptostats { - u_int32_t cs_ops; /* symmetric crypto ops submitted */ - u_int32_t cs_errs; /* symmetric crypto ops that failed */ - u_int32_t cs_kops; /* asymetric/key ops submitted */ - u_int32_t cs_kerrs; /* asymetric/key ops that failed */ - u_int32_t cs_intrs; /* crypto swi thread activations */ - u_int32_t cs_rets; /* crypto return thread activations */ - u_int32_t cs_blocks; /* symmetric op driver block */ - u_int32_t cs_kblocks; /* symmetric op driver block */ + uint32_t cs_ops; /* symmetric crypto ops submitted */ + uint32_t cs_errs; /* symmetric crypto ops that failed */ + uint32_t cs_kops; /* asymetric/key ops submitted */ + uint32_t cs_kerrs; /* asymetric/key ops that failed */ + uint32_t cs_intrs; /* crypto swi thread activations */ + uint32_t cs_rets; /* crypto return thread activations */ + uint32_t cs_blocks; /* symmetric op driver block */ + uint32_t cs_kblocks; /* symmetric op driver block */ /* * When CRYPTO_TIMING is defined at compile time and the * sysctl debug.crypto is set to 1, the crypto system will @@ -361,7 +361,7 @@ u_short krp_iparams; /* # of input parameters */ u_short krp_oparams; /* # of output parameters */ u_int krp_crid; /* desired device, etc. */ - u_int32_t krp_hid; + uint32_t krp_hid; struct crparam krp_param[CRK_MAXPARAM]; /* kvm */ int (*krp_callback)(struct cryptkop *); }; @@ -375,7 +375,7 @@ */ #define CRYPTO_SESID2HID(_sid) (((_sid) >> 32) & 0x00ffffff) #define CRYPTO_SESID2CAPS(_sid) (((_sid) >> 32) & 0xff000000) -#define CRYPTO_SESID2LID(_sid) (((u_int32_t) (_sid)) & 0xffffffff) +#define CRYPTO_SESID2LID(_sid) (((uint32_t) (_sid)) & 0xffffffff) MALLOC_DECLARE(M_CRYPTO_DATA); @@ -388,16 +388,16 @@ extern int crypto_find_driver(const char *); extern device_t crypto_find_device_byhid(int hid); extern int crypto_getcaps(int hid); -extern int crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen, - u_int32_t flags); -extern int crypto_kregister(u_int32_t, int, u_int32_t); -extern int crypto_unregister(u_int32_t driverid, int alg); -extern int crypto_unregister_all(u_int32_t driverid); +extern int crypto_register(uint32_t driverid, int alg, u_int16_t maxoplen, + uint32_t flags); +extern int crypto_kregister(uint32_t, int, uint32_t); +extern int crypto_unregister(uint32_t driverid, int alg); +extern int crypto_unregister_all(uint32_t driverid); extern int crypto_dispatch(struct cryptop *crp); extern int crypto_kdispatch(struct cryptkop *); #define CRYPTO_SYMQ 0x1 #define CRYPTO_ASYMQ 0x2 -extern int crypto_unblock(u_int32_t, int); +extern int crypto_unblock(uint32_t, int); extern void crypto_done(struct cryptop *crp); extern void crypto_kdone(struct cryptkop *); extern int crypto_getfeat(int *); diff --git a/src/include.new/crypto/cryptosoft.h b/src/include.new/crypto/cryptosoft.h index 6d407e8..c64d6df 100644 --- a/src/include.new/crypto/cryptosoft.h +++ b/src/include.new/crypto/cryptosoft.h @@ -41,7 +41,7 @@ struct enc_xform *SW_exf; } SWCR_ENC; struct { - u_int32_t SW_size; + uint32_t SW_size; struct comp_algo *SW_cxf; } SWCR_COMP; } SWCR_UN; diff --git a/src/include.new/crypto/deflate.h b/src/include.new/crypto/deflate.h index 7d41b7c..2199107 100644 --- a/src/include.new/crypto/deflate.h +++ b/src/include.new/crypto/deflate.h @@ -43,7 +43,7 @@ #define MINCOMP 2 /* won't be used, but must be defined */ #define ZBUF 10 -u_int32_t deflate_global(u_int8_t *, u_int32_t, int, u_int8_t **); +uint32_t deflate_global(u_int8_t *, uint32_t, int, u_int8_t **); void *z_alloc(void *, u_int, u_int); void z_free(void *, void *); diff --git a/src/include.new/crypto/rijndael.h b/src/include.new/crypto/rijndael.h index 2deee21..1f05f70 100644 --- a/src/include.new/crypto/rijndael.h +++ b/src/include.new/crypto/rijndael.h @@ -45,11 +45,11 @@ void rijndael_decrypt(const rijndael_ctx *, const u_char *, u_char *); void rijndael_encrypt(const rijndael_ctx *, const u_char *, u_char *); -int rijndaelKeySetupEnc(u_int32_t [/*4*(Nr+1)*/], const u_int8_t [], int); -int rijndaelKeySetupDec(u_int32_t [/*4*(Nr+1)*/], const u_int8_t [], int); -void rijndaelEncrypt(const u_int32_t [/*4*(Nr+1)*/], int, +int rijndaelKeySetupEnc(uint32_t [/*4*(Nr+1)*/], const u_int8_t [], int); +int rijndaelKeySetupDec(uint32_t [/*4*(Nr+1)*/], const u_int8_t [], int); +void rijndaelEncrypt(const uint32_t [/*4*(Nr+1)*/], int, const u_int8_t[16], u_int8_t [16]); -void rijndaelDecrypt(const u_int32_t [/*4*(Nr+1)*/], int, +void rijndaelDecrypt(const uint32_t [/*4*(Nr+1)*/], int, const u_int8_t [16], u_int8_t [16]); #endif /* __RIJNDAEL_H */ diff --git a/src/include.new/crypto/rmd160.h b/src/include.new/crypto/rmd160.h index d90db84..32dc9ae 100644 --- a/src/include.new/crypto/rmd160.h +++ b/src/include.new/crypto/rmd160.h @@ -28,14 +28,14 @@ /* RMD160 context. */ typedef struct RMD160Context { - u_int32_t state[5]; /* state */ + uint32_t state[5]; /* state */ u_int64_t count; /* number of bits, modulo 2^64 */ u_char buffer[64]; /* input buffer */ } RMD160_CTX; void RMD160Init(RMD160_CTX *); -void RMD160Transform(u_int32_t [5], const u_char [64]); -void RMD160Update(RMD160_CTX *, const u_char *, u_int32_t); +void RMD160Transform(uint32_t [5], const u_char [64]); +void RMD160Update(RMD160_CTX *, const u_char *, uint32_t); void RMD160Final(u_char [20], RMD160_CTX *); #endif /* _RMD160_H */ diff --git a/src/include.new/crypto/xform.h b/src/include.new/crypto/xform.h index d7016f6..548fdcf 100644 --- a/src/include.new/crypto/xform.h +++ b/src/include.new/crypto/xform.h @@ -62,8 +62,8 @@ int type; char *name; size_t minlen; - u_int32_t (*compress) (u_int8_t *, u_int32_t, u_int8_t **); - u_int32_t (*decompress) (u_int8_t *, u_int32_t, u_int8_t **); + uint32_t (*compress) (u_int8_t *, uint32_t, u_int8_t **); + uint32_t (*decompress) (u_int8_t *, uint32_t, u_int8_t **); }; union authctx { diff --git a/src/include.new/dev/an/if_aironet_ieee.h b/src/include.new/dev/an/if_aironet_ieee.h index 3c1140c..5151fdc 100644 --- a/src/include.new/dev/an/if_aironet_ieee.h +++ b/src/include.new/dev/an/if_aironet_ieee.h @@ -165,103 +165,103 @@ u_int16_t an_len; /* 0x00 */ u_int16_t an_type; /* 0xXX */ u_int16_t an_spacer; /* 0x02 */ - u_int32_t an_rx_overruns; /* 0x04 */ - u_int32_t an_rx_plcp_csum_errs; /* 0x08 */ - u_int32_t an_rx_plcp_format_errs; /* 0x0C */ - u_int32_t an_rx_plcp_len_errs; /* 0x10 */ - u_int32_t an_rx_mac_crc_errs; /* 0x14 */ - u_int32_t an_rx_mac_crc_ok; /* 0x18 */ - u_int32_t an_rx_wep_errs; /* 0x1C */ - u_int32_t an_rx_wep_ok; /* 0x20 */ - u_int32_t an_retry_long; /* 0x24 */ - u_int32_t an_retry_short; /* 0x28 */ - u_int32_t an_retry_max; /* 0x2C */ - u_int32_t an_no_ack; /* 0x30 */ - u_int32_t an_no_cts; /* 0x34 */ - u_int32_t an_rx_ack_ok; /* 0x38 */ - u_int32_t an_rx_cts_ok; /* 0x3C */ - u_int32_t an_tx_ack_ok; /* 0x40 */ - u_int32_t an_tx_rts_ok; /* 0x44 */ - u_int32_t an_tx_cts_ok; /* 0x48 */ - u_int32_t an_tx_lmac_mcasts; /* 0x4C */ - u_int32_t an_tx_lmac_bcasts; /* 0x50 */ - u_int32_t an_tx_lmac_ucast_frags; /* 0x54 */ - u_int32_t an_tx_lmac_ucasts; /* 0x58 */ - u_int32_t an_tx_beacons; /* 0x5C */ - u_int32_t an_rx_beacons; /* 0x60 */ - u_int32_t an_tx_single_cols; /* 0x64 */ - u_int32_t an_tx_multi_cols; /* 0x68 */ - u_int32_t an_tx_defers_no; /* 0x6C */ - u_int32_t an_tx_defers_prot; /* 0x70 */ - u_int32_t an_tx_defers_energy; /* 0x74 */ - u_int32_t an_rx_dups; /* 0x78 */ - u_int32_t an_rx_partial; /* 0x7C */ - u_int32_t an_tx_too_old; /* 0x80 */ - u_int32_t an_rx_too_old; /* 0x84 */ - u_int32_t an_lostsync_max_retries;/* 0x88 */ - u_int32_t an_lostsync_missed_beacons;/* 0x8C */ - u_int32_t an_lostsync_arl_exceeded;/*0x90 */ - u_int32_t an_lostsync_deauthed; /* 0x94 */ - u_int32_t an_lostsync_disassociated;/*0x98 */ - u_int32_t an_lostsync_tsf_timing; /* 0x9C */ - u_int32_t an_tx_host_mcasts; /* 0xA0 */ - u_int32_t an_tx_host_bcasts; /* 0xA4 */ - u_int32_t an_tx_host_ucasts; /* 0xA8 */ - u_int32_t an_tx_host_failed; /* 0xAC */ - u_int32_t an_rx_host_mcasts; /* 0xB0 */ - u_int32_t an_rx_host_bcasts; /* 0xB4 */ - u_int32_t an_rx_host_ucasts; /* 0xB8 */ - u_int32_t an_rx_host_discarded; /* 0xBC */ - u_int32_t an_tx_hmac_mcasts; /* 0xC0 */ - u_int32_t an_tx_hmac_bcasts; /* 0xC4 */ - u_int32_t an_tx_hmac_ucasts; /* 0xC8 */ - u_int32_t an_tx_hmac_failed; /* 0xCC */ - u_int32_t an_rx_hmac_mcasts; /* 0xD0 */ - u_int32_t an_rx_hmac_bcasts; /* 0xD4 */ - u_int32_t an_rx_hmac_ucasts; /* 0xD8 */ - u_int32_t an_rx_hmac_discarded; /* 0xDC */ - u_int32_t an_tx_hmac_accepted; /* 0xE0 */ - u_int32_t an_ssid_mismatches; /* 0xE4 */ - u_int32_t an_ap_mismatches; /* 0xE8 */ - u_int32_t an_rates_mismatches; /* 0xEC */ - u_int32_t an_auth_rejects; /* 0xF0 */ - u_int32_t an_auth_timeouts; /* 0xF4 */ - u_int32_t an_assoc_rejects; /* 0xF8 */ - u_int32_t an_assoc_timeouts; /* 0xFC */ - u_int32_t an_reason_outside_table;/* 0x100 */ - u_int32_t an_reason1; /* 0x104 */ - u_int32_t an_reason2; /* 0x108 */ - u_int32_t an_reason3; /* 0x10C */ - u_int32_t an_reason4; /* 0x110 */ - u_int32_t an_reason5; /* 0x114 */ - u_int32_t an_reason6; /* 0x118 */ - u_int32_t an_reason7; /* 0x11C */ - u_int32_t an_reason8; /* 0x120 */ - u_int32_t an_reason9; /* 0x124 */ - u_int32_t an_reason10; /* 0x128 */ - u_int32_t an_reason11; /* 0x12C */ - u_int32_t an_reason12; /* 0x130 */ - u_int32_t an_reason13; /* 0x134 */ - u_int32_t an_reason14; /* 0x138 */ - u_int32_t an_reason15; /* 0x13C */ - u_int32_t an_reason16; /* 0x140 */ - u_int32_t an_reason17; /* 0x144 */ - u_int32_t an_reason18; /* 0x148 */ - u_int32_t an_reason19; /* 0x14C */ - u_int32_t an_rx_mgmt_pkts; /* 0x150 */ - u_int32_t an_tx_mgmt_pkts; /* 0x154 */ - u_int32_t an_rx_refresh_pkts; /* 0x158 */ - u_int32_t an_tx_refresh_pkts; /* 0x15C */ - u_int32_t an_rx_poll_pkts; /* 0x160 */ - u_int32_t an_tx_poll_pkts; /* 0x164 */ - u_int32_t an_host_retries; /* 0x168 */ - u_int32_t an_lostsync_hostreq; /* 0x16C */ - u_int32_t an_host_tx_bytes; /* 0x170 */ - u_int32_t an_host_rx_bytes; /* 0x174 */ - u_int32_t an_uptime_usecs; /* 0x178 */ - u_int32_t an_uptime_secs; /* 0x17C */ - u_int32_t an_lostsync_better_ap; /* 0x180 */ - u_int32_t an_rsvd[15]; + uint32_t an_rx_overruns; /* 0x04 */ + uint32_t an_rx_plcp_csum_errs; /* 0x08 */ + uint32_t an_rx_plcp_format_errs; /* 0x0C */ + uint32_t an_rx_plcp_len_errs; /* 0x10 */ + uint32_t an_rx_mac_crc_errs; /* 0x14 */ + uint32_t an_rx_mac_crc_ok; /* 0x18 */ + uint32_t an_rx_wep_errs; /* 0x1C */ + uint32_t an_rx_wep_ok; /* 0x20 */ + uint32_t an_retry_long; /* 0x24 */ + uint32_t an_retry_short; /* 0x28 */ + uint32_t an_retry_max; /* 0x2C */ + uint32_t an_no_ack; /* 0x30 */ + uint32_t an_no_cts; /* 0x34 */ + uint32_t an_rx_ack_ok; /* 0x38 */ + uint32_t an_rx_cts_ok; /* 0x3C */ + uint32_t an_tx_ack_ok; /* 0x40 */ + uint32_t an_tx_rts_ok; /* 0x44 */ + uint32_t an_tx_cts_ok; /* 0x48 */ + uint32_t an_tx_lmac_mcasts; /* 0x4C */ + uint32_t an_tx_lmac_bcasts; /* 0x50 */ + uint32_t an_tx_lmac_ucast_frags; /* 0x54 */ + uint32_t an_tx_lmac_ucasts; /* 0x58 */ + uint32_t an_tx_beacons; /* 0x5C */ + uint32_t an_rx_beacons; /* 0x60 */ + uint32_t an_tx_single_cols; /* 0x64 */ + uint32_t an_tx_multi_cols; /* 0x68 */ + uint32_t an_tx_defers_no; /* 0x6C */ + uint32_t an_tx_defers_prot; /* 0x70 */ + uint32_t an_tx_defers_energy; /* 0x74 */ + uint32_t an_rx_dups; /* 0x78 */ + uint32_t an_rx_partial; /* 0x7C */ + uint32_t an_tx_too_old; /* 0x80 */ + uint32_t an_rx_too_old; /* 0x84 */ + uint32_t an_lostsync_max_retries;/* 0x88 */ + uint32_t an_lostsync_missed_beacons;/* 0x8C */ + uint32_t an_lostsync_arl_exceeded;/*0x90 */ + uint32_t an_lostsync_deauthed; /* 0x94 */ + uint32_t an_lostsync_disassociated;/*0x98 */ + uint32_t an_lostsync_tsf_timing; /* 0x9C */ + uint32_t an_tx_host_mcasts; /* 0xA0 */ + uint32_t an_tx_host_bcasts; /* 0xA4 */ + uint32_t an_tx_host_ucasts; /* 0xA8 */ + uint32_t an_tx_host_failed; /* 0xAC */ + uint32_t an_rx_host_mcasts; /* 0xB0 */ + uint32_t an_rx_host_bcasts; /* 0xB4 */ + uint32_t an_rx_host_ucasts; /* 0xB8 */ + uint32_t an_rx_host_discarded; /* 0xBC */ + uint32_t an_tx_hmac_mcasts; /* 0xC0 */ + uint32_t an_tx_hmac_bcasts; /* 0xC4 */ + uint32_t an_tx_hmac_ucasts; /* 0xC8 */ + uint32_t an_tx_hmac_failed; /* 0xCC */ + uint32_t an_rx_hmac_mcasts; /* 0xD0 */ + uint32_t an_rx_hmac_bcasts; /* 0xD4 */ + uint32_t an_rx_hmac_ucasts; /* 0xD8 */ + uint32_t an_rx_hmac_discarded; /* 0xDC */ + uint32_t an_tx_hmac_accepted; /* 0xE0 */ + uint32_t an_ssid_mismatches; /* 0xE4 */ + uint32_t an_ap_mismatches; /* 0xE8 */ + uint32_t an_rates_mismatches; /* 0xEC */ + uint32_t an_auth_rejects; /* 0xF0 */ + uint32_t an_auth_timeouts; /* 0xF4 */ + uint32_t an_assoc_rejects; /* 0xF8 */ + uint32_t an_assoc_timeouts; /* 0xFC */ + uint32_t an_reason_outside_table;/* 0x100 */ + uint32_t an_reason1; /* 0x104 */ + uint32_t an_reason2; /* 0x108 */ + uint32_t an_reason3; /* 0x10C */ + uint32_t an_reason4; /* 0x110 */ + uint32_t an_reason5; /* 0x114 */ + uint32_t an_reason6; /* 0x118 */ + uint32_t an_reason7; /* 0x11C */ + uint32_t an_reason8; /* 0x120 */ + uint32_t an_reason9; /* 0x124 */ + uint32_t an_reason10; /* 0x128 */ + uint32_t an_reason11; /* 0x12C */ + uint32_t an_reason12; /* 0x130 */ + uint32_t an_reason13; /* 0x134 */ + uint32_t an_reason14; /* 0x138 */ + uint32_t an_reason15; /* 0x13C */ + uint32_t an_reason16; /* 0x140 */ + uint32_t an_reason17; /* 0x144 */ + uint32_t an_reason18; /* 0x148 */ + uint32_t an_reason19; /* 0x14C */ + uint32_t an_rx_mgmt_pkts; /* 0x150 */ + uint32_t an_tx_mgmt_pkts; /* 0x154 */ + uint32_t an_rx_refresh_pkts; /* 0x158 */ + uint32_t an_tx_refresh_pkts; /* 0x15C */ + uint32_t an_rx_poll_pkts; /* 0x160 */ + uint32_t an_tx_poll_pkts; /* 0x164 */ + uint32_t an_host_retries; /* 0x168 */ + uint32_t an_lostsync_hostreq; /* 0x16C */ + uint32_t an_host_tx_bytes; /* 0x170 */ + uint32_t an_host_rx_bytes; /* 0x174 */ + uint32_t an_uptime_usecs; /* 0x178 */ + uint32_t an_uptime_secs; /* 0x17C */ + uint32_t an_lostsync_better_ap; /* 0x180 */ + uint32_t an_rsvd[15]; }; /* @@ -620,7 +620,7 @@ * Receive frame structure. */ struct an_rxframe { - u_int32_t an_rx_time; /* 0x00 */ + uint32_t an_rx_time; /* 0x00 */ u_int16_t an_rx_status; /* 0x04 */ u_int16_t an_rx_payload_len; /* 0x06 */ u_int8_t an_rsvd0; /* 0x08 */ diff --git a/src/include.new/dev/an/if_anreg.h b/src/include.new/dev/an/if_anreg.h index 06e0ee0..b9c6370 100644 --- a/src/include.new/dev/an/if_anreg.h +++ b/src/include.new/dev/an/if_anreg.h @@ -323,7 +323,7 @@ * Transmit frame structure. */ struct an_txframe { - u_int32_t an_tx_sw; /* 0x00 */ + uint32_t an_tx_sw; /* 0x00 */ u_int16_t an_tx_status; /* 0x04 */ u_int16_t an_tx_payload_len; /* 0x06 */ u_int16_t an_tx_ctl; /* 0x08 */ @@ -417,7 +417,7 @@ }; struct an_dma_alloc { - u_int32_t an_dma_paddr; + uint32_t an_dma_paddr; caddr_t an_dma_vaddr; bus_dmamap_t an_dma_map; bus_dma_segment_t an_dma_seg; diff --git a/src/include.new/dev/ciss/cissio.h b/src/include.new/dev/ciss/cissio.h index abd50b8..66c7535 100644 --- a/src/include.new/dev/ciss/cissio.h +++ b/src/include.new/dev/ciss/cissio.h @@ -43,26 +43,26 @@ { u_int8_t bus; u_int8_t dev_fn; - u_int32_t board_id; + uint32_t board_id; } cciss_pci_info_struct; typedef struct { - u_int32_t delay; - u_int32_t count; + uint32_t delay; + uint32_t count; } cciss_coalint_struct; typedef char NodeName_type[16]; -typedef u_int32_t Heartbeat_type; +typedef uint32_t Heartbeat_type; #define CISS_PARSCSIU2 0x0001 #define CISS_PARCSCIU3 0x0002 #define CISS_FIBRE1G 0x0100 #define CISS_FIBRE2G 0x0200 -typedef u_int32_t BusTypes_type; +typedef uint32_t BusTypes_type; typedef char FirmwareVer_type[4]; -typedef u_int32_t DriverVer_type; +typedef uint32_t DriverVer_type; /* passthrough command definitions */ #define SENSEINFOBYTES 32 @@ -123,15 +123,15 @@ } SCSI3Addr_struct; typedef struct { - u_int32_t TargetId:24; - u_int32_t Bus:6; - u_int32_t Mode:2; + uint32_t TargetId:24; + uint32_t Bus:6; + uint32_t Mode:2; SCSI3Addr_struct Target[2]; } __packed PhysDevAddr_struct; typedef struct { - u_int32_t VolId:30; - u_int32_t Mode:2; + uint32_t VolId:30; + uint32_t Mode:2; u_int8_t reserved[4]; } __packed LogDevAddr_struct; @@ -157,13 +157,13 @@ struct { u_int8_t Reserved[3]; u_int8_t Type; - u_int32_t ErrorInfo; + uint32_t ErrorInfo; } __packed Common_Info; struct { u_int8_t Reserved[2]; u_int8_t offense_size; u_int8_t offense_num; - u_int32_t offense_value; + uint32_t offense_value; } __packed Invalid_Cmd; } __packed MoreErrInfo_struct; @@ -171,7 +171,7 @@ u_int8_t ScsiStatus; u_int8_t SenseLen; u_int16_t CommandStatus; - u_int32_t ResidualCnt; + uint32_t ResidualCnt; MoreErrInfo_struct MoreErrInfo; u_int8_t SenseInfo[SENSEINFOBYTES]; } __packed ErrorInfo_struct; @@ -190,7 +190,7 @@ RequestBlock_struct Request; /* 20 */ ErrorInfo_struct error_info; /* 48 */ u_int16_t buf_size; /* 2 */ - u_int32_t buf; /* 4 */ + uint32_t buf; /* 4 */ } __packed IOCTL_Command_struct32; #endif diff --git a/src/include.new/dev/ciss/cissreg.h b/src/include.new/dev/ciss/cissreg.h index 406b853..ff6c31b 100644 --- a/src/include.new/dev/ciss/cissreg.h +++ b/src/include.new/dev/ciss/cissreg.h @@ -37,22 +37,22 @@ { struct /* MODE_PERIPHERAL and MODE_MASK_PERIPHERAL */ { - u_int32_t target:24; /* SCSI target */ - u_int32_t bus:6; /* SCSI bus */ - u_int32_t mode:2; /* CISS_HDR_ADDRESS_MODE_* */ - u_int32_t extra_address; /* SCSI-3 level-2 and level-3 address bytes */ + uint32_t target:24; /* SCSI target */ + uint32_t bus:6; /* SCSI bus */ + uint32_t mode:2; /* CISS_HDR_ADDRESS_MODE_* */ + uint32_t extra_address; /* SCSI-3 level-2 and level-3 address bytes */ } physical; struct /* MODE_LOGICAL */ { - u_int32_t lun:30; /* logical device ID */ - u_int32_t mode:2; /* CISS_HDR_ADDRESS_MODE_LOGICAL */ - u_int32_t :32; /* reserved */ + uint32_t lun:30; /* logical device ID */ + uint32_t mode:2; /* CISS_HDR_ADDRESS_MODE_LOGICAL */ + uint32_t :32; /* reserved */ } logical; struct { - u_int32_t :30; - u_int32_t mode:2; - u_int32_t :32; + uint32_t :30; + uint32_t mode:2; + uint32_t :32; } mode; }; #define CISS_HDR_ADDRESS_MODE_PERIPHERAL 0x0 @@ -71,9 +71,9 @@ u_int8_t :8; /* reserved */ u_int8_t sg_in_list; /* SG's in the command structure */ u_int16_t sg_total; /* total count of SGs for this command */ - u_int32_t host_tag; /* host identifier, bits 0&1 must be clear */ + uint32_t host_tag; /* host identifier, bits 0&1 must be clear */ #define CISS_HDR_HOST_TAG_ERROR (1<<1) - u_int32_t host_tag_zeroes; /* tag is 64 bits, but interface only supports 32 */ + uint32_t host_tag_zeroes; /* tag is 64 bits, but interface only supports 32 */ union ciss_device_address address; } __packed; @@ -101,7 +101,7 @@ struct ciss_error_info_pointer { u_int64_t error_info_address; /* points to ciss_error_info structure */ - u_int32_t error_info_length; + uint32_t error_info_length; } __packed; struct ciss_error_info @@ -132,18 +132,18 @@ #define CISS_CMD_STATUS_UNSOLICITED_ABORT 10 #define CISS_CMD_STATUS_TIMEOUT 11 #define CISS_CMD_STATUS_UNABORTABLE 12 - u_int32_t residual_count; + uint32_t residual_count; union { struct { u_int8_t res1[3]; u_int8_t type; - u_int32_t error_info; + uint32_t error_info; } __packed common_info; struct { u_int8_t res1[2]; u_int8_t offense_size; u_int8_t offense_offset; - u_int32_t offense_value; + uint32_t offense_value; } __packed invalid_command; } additional_error_info; u_int8_t sense_info[0]; @@ -153,9 +153,9 @@ { u_int64_t address; #define CISS_SG_ADDRESS_BITBUCKET (~(u_int64_t)0) - u_int32_t length; - u_int32_t :31; - u_int32_t extension:1; /* address points to another s/g chain */ + uint32_t length; + uint32_t :31; + uint32_t extension:1; /* address points to another s/g chain */ } __packed; struct ciss_command @@ -171,8 +171,8 @@ struct ciss_lun_report { - u_int32_t list_size; /* big-endian */ - u_int32_t :32; + uint32_t list_size; /* big-endian */ + uint32_t :32; union ciss_device_address lun[0]; } __packed; @@ -195,7 +195,7 @@ { u_int8_t opcode; u_int8_t reserved[5]; - u_int32_t length; /* big-endian */ + uint32_t length; /* big-endian */ u_int8_t :8; u_int8_t control; } __packed; @@ -230,7 +230,7 @@ u_int8_t opcode; u_int8_t type; u_int16_t :16; - u_int32_t abort_tag; /* XXX endianness? */ + uint32_t abort_tag; /* XXX endianness? */ u_int8_t reserved[8]; } __packed; @@ -259,7 +259,7 @@ u_int8_t seek_to_oldest:1; /* reset read counter to oldest event */ u_int8_t new_only:1; /* ignore any queued events */ u_int8_t :4; - u_int32_t length; /* must be 512, little-endian */ + uint32_t length; /* must be 512, little-endian */ #define CISS_NOTIFY_DATA_SIZE 512 u_int8_t control; } __packed; @@ -346,7 +346,7 @@ struct ciss_notify_io_error { u_int16_t logical_drive; - u_int32_t lba; + uint32_t lba; u_int16_t block_count; u_int8_t command; u_int8_t failure_bus; @@ -361,7 +361,7 @@ struct ciss_notify { - u_int32_t timestamp; /* seconds since controller power-on */ + uint32_t timestamp; /* seconds since controller power-on */ u_int16_t class; u_int16_t subclass; u_int16_t detail; @@ -377,10 +377,10 @@ u_int8_t data[64]; } data; char message[80]; - u_int32_t tag; + uint32_t tag; u_int16_t date; u_int16_t year; - u_int32_t time; + uint32_t time; u_int16_t pre_power_up_time; union ciss_device_address device; /* XXX pads to 512 bytes */ @@ -395,26 +395,26 @@ struct ciss_config_table { char signature[4]; /* "CISS" */ - u_int32_t valence; - u_int32_t supported_methods; + uint32_t valence; + uint32_t supported_methods; #define CISS_TRANSPORT_METHOD_READY (1<<0) #define CISS_TRANSPORT_METHOD_SIMPLE (1<<1) #define CISS_TRANSPORT_METHOD_PERF (1<<2) - u_int32_t active_method; - u_int32_t requested_method; - u_int32_t command_physlimit; - u_int32_t interrupt_coalesce_delay; - u_int32_t interrupt_coalesce_count; - u_int32_t max_outstanding_commands; - u_int32_t bus_types; + uint32_t active_method; + uint32_t requested_method; + uint32_t command_physlimit; + uint32_t interrupt_coalesce_delay; + uint32_t interrupt_coalesce_count; + uint32_t max_outstanding_commands; + uint32_t bus_types; #define CISS_TRANSPORT_BUS_TYPE_ULTRA2 (1<<0) #define CISS_TRANSPORT_BUS_TYPE_ULTRA3 (1<<1) #define CISS_TRANSPORT_BUS_TYPE_FIBRE1 (1<<8) #define CISS_TRANSPORT_BUS_TYPE_FIBRE2 (1<<9) - u_int32_t transport_offset; + uint32_t transport_offset; char server_name[16]; - u_int32_t heartbeat; - u_int32_t host_driver; + uint32_t heartbeat; + uint32_t host_driver; #define CISS_DRIVER_SUPPORT_UNIT_ATTENTION (1<<0) #define CISS_DRIVER_QUICK_INIT (1<<1) #define CISS_DRIVER_INTERRUPT_ON_LOCKUP (1<<2) @@ -424,16 +424,16 @@ #define CISS_DRIVER_MESSAGE_REQUESTS_SUPPORTED (1<<7) #define CISS_DRIVER_DAUGHTER_ATTACHED (1<<8) #define CISS_DRIVER_SCSI_PREFETCH (1<<9) - u_int32_t max_sg_length; /* 31 in older firmware */ + uint32_t max_sg_length; /* 31 in older firmware */ /* * these fields appear in OpenCISS Spec 1.06 * http://cciss.sourceforge.net/#docs */ - u_int32_t max_logical_supported; - u_int32_t max_physical_supported; - u_int32_t max_physical_per_logical; - u_int32_t max_perfomant_mode_cmds; - u_int32_t max_block_fetch_count; + uint32_t max_logical_supported; + uint32_t max_physical_supported; + uint32_t max_physical_per_logical; + uint32_t max_perfomant_mode_cmds; + uint32_t max_block_fetch_count; } __packed; /* @@ -543,7 +543,7 @@ /* CISS_BMIC_ID_LDRIVE */ struct ciss_bmic_id_ldrive { u_int16_t block_size; - u_int32_t blocks_available; + uint32_t blocks_available; u_int8_t drive_parameter_table[16]; /* XXX define */ u_int8_t fault_tolerance; #define CISS_LDRIVE_RAID0 0 @@ -555,7 +555,7 @@ u_int8_t res1; u_int8_t bios_disable_flag; u_int8_t res2; - u_int32_t logical_drive_identifier; + uint32_t logical_drive_identifier; char logical_drive_label[64]; u_int64_t big_blocks_available; u_int8_t res3[410]; @@ -575,13 +575,13 @@ #define CISS_LSTATUS_EXPANDING 10 #define CISS_LSTATUS_BECOMING_READY 11 #define CISS_LSTATUS_QUEUED_FOR_EXPANSION 12 - u_int32_t deprecated_drive_failure_map; + uint32_t deprecated_drive_failure_map; u_int8_t res1[416]; - u_int32_t blocks_to_recover; + uint32_t blocks_to_recover; u_int8_t deprecated_drive_rebuilding; u_int16_t deprecated_remap_count[32]; - u_int32_t deprecated_replacement_map; - u_int32_t deprecated_active_spare_map; + uint32_t deprecated_replacement_map; + uint32_t deprecated_active_spare_map; u_int8_t spare_configured:1; u_int8_t spare_rebuilding:1; u_int8_t spare_rebuilt:1; @@ -590,7 +590,7 @@ u_int8_t spare_available:1; u_int8_t res2:2; u_int8_t deprecated_spare_to_replace_map[32]; - u_int32_t deprecated_replaced_marked_ok_map; + uint32_t deprecated_replaced_marked_ok_map; u_int8_t media_exchanged; u_int8_t cache_failure; u_int8_t expand_failure; @@ -611,16 +611,16 @@ /* CISS_BMIC_ID_CTLR */ struct ciss_bmic_id_table { u_int8_t configured_logical_drives; - u_int32_t config_signature; + uint32_t config_signature; char running_firmware_revision[4]; char stored_firmware_revision[4]; u_int8_t hardware_revision; u_int8_t boot_block_revision[4]; - u_int32_t deprecated_drive_present_map; - u_int32_t deprecated_external_drive_present_map; - u_int32_t board_id; + uint32_t deprecated_drive_present_map; + uint32_t deprecated_external_drive_present_map; + uint32_t board_id; u_int8_t swapped_error_cable; - u_int32_t deprecated_non_disk_map; + uint32_t deprecated_non_disk_map; u_int8_t bad_host_ram_addr; u_int8_t cpu_revision; u_int8_t res3[3]; @@ -653,8 +653,8 @@ #define EXPAND_DISABLE_RES7 0x40 #define EXPAND_DISABLE_REBUILD_RUNNING 0x80 u_int8_t scsi_chip_count; - u_int32_t maximum_blocks; - u_int32_t controller_clock; + uint32_t maximum_blocks; + uint32_t controller_clock; u_int8_t drives_per_scsi_bus; u_int8_t big_drive_present_map[CISS_BIG_MAP_ENTRIES / 8]; u_int8_t big_external_drive_present_map[CISS_BIG_MAP_ENTRIES / 8]; @@ -680,7 +680,7 @@ u_int8_t rec_rom_inact_rev[4]; /* Recovery ROM inactive f/w revision */ u_int8_t rec_rom_act_status; /* Recovery ROM flags */ u_int8_t pci_to_pci_status; /* PCI to PCI bridge status */ - u_int32_t redundant_server_info; /* Reserved for future use */ + uint32_t redundant_server_info; /* Reserved for future use */ u_int8_t percent_write_cache; /* Percent of memory allocated to write cache */ u_int16_t daughterboard_size_mb; /* Total size (MB) of cache board */ u_int8_t cache_batter_count; /* Number of cache batteries */ @@ -705,21 +705,21 @@ u_int16_t usOffsetToENDbitmap; /* Offset to extended non-disk map */ u_int8_t bInternalPortStatus[8]; /* Internal port status bytes */ u_int8_t bExternalPortStatus[8]; /* External port status bytes */ - u_int32_t uiYetMoreControllerFlags;/* Yet More Controller flags */ + uint32_t uiYetMoreControllerFlags;/* Yet More Controller flags */ #define YMORE_CONTROLLER_FLAGS_JBOD_SUPPORTED \ ( 1 << 25 ) /* Controller has JBOD support */ u_int8_t bLastLockup; /* Last lockup code */ u_int8_t bSlot; /* PCI slot according to option ROM*/ u_int16_t usBuildNum; /* Build number */ - u_int32_t uiMaxSafeFullStripeSize; /* Maximum safe full stripe size */ - u_int32_t uiTotalLength; /* Total structure length */ + uint32_t uiMaxSafeFullStripeSize; /* Maximum safe full stripe size */ + uint32_t uiTotalLength; /* Total structure length */ u_int8_t bVendorID[8]; /* Vendor ID */ u_int8_t bProductID[16]; /* Product ID */ /* * These are even more obscure as they seem to only be available in cciss_vol_status */ - u_int32_t ExtendedLastLockupCode; + uint32_t ExtendedLastLockupCode; u_int16_t MaxRaid; u_int16_t MaxParity; u_int16_t MaxADGStripSize; @@ -729,9 +729,9 @@ #define PWR_UP_FLAG_JBOD_ENABLED 0x08 /*JBOD mode is enabled, all RAID features off */ u_int16_t ZonedOffset; - u_int32_t FixedFieldsLength; + uint32_t FixedFieldsLength; u_int8_t FWCompileTimeStamp[24]; - u_int32_t EvenMoreControllerFlags; + uint32_t EvenMoreControllerFlags; u_int8_t padding[240]; } __packed; @@ -740,8 +740,8 @@ u_int8_t scsi_bus; u_int8_t scsi_id; u_int16_t block_size; - u_int32_t total_blocks; - u_int32_t reserved_blocks; + uint32_t total_blocks; + uint32_t reserved_blocks; char model[40]; char serial[40]; char revision[8]; @@ -779,8 +779,8 @@ /* CISS_BMIC_BLINK_PDRIVE */ /* CISS_BMIC_SENSE_BLINK_PDRIVE */ struct ciss_bmic_blink_pdrive { - u_int32_t blink_duration; /* 10ths of a second */ - u_int32_t duration_elapsed; /* only for sense command */ + uint32_t blink_duration; /* 10ths of a second */ + uint32_t duration_elapsed; /* only for sense command */ u_int8_t blinktab[256]; #define CISS_BMIC_BLINK_ALL 1 #define CISS_BMIC_BLINK_TIMED 2 @@ -815,7 +815,7 @@ #define CISS_TL_SIMPLE_IPQ 0x40 /* inbound post queue */ #define CISS_TL_SIMPLE_OPQ 0x44 /* outbound post queue */ -#define CISS_TL_SIMPLE_OPQ_EMPTY (~(u_int32_t)0) +#define CISS_TL_SIMPLE_OPQ_EMPTY (~(uint32_t)0) #define CISS_TL_SIMPLE_OSR 0x9c /* outbound status register */ #define CISS_TL_SIMPLE_ODC 0xa0 /* outbound doorbell clear register */ diff --git a/src/include.new/dev/ciss/cissvar.h b/src/include.new/dev/ciss/cissvar.h index 99c8b3c..960fb14 100644 --- a/src/include.new/dev/ciss/cissvar.h +++ b/src/include.new/dev/ciss/cissvar.h @@ -104,7 +104,7 @@ struct ciss_softc *cr_sc; /* controller softc */ void *cr_data; /* data buffer */ - u_int32_t cr_length; /* data length */ + uint32_t cr_length; /* data length */ bus_dmamap_t cr_datamap; /* DMA map for data */ struct ciss_command *cr_cc; uint32_t cr_ccphys; @@ -204,7 +204,7 @@ struct ciss_config_table *ciss_cfg; /* config table in adapter memory */ struct ciss_perf_config *ciss_perf; /* config table for the performant */ struct ciss_bmic_id_table *ciss_id; /* ID table in host memory */ - u_int32_t ciss_heartbeat; /* last heartbeat value */ + uint32_t ciss_heartbeat; /* last heartbeat value */ int ciss_heart_attack; /* number of times we have seen this value */ int ciss_msi; @@ -215,7 +215,7 @@ bus_dma_tag_t ciss_parent_dmat; /* parent DMA tag */ bus_dma_tag_t ciss_buffer_dmat; /* data buffer/command DMA tag */ - u_int32_t ciss_interrupt_mask; /* controller interrupt mask bits */ + uint32_t ciss_interrupt_mask; /* controller interrupt mask bits */ uint64_t *ciss_reply; int ciss_cycle; @@ -229,7 +229,7 @@ void *ciss_command; /* command structures */ bus_dma_tag_t ciss_command_dmat; /* command DMA tag */ bus_dmamap_t ciss_command_map; /* command DMA map */ - u_int32_t ciss_command_phys; /* command array base address */ + uint32_t ciss_command_phys; /* command array base address */ cr_qhead_t ciss_free; /* requests available for reuse */ cr_qhead_t ciss_notify; /* requests which are defered for processing */ struct proc *ciss_notify_thread; diff --git a/src/include.new/dev/lmc/if_lmc.h b/src/include.new/dev/lmc/if_lmc.h index c11d5b8..6624dcc 100644 --- a/src/include.new/dev/lmc/if_lmc.h +++ b/src/include.new/dev/lmc/if_lmc.h @@ -632,11 +632,11 @@ struct iohdr /* all LMCIOCs begin with this */ { char ifname[IFNAMSIZ]; /* interface name, e.g. "lmc0" */ - u_int32_t cookie; /* interface version number */ + uint32_t cookie; /* interface version number */ u_int16_t direction; /* missing in Linux IOCTL */ u_int16_t length; /* missing in Linux IOCTL */ struct iohdr *iohdr; /* missing in Linux IOCTL */ - u_int32_t spare; /* pad this struct to **32 bytes** */ + uint32_t spare; /* pad this struct to **32 bytes** */ }; #define DIR_IO 0 @@ -732,27 +732,27 @@ u_int64_t obytes; /* Tx bytes */ u_int64_t ipackets; /* Rx packets with good status */ u_int64_t opackets; /* Tx packets */ - u_int32_t ierrors; /* Rx packets with bad status */ - u_int32_t oerrors; /* Tx packets with bad status */ - u_int32_t idiscards; /* Rx packets discarded */ - u_int32_t odiscards; /* Tx packets discarded */ - u_int32_t fifo_over; /* Rx fifo overruns */ - u_int32_t fifo_under; /* Tx fifo underruns */ - u_int32_t missed; /* Rx pkts missed: no DMA descs */ - u_int32_t overruns; /* Rx pkts missed: fifo overrun */ - u_int32_t fdl_pkts; /* Rx T1 Facility Data Link pkts */ - u_int32_t crc_errs; /* Rx T1 frame CRC errors */ - u_int32_t lcv_errs; /* Rx T1 T3 Line Coding Violation */ - u_int32_t frm_errs; /* Rx T1 T3 Frame bit errors */ - u_int32_t febe_errs; /* Rx T1 T3 Far End Bit Errors */ - u_int32_t par_errs; /* Rx T3 P-bit parity errors */ - u_int32_t cpar_errs; /* Rx T3 C-bit parity errors */ - u_int32_t mfrm_errs; /* Rx T3 Multi-frame bit errors */ - u_int32_t rxdma; /* Rx out of kernel buffers */ - u_int32_t txdma; /* Tx out of DMA desciptors */ - u_int32_t lck_watch; /* try_lock conflict in watchdog */ - u_int32_t lck_ioctl; /* try_lock conflict in ioctl */ - u_int32_t lck_intr; /* try_lock conflict in interrupt */ + uint32_t ierrors; /* Rx packets with bad status */ + uint32_t oerrors; /* Tx packets with bad status */ + uint32_t idiscards; /* Rx packets discarded */ + uint32_t odiscards; /* Tx packets discarded */ + uint32_t fifo_over; /* Rx fifo overruns */ + uint32_t fifo_under; /* Tx fifo underruns */ + uint32_t missed; /* Rx pkts missed: no DMA descs */ + uint32_t overruns; /* Rx pkts missed: fifo overrun */ + uint32_t fdl_pkts; /* Rx T1 Facility Data Link pkts */ + uint32_t crc_errs; /* Rx T1 frame CRC errors */ + uint32_t lcv_errs; /* Rx T1 T3 Line Coding Violation */ + uint32_t frm_errs; /* Rx T1 T3 Frame bit errors */ + uint32_t febe_errs; /* Rx T1 T3 Far End Bit Errors */ + uint32_t par_errs; /* Rx T3 P-bit parity errors */ + uint32_t cpar_errs; /* Rx T3 C-bit parity errors */ + uint32_t mfrm_errs; /* Rx T3 Multi-frame bit errors */ + uint32_t rxdma; /* Rx out of kernel buffers */ + uint32_t txdma; /* Tx out of DMA desciptors */ + uint32_t lck_watch; /* try_lock conflict in watchdog */ + uint32_t lck_ioctl; /* try_lock conflict in ioctl */ + uint32_t lck_intr; /* try_lock conflict in interrupt */ }; /* sc->status is the READ ONLY status of the card. */ @@ -760,14 +760,14 @@ struct status { struct iohdr iohdr; /* common ioctl header */ - u_int32_t card_type; /* PCI device number */ + uint32_t card_type; /* PCI device number */ u_int16_t ieee[3]; /* IEEE MAC-addr from Tulip SROM */ u_int16_t oper_status; /* actual state: up, down, test */ - u_int32_t tx_speed; /* measured TX bits/sec */ - u_int32_t cable_type; /* SSI only: cable type */ - u_int32_t line_pkg; /* actual line pkg in use */ - u_int32_t line_prot; /* actual line proto in use */ - u_int32_t ticks; /* incremented by watchdog @ 1 Hz */ + uint32_t tx_speed; /* measured TX bits/sec */ + uint32_t cable_type; /* SSI only: cable type */ + uint32_t line_pkg; /* actual line pkg in use */ + uint32_t line_prot; /* actual line proto in use */ + uint32_t ticks; /* incremented by watchdog @ 1 Hz */ struct event_cntrs cntrs; /* event counters */ union { @@ -817,22 +817,22 @@ struct config { struct iohdr iohdr; /* common ioctl header */ - u_int32_t crc_len; /* ALL: CRC-16 or CRC-32 or none */ - u_int32_t loop_back; /* ALL: many kinds of loopbacks */ - u_int32_t tx_clk_src; /* T1, HSSI: ST, RT, int, ext */ - u_int32_t format; /* T3, T1: ckt framing format */ - u_int32_t time_slots; /* T1: 64Kb time slot config */ - u_int32_t cable_len; /* T3, T1: cable length in meters */ - u_int32_t scrambler; /* T3: payload scrambler config */ - u_int32_t dte_dce; /* SSI, HSSIc: drive TXCLK */ + uint32_t crc_len; /* ALL: CRC-16 or CRC-32 or none */ + uint32_t loop_back; /* ALL: many kinds of loopbacks */ + uint32_t tx_clk_src; /* T1, HSSI: ST, RT, int, ext */ + uint32_t format; /* T3, T1: ckt framing format */ + uint32_t time_slots; /* T1: 64Kb time slot config */ + uint32_t cable_len; /* T3, T1: cable length in meters */ + uint32_t scrambler; /* T3: payload scrambler config */ + uint32_t dte_dce; /* SSI, HSSIc: drive TXCLK */ struct synth synth; /* SSI, HSSIc: synth oscil params */ - u_int32_t rx_gain; /* T1: receiver gain limit 0-50 dB */ - u_int32_t tx_pulse; /* T1: transmitter pulse shape */ - u_int32_t tx_lbo; /* T1: transmitter atten 0-22.5 dB */ - u_int32_t debug; /* ALL: extra printout */ - u_int32_t line_pkg; /* ALL: use this line pkg */ - u_int32_t line_prot; /* SPPP: use this line proto */ - u_int32_t keep_alive; /* SPPP: use keep-alive packets */ + uint32_t rx_gain; /* T1: receiver gain limit 0-50 dB */ + uint32_t tx_pulse; /* T1: transmitter pulse shape */ + uint32_t tx_lbo; /* T1: transmitter atten 0-22.5 dB */ + uint32_t debug; /* ALL: extra printout */ + uint32_t line_pkg; /* ALL: use this line pkg */ + uint32_t line_prot; /* SPPP: use this line proto */ + uint32_t keep_alive; /* SPPP: use keep-alive packets */ }; #define CFG_CRC_0 0 /* no CRC */ @@ -910,9 +910,9 @@ struct ioctl { struct iohdr iohdr; /* common ioctl header */ - u_int32_t cmd; /* command */ - u_int32_t address; /* command address */ - u_int32_t data; /* command data */ + uint32_t cmd; /* command */ + uint32_t address; /* command address */ + uint32_t data; /* command data */ char *ucode; /* user-land address of ucode */ }; @@ -972,7 +972,7 @@ /* Tulip DMA descriptor; THIS STRUCT MUST MATCH THE HARDWARE */ struct dma_desc { - u_int32_t status; /* hardware->to->software */ + uint32_t status; /* hardware->to->software */ #if (BYTE_ORDER == LITTLE_ENDIAN) /* left-to-right packing by compiler */ unsigned length1:11; /* buffer1 length */ unsigned length2:11; /* buffer2 length */ @@ -982,8 +982,8 @@ unsigned length2:11; /* buffer2 length */ unsigned length1:11; /* buffer1 length */ #endif - u_int32_t address1; /* buffer1 bus address */ - u_int32_t address2; /* buffer2 bus address */ + uint32_t address1; /* buffer1 bus address */ + uint32_t address2; /* buffer2 bus address */ #if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)) bus_dmamap_t map; /* bus dmamap for this descriptor */ # define TLP_BUS_DSL_VAL (sizeof(bus_dmamap_t) & TLP_BUS_DSL) @@ -1026,7 +1026,7 @@ struct dma_desc *first; /* first descriptor in ring */ struct dma_desc *last; /* last descriptor in ring */ struct dma_desc *temp; /* temporary write pointer for tx */ - u_int32_t dma_addr; /* bus address for desc array */ + uint32_t dma_addr; /* bus address for desc array */ int size_descs; /* bus_dmamap_sync needs this */ int num_descs; /* used to set rx quota */ #ifdef __linux__ @@ -1107,7 +1107,7 @@ struct atshutdown ats; /* shutdown hook */ pci_devaddr_t cfgbase; /* base address of PCI config regs */ u_int16_t csr_iobase; /* io base address of Tulip CSRs */ - u_int32_t *csr_membase; /* kv mem base address of Tulip CSRs */ + uint32_t *csr_membase; /* kv mem base address of Tulip CSRs */ struct simplelock top_lock; /* lock card->watchdog vs core_ioctl */ struct simplelock bottom_lock;/* lock for buf queues & descriptor rings */ struct mbuf *tx_mbuf; /* hang mbuf here while building dma descs */ @@ -1179,7 +1179,7 @@ struct pci_dev *pci_dev; /* READ/WRITE_PCI_CFG macros need this */ struct net_device *net_dev; /* NAME_UNIT macro needs this */ struct timer_list wd_timer; /* timer calls watchdog() once a second */ - u_int32_t csr_iobase; /* io base address of Tulip CSRs */ + uint32_t csr_iobase; /* io base address of Tulip CSRs */ void *csr_membase; /* kv mem base address of Tulip CSRs */ struct sk_buff *tx_skb; /* hang skb here while building dma descs */ int quota; /* used for incoming packet flow control */ @@ -1192,16 +1192,16 @@ struct status status; /* driver status lmcconfig can read */ struct config config; /* driver config lmcconfig can read/write */ struct card *card; /* card methods: config, ioctl, watchdog */ - u_int32_t gpio_dir; /* s/w copy of GPIO direction register */ + uint32_t gpio_dir; /* s/w copy of GPIO direction register */ u_int16_t led_state; /* last value written to mii16 */ - u_int32_t flags; /* driver-global flags */ + uint32_t flags; /* driver-global flags */ /* Top-half state used by card-specific watchdogs; lock with top_lock. */ - u_int32_t last_mii16; /* SSI, HSSI: MII reg 16 one second ago */ - u_int32_t last_stat16; /* T3: framer reg 16 one second ago */ - u_int32_t last_alm1; /* T1E1: framer reg 47 one second ago */ - u_int32_t last_FEAC; /* last FEAC msg code received */ - u_int32_t loop_timer; /* seconds until loopback expires */ + uint32_t last_mii16; /* SSI, HSSI: MII reg 16 one second ago */ + uint32_t last_stat16; /* T3: framer reg 16 one second ago */ + uint32_t last_alm1; /* T1E1: framer reg 47 one second ago */ + uint32_t last_FEAC; /* last FEAC msg code received */ + uint32_t loop_timer; /* seconds until loopback expires */ /* Bottom-half state used by the interrupt code; lock with bottom_lock. */ struct desc_ring txring; /* tx descriptor ring state */ @@ -1373,10 +1373,10 @@ #endif /* __bsdi__ */ #ifdef __linux__ -static u_int32_t /* inline? so rare it doesn't matter */ -READ_PCI_CFG(softc_t *sc, u_int32_t addr) +static uint32_t /* inline? so rare it doesn't matter */ +READ_PCI_CFG(softc_t *sc, uint32_t addr) { - u_int32_t data; + uint32_t data; pci_read_config_dword(sc->pci_dev, addr, &data); return data; } @@ -1468,16 +1468,16 @@ /* procedure prototypes */ -static void shift_srom_bits(softc_t *, u_int32_t, u_int32_t); +static void shift_srom_bits(softc_t *, uint32_t, uint32_t); static u_int16_t read_srom(softc_t *, u_int8_t); static void write_srom(softc_t *, u_int8_t, u_int16_t); -static u_int8_t read_bios(softc_t *, u_int32_t); -static void write_bios_phys(softc_t *, u_int32_t, u_int8_t); -static void write_bios(softc_t *, u_int32_t, u_int8_t); +static u_int8_t read_bios(softc_t *, uint32_t); +static void write_bios_phys(softc_t *, uint32_t, u_int8_t); +static void write_bios(softc_t *, uint32_t, u_int8_t); static void erase_bios(softc_t *); -static void shift_mii_bits(softc_t *, u_int32_t, u_int32_t); +static void shift_mii_bits(softc_t *, uint32_t, uint32_t); static u_int16_t read_mii(softc_t *, u_int8_t); static void write_mii(softc_t *, u_int8_t, u_int16_t); @@ -1493,17 +1493,17 @@ static void write_framer(softc_t *, u_int16_t, u_int8_t); static u_int8_t read_framer(softc_t *, u_int16_t); -static void make_gpio_input(softc_t *, u_int32_t); -static void make_gpio_output(softc_t *, u_int32_t); -static u_int32_t read_gpio(softc_t *); -static void set_gpio_bits(softc_t *, u_int32_t); -static void clr_gpio_bits(softc_t *, u_int32_t); +static void make_gpio_input(softc_t *, uint32_t); +static void make_gpio_output(softc_t *, uint32_t); +static uint32_t read_gpio(softc_t *); +static void set_gpio_bits(softc_t *, uint32_t); +static void clr_gpio_bits(softc_t *, uint32_t); static void reset_xilinx(softc_t *); static void load_xilinx_from_rom(softc_t *); -static int load_xilinx_from_file(softc_t *, char *, u_int32_t); +static int load_xilinx_from_file(softc_t *, char *, uint32_t); -static void shift_synth_bits(softc_t *, u_int32_t, u_int32_t); +static void shift_synth_bits(softc_t *, uint32_t, uint32_t); static void write_synth(softc_t *, struct synth *); static void write_dac(softc_t *, u_int16_t); diff --git a/src/include.new/dev/mfi/mfi_ioctl.h b/src/include.new/dev/mfi/mfi_ioctl.h index 8f6eafb..87dcf16 100644 --- a/src/include.new/dev/mfi/mfi_ioctl.h +++ b/src/include.new/dev/mfi/mfi_ioctl.h @@ -30,7 +30,7 @@ #include struct iovec32 { - u_int32_t iov_base; + uint32_t iov_base; int iov_len; }; diff --git a/src/include.new/dev/mfi/mfivar.h b/src/include.new/dev/mfi/mfivar.h index 70d62a1..ed40243 100644 --- a/src/include.new/dev/mfi/mfivar.h +++ b/src/include.new/dev/mfi/mfivar.h @@ -453,7 +453,7 @@ extern void mfi_handle_map_sync(void *context, int pending); extern int mfi_dcmd_command(struct mfi_softc *, struct mfi_command **, uint32_t, void **, size_t); -extern int mfi_build_cdb(int, uint8_t, u_int64_t, u_int32_t, uint8_t *); +extern int mfi_build_cdb(int, uint8_t, u_int64_t, uint32_t, uint8_t *); #define MFIQ_ADD(sc, qname) \ do { \ diff --git a/src/include.new/dev/ofw/ofw_pci.h b/src/include.new/dev/ofw/ofw_pci.h index 2008eb7..2308edc 100644 --- a/src/include.new/dev/ofw/ofw_pci.h +++ b/src/include.new/dev/ofw/ofw_pci.h @@ -93,11 +93,11 @@ * This has the 3 32bit cell values, plus 2 more to make up a 64-bit size. */ struct ofw_pci_register { - u_int32_t phys_hi; - u_int32_t phys_mid; - u_int32_t phys_lo; - u_int32_t size_hi; - u_int32_t size_lo; + uint32_t phys_hi; + uint32_t phys_mid; + uint32_t phys_lo; + uint32_t size_hi; + uint32_t size_lo; }; #endif /* _DEV_OFW_OFW_PCI_H_ */ diff --git a/src/include.new/dev/usb/ehcireg.h b/src/include.new/dev/usb/ehcireg.h index 202f9d9..ff5442f 100644 --- a/src/include.new/dev/usb/ehcireg.h +++ b/src/include.new/dev/usb/ehcireg.h @@ -186,7 +186,7 @@ #define EHCI_PAGE_MASK(x) ((x) & 0xfff) #endif -typedef u_int32_t ehci_link_t; +typedef uint32_t ehci_link_t; #define EHCI_LINK_TERMINATE 0x00000001 #define EHCI_LINK_TYPE(x) ((x) & 0x00000006) #define EHCI_LINK_ITD 0x0 @@ -195,7 +195,7 @@ #define EHCI_LINK_FSTN 0x6 #define EHCI_LINK_ADDR(x) ((x) &~ 0x1f) -typedef u_int32_t ehci_physaddr_t; +typedef uint32_t ehci_physaddr_t; /* Isochronous Transfer Descriptor */ typedef struct { @@ -216,7 +216,7 @@ typedef struct { ehci_link_t qtd_next; ehci_link_t qtd_altnext; - u_int32_t qtd_status; + uint32_t qtd_status; #define EHCI_QTD_GET_STATUS(x) (((x) >> 0) & 0xff) #define EHCI_QTD_SET_STATUS(x) ((x) << 0) #define EHCI_QTD_ACTIVE 0x80 @@ -252,7 +252,7 @@ /* Queue Head */ typedef struct { ehci_link_t qh_link; - u_int32_t qh_endp; + uint32_t qh_endp; #define EHCI_QH_GET_ADDR(x) (((x) >> 0) & 0x7f) /* endpoint addr */ #define EHCI_QH_SET_ADDR(x) (x) #define EHCI_QH_ADDRMASK 0x0000007f @@ -276,7 +276,7 @@ #define EHCI_QH_CTL 0x08000000 #define EHCI_QH_GET_NRL(x) (((x) >> 28) & 0x0f) /* NAK reload */ #define EHCI_QH_SET_NRL(x) ((x) << 28) - u_int32_t qh_endphub; + uint32_t qh_endphub; #define EHCI_QH_GET_SMASK(x) (((x) >> 0) & 0xff) /* intr sched mask */ #define EHCI_QH_SET_SMASK(x) ((x) << 0) #define EHCI_QH_GET_CMASK(x) (((x) >> 8) & 0xff) /* split completion mask */ diff --git a/src/include.new/dev/usb/ehcivar.h b/src/include.new/dev/usb/ehcivar.h index 42d0fbc..6fdd0f7 100644 --- a/src/include.new/dev/usb/ehcivar.h +++ b/src/include.new/dev/usb/ehcivar.h @@ -65,7 +65,7 @@ LIST_ENTRY(ehci_xfer) inext; /* list of active xfers */ ehci_soft_qtd_t *sqtdstart; ehci_soft_qtd_t *sqtdend; - u_int32_t ehci_xfer_flags; + uint32_t ehci_xfer_flags; #ifdef DIAGNOSTIC int isdone; #endif @@ -113,7 +113,7 @@ char sc_vendor[32]; /* vendor string for root hub */ int sc_id_vendor; /* vendor ID for root hub */ - u_int32_t sc_cmd; /* shadow of cmd reg during suspend */ + uint32_t sc_cmd; /* shadow of cmd reg during suspend */ #if defined(__NetBSD__) || defined(__OpenBSD__) void *sc_powerhook; /* cookie from power hook */ void *sc_shutdownhook; /* cookie from shutdown hook */ @@ -146,7 +146,7 @@ char sc_softwake; #endif /* USB_USE_SOFTINTR */ - u_int32_t sc_eintrs; + uint32_t sc_eintrs; ehci_soft_qh_t *sc_async_head; SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */ diff --git a/src/include.new/dev/usb/hid.h b/src/include.new/dev/usb/hid.h index 803560b..a8e9d28 100644 --- a/src/include.new/dev/usb/hid.h +++ b/src/include.new/dev/usb/hid.h @@ -43,9 +43,9 @@ }; struct hid_location { - u_int32_t size; - u_int32_t count; - u_int32_t pos; + uint32_t size; + uint32_t count; + uint32_t pos; }; struct hid_item { @@ -73,7 +73,7 @@ int32_t collection; int collevel; enum hid_kind kind; - u_int32_t flags; + uint32_t flags; /* Location */ struct hid_location loc; /* */ @@ -84,8 +84,8 @@ void hid_end_parse(struct hid_data *s); int hid_get_item(struct hid_data *s, struct hid_item *h); int hid_report_size(void *buf, int len, enum hid_kind k, u_int8_t *id); -int hid_locate(void *desc, int size, u_int32_t usage, +int hid_locate(void *desc, int size, uint32_t usage, enum hid_kind kind, struct hid_location *loc, - u_int32_t *flags); + uint32_t *flags); u_long hid_get_data(u_char *buf, struct hid_location *loc); -int hid_is_collection(void *desc, int size, u_int32_t usage); +int hid_is_collection(void *desc, int size, uint32_t usage); diff --git a/src/include.new/dev/usb/if_kuereg.h b/src/include.new/dev/usb/if_kuereg.h index d1824ae..14daa24 100644 --- a/src/include.new/dev/usb/if_kuereg.h +++ b/src/include.new/dev/usb/if_kuereg.h @@ -65,7 +65,7 @@ }; #define KUE_ETHERSTATS(x) \ - (*(u_int32_t *)&(x)->kue_desc.kue_etherstats) + (*(uint32_t *)&(x)->kue_desc.kue_etherstats) #define KUE_MAXSEG(x) \ (*(u_int16_t *)&(x)->kue_desc.kue_maxseg) #define KUE_MCFILTCNT(x) \ diff --git a/src/include.new/dev/usb/ohcireg.h b/src/include.new/dev/usb/ohcireg.h index 60d711c..60bf29d 100644 --- a/src/include.new/dev/usb/ohcireg.h +++ b/src/include.new/dev/usb/ohcireg.h @@ -132,12 +132,12 @@ #define OHCI_FSMPS(i) (((i-210)*6/7) << 16) #define OHCI_PERIODIC(i) ((i)*9/10) -typedef u_int32_t ohci_physaddr_t; +typedef uint32_t ohci_physaddr_t; #define OHCI_NO_INTRS 32 struct ohci_hcca { ohci_physaddr_t hcca_interrupt_table[OHCI_NO_INTRS]; - u_int32_t hcca_frame_number; + uint32_t hcca_frame_number; ohci_physaddr_t hcca_done_head; #define OHCI_DONE_INTRS 1 }; @@ -150,7 +150,7 @@ #define OHCI_PAGE_MASK(x) ((x) & 0xfff) typedef struct { - u_int32_t ed_flags; + uint32_t ed_flags; #define OHCI_ED_GET_FA(s) ((s) & 0x7f) #define OHCI_ED_ADDRMASK 0x0000007f #define OHCI_ED_SET_FA(s) (s) @@ -178,7 +178,7 @@ #define OHCI_ED_ALIGN 16 typedef struct { - u_int32_t td_flags; + uint32_t td_flags; #define OHCI_TD_R 0x00040000 /* Buffer Rounding */ #define OHCI_TD_DP_MASK 0x00180000 /* Direction / PID */ #define OHCI_TD_SETUP 0x00000000 @@ -204,7 +204,7 @@ #define OHCI_ITD_NOFFSET 8 typedef struct { - u_int32_t itd_flags; + uint32_t itd_flags; #define OHCI_ITD_GET_SF(x) ((x) & 0x0000ffff) #define OHCI_ITD_SET_SF(x) ((x) & 0xffff) #define OHCI_ITD_GET_DI(x) (((x) >> 21) & 7) /* Delay Interrupt */ diff --git a/src/include.new/dev/usb/ohcivar.h b/src/include.new/dev/usb/ohcivar.h index f3911e6..adcdaa7 100644 --- a/src/include.new/dev/usb/ohcivar.h +++ b/src/include.new/dev/usb/ohcivar.h @@ -103,7 +103,7 @@ ohci_soft_ed_t *sc_eds[OHCI_NO_EDS]; u_int sc_bws[OHCI_NO_INTRS]; - u_int32_t sc_eintrs; /* enabled interrupts */ + uint32_t sc_eintrs; /* enabled interrupts */ ohci_soft_ed_t *sc_isoc_head; ohci_soft_ed_t *sc_ctrl_head; @@ -138,8 +138,8 @@ void *sc_powerhook; /* cookie from power hook */ void *sc_shutdownhook; /* cookie from shutdown hook */ #endif - u_int32_t sc_control; /* Preserved during suspend/standby */ - u_int32_t sc_intre; + uint32_t sc_control; /* Preserved during suspend/standby */ + uint32_t sc_intre; u_int sc_overrun_cnt; struct timeval sc_overrun_ntc; @@ -155,7 +155,7 @@ struct ohci_xfer { struct usbd_xfer xfer; struct usb_task abort_task; - u_int32_t ohci_xfer_flags; + uint32_t ohci_xfer_flags; }; #define OHCI_ISOC_DIRTY 0x01 #define OHCI_XFER_ABORTING 0x02 /* xfer is aborting. */ diff --git a/src/include.new/dev/usb/ucomvar.h b/src/include.new/dev/usb/ucomvar.h index 33b86f0..00dcd1e 100644 --- a/src/include.new/dev/usb/ucomvar.h +++ b/src/include.new/dev/usb/ucomvar.h @@ -100,8 +100,8 @@ int (*ucom_ioctl)(void *, int, u_long, caddr_t, int, usb_proc_ptr); int (*ucom_open)(void *, int); void (*ucom_close)(void *, int); - void (*ucom_read)(void *, int, u_char **, u_int32_t *); - void (*ucom_write)(void *, int, u_char *, u_char *, u_int32_t *); + void (*ucom_read)(void *, int, u_char **, uint32_t *); + void (*ucom_write)(void *, int, u_char *, u_char *, uint32_t *); }; /* line status register */ diff --git a/src/include.new/dev/usb/uhcireg.h b/src/include.new/dev/usb/uhcireg.h index e897f07..da55973 100644 --- a/src/include.new/dev/usb/uhcireg.h +++ b/src/include.new/dev/usb/uhcireg.h @@ -115,7 +115,7 @@ #define UHCI_TD_ALIGN 16 #define UHCI_QH_ALIGN 16 -typedef u_int32_t uhci_physaddr_t; +typedef uint32_t uhci_physaddr_t; #define UHCI_PTR_T 0x00000001 #define UHCI_PTR_TD 0x00000000 #define UHCI_PTR_QH 0x00000002 @@ -141,7 +141,7 @@ typedef struct { uhci_physaddr_t td_link; - u_int32_t td_status; + uint32_t td_status; #define UHCI_TD_GET_ACTLEN(s) (((s) + 1) & 0x3ff) #define UHCI_TD_ZERO_ACTLEN(t) ((t) | 0x3ff) #define UHCI_TD_BITSTUFF 0x00020000 @@ -157,7 +157,7 @@ #define UHCI_TD_GET_ERRCNT(s) (((s) >> 27) & 3) #define UHCI_TD_SET_ERRCNT(n) ((n) << 27) #define UHCI_TD_SPD 0x20000000 - u_int32_t td_token; + uint32_t td_token; #define UHCI_TD_PID_IN 0x00000069 #define UHCI_TD_PID_OUT 0x000000e1 #define UHCI_TD_PID_SETUP 0x0000002d @@ -171,7 +171,7 @@ #define UHCI_TD_SET_MAXLEN(l) (((l)-1) << 21) #define UHCI_TD_GET_MAXLEN(s) ((((s) >> 21) + 1) & 0x7ff) #define UHCI_TD_MAXLEN_MASK 0xffe00000 - u_int32_t td_buffer; + uint32_t td_buffer; } uhci_td_t; #define UHCI_TD_ERROR (UHCI_TD_BITSTUFF|UHCI_TD_CRCTO|UHCI_TD_BABBLE|UHCI_TD_DBUFFER|UHCI_TD_STALLED) diff --git a/src/include.new/dev/usb/uhcivar.h b/src/include.new/dev/usb/uhcivar.h index 6dde4af..0d96567 100644 --- a/src/include.new/dev/usb/uhcivar.h +++ b/src/include.new/dev/usb/uhcivar.h @@ -85,7 +85,7 @@ uhci_intr_info_t iinfo; struct usb_task abort_task; int curframe; - u_int32_t uhci_xfer_flags; + uint32_t uhci_xfer_flags; }; #define UHCI_XFER_ABORTING 0x0001 /* xfer is aborting. */ @@ -161,7 +161,7 @@ uhci_soft_qh_t *sc_bulk_start; /* dummy QH for bulk */ uhci_soft_qh_t *sc_bulk_end; /* last bulk transfer */ uhci_soft_qh_t *sc_last_qh; /* dummy QH at the end */ - u_int32_t sc_loops; /* number of QHs that wants looping */ + uint32_t sc_loops; /* number of QHs that wants looping */ uhci_soft_td_t *sc_freetds; /* TD free list */ uhci_soft_qh_t *sc_freeqhs; /* QH free list */ diff --git a/src/include.new/dev/usb/usb_quirks.h b/src/include.new/dev/usb/usb_quirks.h index 921cc86..497fe83 100644 --- a/src/include.new/dev/usb/usb_quirks.h +++ b/src/include.new/dev/usb/usb_quirks.h @@ -39,7 +39,7 @@ */ struct usbd_quirks { - u_int32_t uq_flags; /* Device problems: */ + uint32_t uq_flags; /* Device problems: */ #define UQ_NO_SET_PROTO 0x0001 /* cannot handle SET PROTOCOL. */ #define UQ_SWAP_UNICODE 0x0002 /* has some Unicode strings swapped. */ #define UQ_MS_REVZ 0x0004 /* mouse has Z-axis reversed */ diff --git a/src/include.new/dev/usb/usbdivar.h b/src/include.new/dev/usb/usbdivar.h index abde629..217bcde 100644 --- a/src/include.new/dev/usb/usbdivar.h +++ b/src/include.new/dev/usb/usbdivar.h @@ -59,7 +59,7 @@ void (*soft_intr)(void *); void (*do_poll)(struct usbd_bus *); usbd_status (*allocm)(struct usbd_bus *, usb_dma_t *, - u_int32_t bufsize); + uint32_t bufsize); void (*freem)(struct usbd_bus *, usb_dma_t *); struct usbd_xfer * (*allocx)(struct usbd_bus *); void (*freex)(struct usbd_bus *, struct usbd_xfer *); @@ -104,7 +104,7 @@ /* Filled by HC driver */ USBBASEDEVICE bdev; /* base device, host adapter */ struct usbd_bus_methods *methods; - u_int32_t pipe_size; /* size of a pipe struct */ + uint32_t pipe_size; /* size of a pipe struct */ /* Filled by usb driver */ struct usbd_device *root_hub; usbd_device_handle devices[USB_MAX_DEVICES]; @@ -191,15 +191,15 @@ struct usbd_pipe *pipe; void *priv; void *buffer; - u_int32_t length; - u_int32_t actlen; + uint32_t length; + uint32_t actlen; u_int16_t flags; - u_int32_t timeout; + uint32_t timeout; usbd_status status; usbd_callback callback; __volatile char done; #ifdef DIAGNOSTIC - u_int32_t busy_free; + uint32_t busy_free; #define XFER_FREE 0x46524545 #define XFER_BUSY 0x42555359 #define XFER_ONQU 0x4f4e5155 diff --git a/src/include.new/dev/wi/if_wavelan_ieee.h b/src/include.new/dev/wi/if_wavelan_ieee.h index 7dbb98e..02970ed 100644 --- a/src/include.new/dev/wi/if_wavelan_ieee.h +++ b/src/include.new/dev/wi/if_wavelan_ieee.h @@ -170,27 +170,27 @@ }; struct wi_counters { - u_int32_t wi_tx_unicast_frames; - u_int32_t wi_tx_multicast_frames; - u_int32_t wi_tx_fragments; - u_int32_t wi_tx_unicast_octets; - u_int32_t wi_tx_multicast_octets; - u_int32_t wi_tx_deferred_xmits; - u_int32_t wi_tx_single_retries; - u_int32_t wi_tx_multi_retries; - u_int32_t wi_tx_retry_limit; - u_int32_t wi_tx_discards; - u_int32_t wi_rx_unicast_frames; - u_int32_t wi_rx_multicast_frames; - u_int32_t wi_rx_fragments; - u_int32_t wi_rx_unicast_octets; - u_int32_t wi_rx_multicast_octets; - u_int32_t wi_rx_fcs_errors; - u_int32_t wi_rx_discards_nobuf; - u_int32_t wi_tx_discards_wrong_sa; - u_int32_t wi_rx_WEP_cant_decrypt; - u_int32_t wi_rx_msg_in_msg_frags; - u_int32_t wi_rx_msg_in_bad_msg_frags; + uint32_t wi_tx_unicast_frames; + uint32_t wi_tx_multicast_frames; + uint32_t wi_tx_fragments; + uint32_t wi_tx_unicast_octets; + uint32_t wi_tx_multicast_octets; + uint32_t wi_tx_deferred_xmits; + uint32_t wi_tx_single_retries; + uint32_t wi_tx_multi_retries; + uint32_t wi_tx_retry_limit; + uint32_t wi_tx_discards; + uint32_t wi_rx_unicast_frames; + uint32_t wi_rx_multicast_frames; + uint32_t wi_rx_fragments; + uint32_t wi_rx_unicast_octets; + uint32_t wi_rx_multicast_octets; + uint32_t wi_rx_fcs_errors; + uint32_t wi_rx_discards_nobuf; + uint32_t wi_tx_discards_wrong_sa; + uint32_t wi_rx_WEP_cant_decrypt; + uint32_t wi_rx_msg_in_msg_frags; + uint32_t wi_rx_msg_in_bad_msg_frags; }; /* @@ -506,8 +506,8 @@ * management beacon frame prefix */ struct wi_mgmt_beacon_hdr { - u_int32_t wi_ts0; - u_int32_t wi_ts1; + uint32_t wi_ts0; + uint32_t wi_ts1; u_int16_t wi_interval; u_int16_t wi_capinfo; }; @@ -568,8 +568,8 @@ * management probe response frame prefix */ struct wi_mgmt_proberesp_hdr { - u_int32_t wi_ts0; - u_int32_t wi_ts1; + uint32_t wi_ts0; + uint32_t wi_ts1; u_int16_t wi_interval; u_int16_t wi_capinfo; }; diff --git a/src/include.new/devstat.h b/src/include.new/devstat.h index 0ae0ae5..ed02386 100644 --- a/src/include.new/devstat.h +++ b/src/include.new/devstat.h @@ -119,7 +119,7 @@ }; struct device_selection { - u_int32_t device_number; + uint32_t device_number; char device_name[DEVSTAT_NAME_LEN]; int unit_number; int selected; diff --git a/src/include.new/elf-hints.h b/src/include.new/elf-hints.h index 30d75db..9ee93bd 100644 --- a/src/include.new/elf-hints.h +++ b/src/include.new/elf-hints.h @@ -33,14 +33,14 @@ * Hints file produced by ldconfig. */ struct elfhints_hdr { - u_int32_t magic; /* Magic number */ - u_int32_t version; /* File version (1) */ - u_int32_t strtab; /* Offset of string table in file */ - u_int32_t strsize; /* Size of string table */ - u_int32_t dirlist; /* Offset of directory list in + uint32_t magic; /* Magic number */ + uint32_t version; /* File version (1) */ + uint32_t strtab; /* Offset of string table in file */ + uint32_t strsize; /* Size of string table */ + uint32_t dirlist; /* Offset of directory list in string table */ - u_int32_t dirlistlen; /* strlen(dirlist) */ - u_int32_t spare[26]; /* Room for expansion */ + uint32_t dirlistlen; /* strlen(dirlist) */ + uint32_t spare[26]; /* Room for expansion */ }; #define ELFHINTS_MAGIC 0x746e6845 diff --git a/src/include.new/fs/msdosfs/bpb.h b/src/include.new/fs/msdosfs/bpb.h index 88df3f3..9efa224 100644 --- a/src/include.new/fs/msdosfs/bpb.h +++ b/src/include.new/fs/msdosfs/bpb.h @@ -52,8 +52,8 @@ u_int16_t bpbFATsecs; /* number of sectors per FAT */ u_int16_t bpbSecPerTrack; /* sectors per track */ u_int16_t bpbHeads; /* number of heads */ - u_int32_t bpbHiddenSecs; /* # of hidden sectors */ - u_int32_t bpbHugeSectors; /* # of sectors if bpbSectors == 0 */ + uint32_t bpbHiddenSecs; /* # of hidden sectors */ + uint32_t bpbHugeSectors; /* # of sectors if bpbSectors == 0 */ }; /* @@ -70,15 +70,15 @@ u_int16_t bpbFATsecs; /* number of sectors per FAT */ u_int16_t bpbSecPerTrack; /* sectors per track */ u_int16_t bpbHeads; /* number of heads */ - u_int32_t bpbHiddenSecs; /* # of hidden sectors */ - u_int32_t bpbHugeSectors; /* # of sectors if bpbSectors == 0 */ - u_int32_t bpbBigFATsecs; /* like bpbFATsecs for FAT32 */ + uint32_t bpbHiddenSecs; /* # of hidden sectors */ + uint32_t bpbHugeSectors; /* # of sectors if bpbSectors == 0 */ + uint32_t bpbBigFATsecs; /* like bpbFATsecs for FAT32 */ u_int16_t bpbExtFlags; /* extended flags: */ #define FATNUM 0xf /* mask for numbering active FAT */ #define FATMIRROR 0x80 /* FAT is mirrored (like it always was) */ u_int16_t bpbFSVers; /* filesystem version */ #define FSVERS 0 /* currently only 0 is understood */ - u_int32_t bpbRootClust; /* start cluster for root directory */ + uint32_t bpbRootClust; /* start cluster for root directory */ u_int16_t bpbFSInfo; /* filesystem info structure sector */ u_int16_t bpbBackup; /* backup boot sector */ u_int8_t bpbReserved[12]; /* reserved for future expansion */ diff --git a/src/include.new/fs/msdosfs/denode.h b/src/include.new/fs/msdosfs/denode.h index 8920bf5..4ef67fa 100644 --- a/src/include.new/fs/msdosfs/denode.h +++ b/src/include.new/fs/msdosfs/denode.h @@ -247,10 +247,10 @@ u_short defid_len; /* length of structure */ u_short defid_pad; /* force long alignment */ - u_int32_t defid_dirclust; /* cluster this dir entry came from */ - u_int32_t defid_dirofs; /* offset of entry within the cluster */ + uint32_t defid_dirclust; /* cluster this dir entry came from */ + uint32_t defid_dirofs; /* offset of entry within the cluster */ #if 0 - u_int32_t defid_gen; /* generation number */ + uint32_t defid_gen; /* generation number */ #endif }; diff --git a/src/include.new/fs/msdosfs/msdosfsmount.h b/src/include.new/fs/msdosfs/msdosfsmount.h index c17e330..87c1e7a 100644 --- a/src/include.new/fs/msdosfs/msdosfsmount.h +++ b/src/include.new/fs/msdosfs/msdosfsmount.h @@ -96,7 +96,7 @@ u_long pm_fatblocksize; /* size of fat blocks in bytes */ u_long pm_fatblocksec; /* size of fat blocks in sectors */ u_long pm_fatsize; /* size of fat in bytes */ - u_int32_t pm_fatmask; /* mask to use for fat numbers */ + uint32_t pm_fatmask; /* mask to use for fat numbers */ u_long pm_fsinfo; /* fsinfo block number */ u_long pm_nxtfree; /* next place to search for a free cluster */ u_int pm_fatmult; /* these 2 values are used in fat */ @@ -108,7 +108,7 @@ void *pm_w2u; /* Unicode->Local iconv handle */ void *pm_u2d; /* Unicode->DOS iconv handle */ void *pm_d2u; /* DOS->Local iconv handle */ - u_int32_t pm_nfileno; /* next 32-bit fileno */ + uint32_t pm_nfileno; /* next 32-bit fileno */ RB_HEAD(msdosfs_filenotree, msdosfs_fileno) pm_filenos; /* 64<->32-bit fileno mapping */ struct lock pm_fatlock; /* lockmgr protecting allocations and rb tree */ diff --git a/src/include.new/fs/nfs/nfs.h b/src/include.new/fs/nfs/nfs.h index 431ab0e..0d6ef13 100644 --- a/src/include.new/fs/nfs/nfs.h +++ b/src/include.new/fs/nfs/nfs.h @@ -217,13 +217,13 @@ }; struct nfsd_dumpclients { - u_int32_t ndcl_flags; /* LCL_xxx flags */ - u_int32_t ndcl_nopenowners; /* Number of openowners */ - u_int32_t ndcl_nopens; /* and opens */ - u_int32_t ndcl_nlockowners; /* and of lockowners */ - u_int32_t ndcl_nlocks; /* and of locks */ - u_int32_t ndcl_ndelegs; /* and of delegations */ - u_int32_t ndcl_nolddelegs; /* and old delegations */ + uint32_t ndcl_flags; /* LCL_xxx flags */ + uint32_t ndcl_nopenowners; /* Number of openowners */ + uint32_t ndcl_nopens; /* and opens */ + uint32_t ndcl_nlockowners; /* and of lockowners */ + uint32_t ndcl_nlocks; /* and of locks */ + uint32_t ndcl_ndelegs; /* and of delegations */ + uint32_t ndcl_nolddelegs; /* and old delegations */ sa_family_t ndcl_addrfam; /* Callback address */ union { struct in_addr sin_addr; @@ -239,7 +239,7 @@ }; struct nfsd_dumplocks { - u_int32_t ndlck_flags; /* state flags NFSLCK_xxx */ + uint32_t ndlck_flags; /* state flags NFSLCK_xxx */ nfsv4stateid_t ndlck_stateid; /* stateid */ u_int64_t ndlck_first; /* lock byte range */ u_int64_t ndlck_end; @@ -259,7 +259,7 @@ u_char *nfr_srvlist; /* List of servers */ int nfr_srvcnt; /* number of servers */ vnode_t nfr_vp; /* vnode for referral */ - u_int32_t nfr_dfileno; /* assigned dir inode# */ + uint32_t nfr_dfileno; /* assigned dir inode# */ }; /* @@ -355,7 +355,7 @@ #define NFSATTRBIT_MAXWORDS 3 typedef struct { - u_int32_t bits[NFSATTRBIT_MAXWORDS]; + uint32_t bits[NFSATTRBIT_MAXWORDS]; } nfsattrbit_t; #define NFSZERO_ATTRBIT(b) do { \ @@ -521,8 +521,8 @@ struct ucred *nr_cred; int nr_lock; NFSMUTEX_T nr_mtx; - u_int32_t nr_prog; - u_int32_t nr_vers; + uint32_t nr_prog; + uint32_t nr_vers; struct __rpc_client *nr_client; AUTH *nr_auth; }; @@ -577,10 +577,10 @@ caddr_t nd_dpos; /* Current dissect pos */ caddr_t nd_bpos; /* Current build pos */ u_int16_t nd_procnum; /* RPC # */ - u_int32_t nd_flag; /* nd_flag */ - u_int32_t nd_repstat; /* Reply status */ + uint32_t nd_flag; /* nd_flag */ + uint32_t nd_repstat; /* Reply status */ int *nd_errp; /* Pointer to ret status */ - u_int32_t nd_retxid; /* Reply xid */ + uint32_t nd_retxid; /* Reply xid */ struct nfsrvcache *nd_rp; /* Assoc. cache entry */ fhandle_t nd_fh; /* File handle */ struct ucred *nd_cred; /* Credentials */ @@ -687,7 +687,7 @@ * preserved. */ struct nfsrvfh { - u_int32_t nfsrvfh_len; + uint32_t nfsrvfh_len; u_int8_t nfsrvfh_data[NFSRV_MAXFH]; }; @@ -696,7 +696,7 @@ * NFSv4 client data structures. */ struct nfsv4lock { - u_int32_t nfslock_usecnt; + uint32_t nfslock_usecnt; u_int8_t nfslock_lock; }; #define NFSV4LOCK_LOCK 0x01 diff --git a/src/include.new/fs/nfs/nfs_var.h b/src/include.new/fs/nfs/nfs_var.h index f50c198..6efbf03 100644 --- a/src/include.new/fs/nfs/nfs_var.h +++ b/src/include.new/fs/nfs/nfs_var.h @@ -104,7 +104,7 @@ struct nfsexstuff *, struct nfsrv_descript *, NFSPROC_T *); int nfsrv_openctrl(struct nfsrv_descript *, vnode_t, struct nfsstate **, nfsquad_t, nfsv4stateid_t *, nfsv4stateid_t *, - u_int32_t *, struct nfsexstuff *, NFSPROC_T *, u_quad_t); + uint32_t *, struct nfsexstuff *, NFSPROC_T *, u_quad_t); int nfsrv_opencheck(nfsquad_t, nfsv4stateid_t *, struct nfsstate *, vnode_t, struct nfsrv_descript *, NFSPROC_T *, int); int nfsrv_openupdate(vnode_t, struct nfsstate *, nfsquad_t, @@ -238,7 +238,7 @@ /* nfs_nfsdsocket.c */ void nfsrvd_rephead(struct nfsrv_descript *); -void nfsrvd_dorpc(struct nfsrv_descript *, int, u_char *, int, u_int32_t, +void nfsrvd_dorpc(struct nfsrv_descript *, int, u_char *, int, uint32_t, NFSPROC_T *); /* nfs_nfsdcache.c */ @@ -274,7 +274,7 @@ struct nfsvattr *, struct nfsfh **, fhandle_t *, int, struct nfsv3_pathconf *, struct statfs *, struct nfsstatfs *, struct nfsfsinfo *, NFSACL_T *, - int, int *, u_int32_t *, u_int32_t *, NFSPROC_T *, struct ucred *); + int, int *, uint32_t *, uint32_t *, NFSPROC_T *, struct ucred *); int nfsv4_lock(struct nfsv4lock *, int, int *, void *, struct mount *); void nfsv4_unlock(struct nfsv4lock *, int); void nfsv4_relref(struct nfsv4lock *); @@ -299,10 +299,10 @@ /* nfs_clcomsubs.c */ void nfsm_uiombuf(struct nfsrv_descript *, struct uio *, int); void nfscl_reqstart(struct nfsrv_descript *, int, struct nfsmount *, - u_int8_t *, int, u_int32_t **, struct nfsclsession *); + u_int8_t *, int, uint32_t **, struct nfsclsession *); nfsuint64 *nfscl_getcookie(struct nfsnode *, off_t off, int); void nfscl_fillsattr(struct nfsrv_descript *, struct vattr *, - vnode_t, int, u_int32_t); + vnode_t, int, uint32_t); u_int8_t *nfscl_getmyip(struct nfsmount *, int *); int nfsm_getfh(struct nfsrv_descript *, struct nfsfh **); int nfscl_mtofh(struct nfsrv_descript *, struct nfsfh **, @@ -350,7 +350,7 @@ void nfsd_init(void); int nfsd_checkrootexp(struct nfsrv_descript *); void nfsd_getminorvers(struct nfsrv_descript *, u_char *, u_char **, int *, - u_int32_t *); + uint32_t *); /* nfs_clvfsops.c */ void nfscl_retopts(struct nfsmount *, char *, size_t); @@ -364,7 +364,7 @@ struct ucred *newnfs_getcred(void); void newnfs_setroot(struct ucred *); int nfs_catnap(int, int, const char *); -struct nfsreferral *nfsv4root_getreferral(vnode_t, vnode_t, u_int32_t); +struct nfsreferral *nfsv4root_getreferral(vnode_t, vnode_t, uint32_t); int nfsvno_pathconf(vnode_t, int, register_t *, struct ucred *, NFSPROC_T *); int nfsrv_atroot(vnode_t, long *); @@ -384,13 +384,13 @@ int nfsrpc_null(vnode_t, struct ucred *, NFSPROC_T *); int nfsrpc_access(vnode_t, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); -int nfsrpc_accessrpc(vnode_t, u_int32_t, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *, u_int32_t *, void *); +int nfsrpc_accessrpc(vnode_t, uint32_t, struct ucred *, + NFSPROC_T *, struct nfsvattr *, int *, uint32_t *, void *); int nfsrpc_open(vnode_t, int, struct ucred *, NFSPROC_T *); int nfsrpc_openrpc(struct nfsmount *, vnode_t, u_int8_t *, int, u_int8_t *, int, - u_int32_t, struct nfsclopen *, u_int8_t *, int, struct nfscldeleg **, int, - u_int32_t, struct ucred *, NFSPROC_T *, int, int); -int nfsrpc_opendowngrade(vnode_t, u_int32_t, struct nfsclopen *, + uint32_t, struct nfsclopen *, u_int8_t *, int, struct nfscldeleg **, int, + uint32_t, struct ucred *, NFSPROC_T *, int, int); +int nfsrpc_opendowngrade(vnode_t, uint32_t, struct nfsclopen *, struct ucred *, NFSPROC_T *); int nfsrpc_close(vnode_t, int, NFSPROC_T *); int nfsrpc_closerpc(struct nfsrv_descript *, struct nfsmount *, @@ -414,7 +414,7 @@ struct nfsvattr *, int *, void *); int nfsrpc_write(vnode_t, struct uio *, int *, int *, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *, int); -int nfsrpc_mknod(vnode_t, char *, int, struct vattr *, u_int32_t, +int nfsrpc_mknod(vnode_t, char *, int, struct vattr *, uint32_t, enum vtype, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, struct nfsfh **, int *, int *, void *); int nfsrpc_create(vnode_t, char *, int, struct vattr *, nfsquad_t, @@ -494,10 +494,10 @@ void nfscl_freenfsclds(struct nfsclds *); /* nfs_clstate.c */ -int nfscl_open(vnode_t, u_int8_t *, int, u_int32_t, int, +int nfscl_open(vnode_t, u_int8_t *, int, uint32_t, int, struct ucred *, NFSPROC_T *, struct nfsclowner **, struct nfsclopen **, int *, int *, int); -int nfscl_getstateid(vnode_t, u_int8_t *, int, u_int32_t, int, struct ucred *, +int nfscl_getstateid(vnode_t, u_int8_t *, int, uint32_t, int, struct ucred *, NFSPROC_T *, nfsv4stateid_t *, void **); void nfscl_ownerrelease(struct nfsclowner *, int, int, int); void nfscl_openrelease(struct nfsclopen *, int, int); @@ -522,7 +522,7 @@ void nfscl_umount(struct nfsmount *, NFSPROC_T *); void nfscl_renewthread(struct nfsclclient *, NFSPROC_T *); void nfscl_initiate_recovery(struct nfsclclient *); -int nfscl_hasexpired(struct nfsclclient *, u_int32_t, NFSPROC_T *); +int nfscl_hasexpired(struct nfsclclient *, uint32_t, NFSPROC_T *); void nfscl_dumpstate(struct nfsmount *, int, int, int, int); void nfscl_dupopen(vnode_t, int); int nfscl_getclose(vnode_t, struct nfsclclient **); @@ -601,7 +601,7 @@ NFSPROC_T *, struct nfsexstuff *); int nfsvno_getfh(vnode_t, fhandle_t *, NFSPROC_T *); int nfsvno_accchk(vnode_t, accmode_t, struct ucred *, - struct nfsexstuff *, NFSPROC_T *, int, int, u_int32_t *); + struct nfsexstuff *, NFSPROC_T *, int, int, uint32_t *); int nfsvno_namei(struct nfsrv_descript *, struct nameidata *, vnode_t, int, struct nfsexstuff *, NFSPROC_T *, vnode_t *); void nfsvno_setpathbuf(struct nameidata *, char **, u_long **); @@ -628,8 +628,8 @@ struct nfsexstuff *); int nfsvno_rmdirsub(struct nameidata *, int, struct ucred *, NFSPROC_T *, struct nfsexstuff *); -int nfsvno_rename(struct nameidata *, struct nameidata *, u_int32_t, - u_int32_t, struct ucred *, NFSPROC_T *); +int nfsvno_rename(struct nameidata *, struct nameidata *, uint32_t, + uint32_t, struct ucred *, NFSPROC_T *); int nfsvno_link(struct nameidata *, vnode_t, struct ucred *, NFSPROC_T *, struct nfsexstuff *); int nfsvno_fsync(vnode_t, u_int64_t, int, struct ucred *, NFSPROC_T *); @@ -667,7 +667,7 @@ int newnfs_msleep(struct thread *, void *, struct mtx *, int, char *, int); int newnfs_request(struct nfsrv_descript *, struct nfsmount *, struct nfsclient *, struct nfssockreq *, vnode_t, NFSPROC_T *, - struct ucred *, u_int32_t, u_int32_t, u_char *, int, u_int64_t *, + struct ucred *, uint32_t, uint32_t, u_char *, int, u_int64_t *, struct nfsclsession *); int newnfs_connect(struct nfsmount *, struct nfssockreq *, struct ucred *, NFSPROC_T *, int); diff --git a/src/include.new/fs/nfs/nfsclstate.h b/src/include.new/fs/nfs/nfsclstate.h index 3f66528..73f90b5 100644 --- a/src/include.new/fs/nfs/nfsclstate.h +++ b/src/include.new/fs/nfs/nfsclstate.h @@ -103,10 +103,10 @@ struct proc *nfsc_renewthread; struct nfsmount *nfsc_nmp; time_t nfsc_expire; - u_int32_t nfsc_clientidrev; - u_int32_t nfsc_rev; - u_int32_t nfsc_renew; - u_int32_t nfsc_cbident; + uint32_t nfsc_clientidrev; + uint32_t nfsc_rev; + uint32_t nfsc_renew; + uint32_t nfsc_cbident; u_int16_t nfsc_flags; u_int16_t nfsc_idlen; u_int8_t nfsc_id[1]; /* Malloc'd to correct length */ @@ -130,8 +130,8 @@ LIST_ENTRY(nfsclowner) nfsow_list; struct nfsclopenhead nfsow_open; struct nfsclclient *nfsow_clp; - u_int32_t nfsow_seqid; - u_int32_t nfsow_defunct; + uint32_t nfsow_seqid; + uint32_t nfsow_defunct; struct nfsv4lock nfsow_rwlock; u_int8_t nfsow_owner[NFSV4CL_LOCKNAMELEN]; }; @@ -179,8 +179,8 @@ nfsv4stateid_t nfso_stateid; struct nfsclowner *nfso_own; struct nfscred nfso_cred; /* Cred. used for Open */ - u_int32_t nfso_mode; - u_int32_t nfso_opencnt; + uint32_t nfso_mode; + uint32_t nfso_opencnt; u_int16_t nfso_fhlen; u_int8_t nfso_posixlock; /* 1 for POSIX type locking */ u_int8_t nfso_fh[1]; /* must be last */ @@ -201,7 +201,7 @@ NFSPROC_T *nfsl_inprog; nfsv4stateid_t nfsl_stateid; int nfsl_lockflags; - u_int32_t nfsl_seqid; + uint32_t nfsl_seqid; struct nfsv4lock nfsl_rwlock; u_int8_t nfsl_owner[NFSV4CL_LOCKNAMELEN]; u_int8_t nfsl_openowner[NFSV4CL_LOCKNAMELEN]; diff --git a/src/include.new/fs/nfs/nfsm_subs.h b/src/include.new/fs/nfs/nfsm_subs.h index ea4a2c3..2a08558 100644 --- a/src/include.new/fs/nfs/nfsm_subs.h +++ b/src/include.new/fs/nfs/nfsm_subs.h @@ -142,7 +142,7 @@ #define NFSM_STRSIZ(s, m) \ do { \ - tl = (u_int32_t *)nfsm_dissect(nd, NFSX_UNSIGNED); \ + tl = (uint32_t *)nfsm_dissect(nd, NFSX_UNSIGNED); \ if (!tl || ((s) = fxdr_unsigned(int32_t, *tl)) > (m)) { \ error = EBADRPC; \ goto nfsmout; \ diff --git a/src/include.new/fs/nfs/nfsport.h b/src/include.new/fs/nfs/nfsport.h index 7c4bff5..af95576 100644 --- a/src/include.new/fs/nfs/nfsport.h +++ b/src/include.new/fs/nfs/nfsport.h @@ -451,7 +451,7 @@ struct nfsvattr { struct vattr na_vattr; nfsattrbit_t na_suppattr; - u_int32_t na_mntonfileno; + uint32_t na_mntonfileno; u_int64_t na_filesid[2]; }; @@ -961,7 +961,7 @@ */ struct nfsreq { TAILQ_ENTRY(nfsreq) r_chain; - u_int32_t r_flags; /* flags on request, see below */ + uint32_t r_flags; /* flags on request, see below */ struct nfsmount *r_nmp; /* Client mnt ptr */ struct mtx r_mtx; /* Mutex lock for this structure */ }; diff --git a/src/include.new/fs/nfs/nfsproto.h b/src/include.new/fs/nfs/nfsproto.h index 1354299..826d0b3 100644 --- a/src/include.new/fs/nfs/nfsproto.h +++ b/src/include.new/fs/nfs/nfsproto.h @@ -640,13 +640,13 @@ MAKEIMODE((t), (m))) #define vtonfsv34_mode(m) txdr_unsigned((m) & 07777) #define nfstov_mode(a) (fxdr_unsigned(u_int16_t, (a))&07777) -#define vtonfsv2_type(a) (((u_int32_t)(a)) >= 9 ? txdr_unsigned(NFNON) : \ - txdr_unsigned(newnfsv2_type[((u_int32_t)(a))])) -#define vtonfsv34_type(a) (((u_int32_t)(a)) >= 9 ? txdr_unsigned(NFNON) : \ - txdr_unsigned(nfsv34_type[((u_int32_t)(a))])) -#define nfsv2tov_type(a) newnv2tov_type[fxdr_unsigned(u_int32_t,(a))&0x7] -#define nfsv34tov_type(a) nv34tov_type[fxdr_unsigned(u_int32_t,(a))&0x7] -#define vtonfs_dtype(a) (((u_int32_t)(a)) >= 9 ? IFTODT(VTTOIF(VNON)) : \ +#define vtonfsv2_type(a) (((uint32_t)(a)) >= 9 ? txdr_unsigned(NFNON) : \ + txdr_unsigned(newnfsv2_type[((uint32_t)(a))])) +#define vtonfsv34_type(a) (((uint32_t)(a)) >= 9 ? txdr_unsigned(NFNON) : \ + txdr_unsigned(nfsv34_type[((uint32_t)(a))])) +#define nfsv2tov_type(a) newnv2tov_type[fxdr_unsigned(uint32_t,(a))&0x7] +#define nfsv34tov_type(a) nv34tov_type[fxdr_unsigned(uint32_t,(a))&0x7] +#define vtonfs_dtype(a) (((uint32_t)(a)) >= 9 ? IFTODT(VTTOIF(VNON)) : \ IFTODT(VTTOIF(a))) /* File types */ @@ -656,21 +656,21 @@ /* Structs for common parts of the rpc's */ struct nfsv2_time { - u_int32_t nfsv2_sec; - u_int32_t nfsv2_usec; + uint32_t nfsv2_sec; + uint32_t nfsv2_usec; }; typedef struct nfsv2_time nfstime2; struct nfsv3_time { - u_int32_t nfsv3_sec; - u_int32_t nfsv3_nsec; + uint32_t nfsv3_sec; + uint32_t nfsv3_nsec; }; typedef struct nfsv3_time nfstime3; struct nfsv4_time { - u_int32_t nfsv4_highsec; - u_int32_t nfsv4_sec; - u_int32_t nfsv4_nsec; + uint32_t nfsv4_highsec; + uint32_t nfsv4_sec; + uint32_t nfsv4_nsec; }; typedef struct nfsv4_time nfstime4; @@ -679,7 +679,7 @@ * protocol and to facilitate xdr conversion. */ struct nfs_uquad { - u_int32_t nfsuquad[2]; + uint32_t nfsuquad[2]; }; typedef struct nfs_uquad nfsuint64; @@ -687,7 +687,7 @@ * Used to convert between two u_longs and a u_quad_t. */ union nfs_quadconvert { - u_int32_t lval[2]; + uint32_t lval[2]; u_quad_t qval; }; typedef union nfs_quadconvert nfsquad_t; @@ -696,8 +696,8 @@ * NFS Version 3 special file number. */ struct nfsv3_spec { - u_int32_t specdata1; - u_int32_t specdata2; + uint32_t specdata1; + uint32_t specdata2; }; typedef struct nfsv3_spec nfsv3spec; @@ -711,19 +711,19 @@ * NFSX_FATTR(v3) macro. */ struct nfs_fattr { - u_int32_t fa_type; - u_int32_t fa_mode; - u_int32_t fa_nlink; - u_int32_t fa_uid; - u_int32_t fa_gid; + uint32_t fa_type; + uint32_t fa_mode; + uint32_t fa_nlink; + uint32_t fa_uid; + uint32_t fa_gid; union { struct { - u_int32_t nfsv2fa_size; - u_int32_t nfsv2fa_blocksize; - u_int32_t nfsv2fa_rdev; - u_int32_t nfsv2fa_blocks; - u_int32_t nfsv2fa_fsid; - u_int32_t nfsv2fa_fileid; + uint32_t nfsv2fa_size; + uint32_t nfsv2fa_blocksize; + uint32_t nfsv2fa_rdev; + uint32_t nfsv2fa_blocks; + uint32_t nfsv2fa_fsid; + uint32_t nfsv2fa_fileid; nfstime2 nfsv2fa_atime; nfstime2 nfsv2fa_mtime; nfstime2 nfsv2fa_ctime; @@ -761,10 +761,10 @@ #define fa3_ctime fa_un.fa_nfsv3.nfsv3fa_ctime struct nfsv2_sattr { - u_int32_t sa_mode; - u_int32_t sa_uid; - u_int32_t sa_gid; - u_int32_t sa_size; + uint32_t sa_mode; + uint32_t sa_uid; + uint32_t sa_gid; + uint32_t sa_size; nfstime2 sa_atime; nfstime2 sa_mtime; }; @@ -773,14 +773,14 @@ * NFS Version 3 sattr structure for the new node creation case. */ struct nfsv3_sattr { - u_int32_t sa_modetrue; - u_int32_t sa_mode; - u_int32_t sa_uidfalse; - u_int32_t sa_gidfalse; - u_int32_t sa_sizefalse; - u_int32_t sa_atimetype; + uint32_t sa_modetrue; + uint32_t sa_mode; + uint32_t sa_uidfalse; + uint32_t sa_gidfalse; + uint32_t sa_sizefalse; + uint32_t sa_atimetype; nfstime3 sa_atime; - u_int32_t sa_mtimetype; + uint32_t sa_mtimetype; nfstime3 sa_mtime; }; @@ -1260,11 +1260,11 @@ struct nfsstatfs { union { struct { - u_int32_t nfsv2sf_tsize; - u_int32_t nfsv2sf_bsize; - u_int32_t nfsv2sf_blocks; - u_int32_t nfsv2sf_bfree; - u_int32_t nfsv2sf_bavail; + uint32_t nfsv2sf_tsize; + uint32_t nfsv2sf_bsize; + uint32_t nfsv2sf_blocks; + uint32_t nfsv2sf_bfree; + uint32_t nfsv2sf_bavail; } sf_nfsv2; struct { u_int64_t nfsv3sf_tbytes; @@ -1273,7 +1273,7 @@ u_int64_t nfsv3sf_tfiles; u_int64_t nfsv3sf_ffiles; u_int64_t nfsv3sf_afiles; - u_int32_t nfsv3sf_invarsec; + uint32_t nfsv3sf_invarsec; } sf_nfsv3; } sf_un; }; @@ -1296,16 +1296,16 @@ * (Cannot be used to move data on/off the wire, due to alignment concerns.) */ struct nfsfsinfo { - u_int32_t fs_rtmax; - u_int32_t fs_rtpref; - u_int32_t fs_rtmult; - u_int32_t fs_wtmax; - u_int32_t fs_wtpref; - u_int32_t fs_wtmult; - u_int32_t fs_dtpref; + uint32_t fs_rtmax; + uint32_t fs_rtpref; + uint32_t fs_rtmult; + uint32_t fs_wtmax; + uint32_t fs_wtpref; + uint32_t fs_wtmult; + uint32_t fs_dtpref; u_int64_t fs_maxfilesize; struct timespec fs_timedelta; - u_int32_t fs_properties; + uint32_t fs_properties; }; /* @@ -1322,20 +1322,20 @@ #define fs_maxname fs_rtmult struct nfsv3_pathconf { - u_int32_t pc_linkmax; - u_int32_t pc_namemax; - u_int32_t pc_notrunc; - u_int32_t pc_chownrestricted; - u_int32_t pc_caseinsensitive; - u_int32_t pc_casepreserving; + uint32_t pc_linkmax; + uint32_t pc_namemax; + uint32_t pc_notrunc; + uint32_t pc_chownrestricted; + uint32_t pc_caseinsensitive; + uint32_t pc_casepreserving; }; /* * NFS V4 data structures. */ struct nfsv4stateid { - u_int32_t seqid; - u_int32_t other[NFSX_STATEIDOTHER / NFSX_UNSIGNED]; + uint32_t seqid; + uint32_t other[NFSX_STATEIDOTHER / NFSX_UNSIGNED]; }; typedef struct nfsv4stateid nfsv4stateid_t; diff --git a/src/include.new/fs/nfs/nfsrvcache.h b/src/include.new/fs/nfs/nfsrvcache.h index f817007..5f84fad 100644 --- a/src/include.new/fs/nfs/nfsrvcache.h +++ b/src/include.new/fs/nfs/nfsrvcache.h @@ -48,7 +48,7 @@ LIST_ENTRY(nfsrvcache) rc_hash; /* Hash chain */ LIST_ENTRY(nfsrvcache) rc_ahash; /* ACK hash chain */ TAILQ_ENTRY(nfsrvcache) rc_lru; /* UDP lru chain */ - u_int32_t rc_xid; /* rpc id number */ + uint32_t rc_xid; /* rpc id number */ time_t rc_timestamp; /* Time done */ union { mbuf_t repmb; /* Reply mbuf list OR */ @@ -60,8 +60,8 @@ } udp; struct { u_int64_t sockref; - u_int32_t len; - u_int32_t tcpseq; + uint32_t len; + uint32_t tcpseq; int16_t refcnt; u_int16_t cksum; time_t cachetime; diff --git a/src/include.new/fs/nfs/nfsrvstate.h b/src/include.new/fs/nfs/nfsrvstate.h index 942d541..bd901fb 100644 --- a/src/include.new/fs/nfs/nfsrvstate.h +++ b/src/include.new/fs/nfs/nfsrvstate.h @@ -90,18 +90,18 @@ time_t lc_delegtime; /* Old deleg expiry (sec) */ nfsquad_t lc_clientid; /* 64 bit clientid */ nfsquad_t lc_confirm; /* 64 bit confirm value */ - u_int32_t lc_program; /* RPC Program # */ - u_int32_t lc_callback; /* Callback id */ - u_int32_t lc_stateindex; /* Current state index# */ - u_int32_t lc_statemaxindex; /* Max state index# */ - u_int32_t lc_cbref; /* Cnt of callbacks */ + uint32_t lc_program; /* RPC Program # */ + uint32_t lc_callback; /* Callback id */ + uint32_t lc_stateindex; /* Current state index# */ + uint32_t lc_statemaxindex; /* Max state index# */ + uint32_t lc_cbref; /* Cnt of callbacks */ uid_t lc_uid; /* User credential */ gid_t lc_gid; u_int16_t lc_idlen; /* Client ID and len */ u_int16_t lc_namelen; /* plus GSS principal and len */ u_char *lc_name; struct nfssockreq lc_req; /* Callback info */ - u_int32_t lc_flags; /* LCL_ flag bits */ + uint32_t lc_flags; /* LCL_ flag bits */ u_char lc_verf[NFSX_VERF]; /* client verifier */ u_char lc_id[1]; /* Malloc'd correct size */ }; @@ -170,13 +170,13 @@ struct nfslockhead lock; /* Locks list */ } ls_head; nfsv4stateid_t ls_stateid; /* The state id */ - u_int32_t ls_seq; /* seq id */ + uint32_t ls_seq; /* seq id */ uid_t ls_uid; /* uid of locker */ - u_int32_t ls_flags; /* Type of lock, etc. */ + uint32_t ls_flags; /* Type of lock, etc. */ union { struct nfsstate *openowner; /* Open only */ - u_int32_t opentolockseq; /* Lock call only */ - u_int32_t noopens; /* Openowner only */ + uint32_t opentolockseq; /* Lock call only */ + uint32_t noopens; /* Openowner only */ struct { u_quad_t filerev; /* Delegations only */ time_t expiry; @@ -215,7 +215,7 @@ struct nfslockfile *lo_lfp; u_int64_t lo_first; u_int64_t lo_end; - u_int32_t lo_flags; + uint32_t lo_flags; }; /* @@ -226,7 +226,7 @@ nfsquad_t cl_clientid; u_int64_t cl_first; u_int64_t cl_end; - u_int32_t cl_flags; + uint32_t cl_flags; u_short cl_ownerlen; u_char cl_owner[NFSV4_OPAQUELIMIT]; }; @@ -285,8 +285,8 @@ * Record at beginning of file. */ struct nfsf_rec { - u_int32_t lease; /* Lease duration */ - u_int32_t numboots; /* Number of boottimes */ + uint32_t lease; /* Lease duration */ + uint32_t numboots; /* Number of boottimes */ }; #if defined(_KERNEL) || defined(KERNEL) diff --git a/src/include.new/fs/nfs/rpcv2.h b/src/include.new/fs/nfs/rpcv2.h index e05835b..6167360 100644 --- a/src/include.new/fs/nfs/rpcv2.h +++ b/src/include.new/fs/nfs/rpcv2.h @@ -200,8 +200,8 @@ /* Structs for common parts of the rpc's */ struct rpcv2_time { - u_int32_t rpc_sec; - u_int32_t rpc_usec; + uint32_t rpc_sec; + uint32_t rpc_usec; }; #endif /* _NFS_RPCV2_H_ */ diff --git a/src/include.new/fs/nfs/xdr_subs.h b/src/include.new/fs/nfs/xdr_subs.h index 00a34a7..aa87f25 100644 --- a/src/include.new/fs/nfs/xdr_subs.h +++ b/src/include.new/fs/nfs/xdr_subs.h @@ -88,12 +88,12 @@ } while (0) #define fxdr_hyper(f) \ - ((((u_quad_t)ntohl(((u_int32_t *)(f))[0])) << 32) | \ - (u_quad_t)(ntohl(((u_int32_t *)(f))[1]))) + ((((u_quad_t)ntohl(((uint32_t *)(f))[0])) << 32) | \ + (u_quad_t)(ntohl(((uint32_t *)(f))[1]))) #define txdr_hyper(f, t) do { \ - ((u_int32_t *)(t))[0] = htonl((u_int32_t)((f) >> 32)); \ - ((u_int32_t *)(t))[1] = htonl((u_int32_t)((f) & 0xffffffff)); \ + ((uint32_t *)(t))[0] = htonl((uint32_t)((f) >> 32)); \ + ((uint32_t *)(t))[1] = htonl((uint32_t)((f) & 0xffffffff)); \ } while (0) #endif /* _NFS_XDR_SUBS_H_ */ diff --git a/src/include.new/fs/ntfs/ntfs.h b/src/include.new/fs/ntfs/ntfs.h index e1f6a24..58b7c7c 100644 --- a/src/include.new/fs/ntfs/ntfs.h +++ b/src/include.new/fs/ntfs/ntfs.h @@ -48,15 +48,15 @@ #define NTFS_MAXFILENAME 255 struct fixuphdr { - u_int32_t fh_magic; + uint32_t fh_magic; u_int16_t fh_foff; u_int16_t fh_fnum; }; #define NTFS_AF_INRUN 0x00000001 struct attrhdr { - u_int32_t a_type; - u_int32_t reclen; + uint32_t a_type; + uint32_t reclen; u_int8_t a_flag; u_int8_t a_namelen; u_int8_t a_nameoff; @@ -89,7 +89,7 @@ cn_t a_vcnend; u_int16_t a_dataoff; u_int16_t a_compressalg; - u_int32_t reserved1; + uint32_t reserved1; u_int64_t a_allocated; u_int64_t a_datalen; u_int64_t a_initialized; @@ -114,8 +114,8 @@ #define NTFS_FFLAG_DIR 0x10000000LL struct attr_name { - u_int32_t n_pnumber; /* Parent ntnode */ - u_int32_t reserved; + uint32_t n_pnumber; /* Parent ntnode */ + uint32_t reserved; ntfs_times_t n_times; u_int64_t n_size; u_int64_t n_attrsz; @@ -127,51 +127,51 @@ #define NTFS_IRFLAG_INDXALLOC 0x00000001 struct attr_indexroot { - u_int32_t ir_unkn1; /* always 0x30 */ - u_int32_t ir_unkn2; /* always 0x1 */ - u_int32_t ir_size;/* ??? */ - u_int32_t ir_unkn3; /* number of cluster */ - u_int32_t ir_unkn4; /* always 0x10 */ - u_int32_t ir_datalen; /* sizeof simething */ - u_int32_t ir_allocated; /* same as above */ + uint32_t ir_unkn1; /* always 0x30 */ + uint32_t ir_unkn2; /* always 0x1 */ + uint32_t ir_size;/* ??? */ + uint32_t ir_unkn3; /* number of cluster */ + uint32_t ir_unkn4; /* always 0x10 */ + uint32_t ir_datalen; /* sizeof simething */ + uint32_t ir_allocated; /* same as above */ u_int16_t ir_flag;/* ?? always 1 */ u_int16_t ir_unkn7; }; struct attr_attrlist { - u_int32_t al_type; /* Attribute type */ + uint32_t al_type; /* Attribute type */ u_int16_t reclen; /* length of this entry */ u_int8_t al_namelen; /* Attribute name len */ u_int8_t al_nameoff; /* Name offset from entry start */ u_int64_t al_vcnstart; /* VCN number */ - u_int32_t al_inumber; /* Parent ntnode */ - u_int32_t reserved; + uint32_t al_inumber; /* Parent ntnode */ + uint32_t reserved; u_int16_t al_index; /* Attribute index in MFT record */ u_int16_t al_name[1]; /* Name */ }; -#define NTFS_INDXMAGIC (u_int32_t)(0x58444E49) +#define NTFS_INDXMAGIC (uint32_t)(0x58444E49) struct attr_indexalloc { struct fixuphdr ia_fixup; u_int64_t unknown1; cn_t ia_bufcn; u_int16_t ia_hdrsize; u_int16_t unknown2; - u_int32_t ia_inuse; - u_int32_t ia_allocated; + uint32_t ia_inuse; + uint32_t ia_allocated; }; #define NTFS_IEFLAG_SUBNODE 0x00000001 #define NTFS_IEFLAG_LAST 0x00000002 struct attr_indexentry { - u_int32_t ie_number; - u_int32_t unknown1; + uint32_t ie_number; + uint32_t unknown1; u_int16_t reclen; u_int16_t ie_size; - u_int32_t ie_flag;/* 1 - has subnodes, 2 - last */ - u_int32_t ie_fpnumber; - u_int32_t unknown2; + uint32_t ie_flag;/* 1 - has subnodes, 2 - last */ + uint32_t ie_fpnumber; + uint32_t unknown2; ntfs_times_t ie_ftimes; u_int64_t ie_fallocated; u_int64_t ie_fsize; @@ -182,7 +182,7 @@ /* cn_t ie_bufcn; buffer with subnodes */ }; -#define NTFS_FILEMAGIC (u_int32_t)(0x454C4946) +#define NTFS_FILEMAGIC (uint32_t)(0x454C4946) #define NTFS_FRFLAG_DIR 0x0002 struct filerec { struct fixuphdr fr_fixup; @@ -191,8 +191,8 @@ u_int16_t fr_nlink; u_int16_t fr_attroff; /* offset to attributes */ u_int16_t fr_flags; /* 1-nonresident attr, 2-directory */ - u_int32_t fr_size;/* hdr + attributes */ - u_int32_t fr_allocated; /* allocated length of record */ + uint32_t fr_size;/* hdr + attributes */ + uint32_t fr_allocated; /* allocated length of record */ u_int64_t fr_mainrec; /* main record */ u_int16_t fr_attrnum; /* maximum attr number + 1 ??? */ }; @@ -202,9 +202,9 @@ #define NTFS_ADFLAG_INDEX 0x0002 /* Attrib can be indexed */ struct attrdef { wchar ad_name[NTFS_ATTRNAME_MAXLEN]; - u_int32_t ad_type; - u_int32_t reserved1[2]; - u_int32_t ad_flag; + uint32_t ad_type; + uint32_t reserved1[2]; + uint32_t ad_flag; u_int64_t ad_minlen; u_int64_t ad_maxlen; /* -1 for nonlimited */ }; @@ -212,7 +212,7 @@ struct ntvattrdef { char ad_name[0x40]; int ad_namelen; - u_int32_t ad_type; + uint32_t ad_type; }; #define NTFS_BBID "NTFS " @@ -233,8 +233,8 @@ cn_t bf_mftmirrcn; /* $MFTMirr cn */ u_int8_t bf_mftrecsz; /* MFT record size (clust) */ /* 0xF6 inducates 1/4 */ - u_int32_t bf_ibsz; /* index buffer size */ - u_int32_t bf_volsn; /* volume ser. num. */ + uint32_t bf_ibsz; /* index buffer size */ + uint32_t bf_volsn; /* volume ser. num. */ }; #define NTFS_SYSNODESNUM 0x0B @@ -245,7 +245,7 @@ struct bufobj *ntm_bo; struct vnode *ntm_devvp; /* block device mounted vnode */ struct vnode *ntm_sysvn[NTFS_SYSNODESNUM]; - u_int32_t ntm_bpmftrec; + uint32_t ntm_bpmftrec; uid_t ntm_uid; gid_t ntm_gid; mode_t ntm_mode; diff --git a/src/include.new/fs/ntfs/ntfs_inode.h b/src/include.new/fs/ntfs/ntfs_inode.h index 62c4ca0..e2963d7 100644 --- a/src/include.new/fs/ntfs/ntfs_inode.h +++ b/src/include.new/fs/ntfs/ntfs_inode.h @@ -50,7 +50,7 @@ struct ntnode **i_prev; struct ntfsmount *i_mp; ino_t i_number; - u_int32_t i_flag; + uint32_t i_flag; /* locking */ struct lock i_lock; @@ -62,7 +62,7 @@ long i_nlink; /* MFR */ ino_t i_mainrec; /* MFR */ - u_int32_t i_frflag; /* MFR */ + uint32_t i_frflag; /* MFR */ }; #define FN_PRELOADED 0x0001 @@ -76,20 +76,20 @@ ntfs_times_t f_times; /* $NAME/dirinfo */ ino_t f_pnumber; /* $NAME/dirinfo */ - u_int32_t f_fflag; /* $NAME/dirinfo */ + uint32_t f_fflag; /* $NAME/dirinfo */ u_int64_t f_size; /* defattr/dirinfo: */ u_int64_t f_allocated; /* defattr/dirinfo */ - u_int32_t f_attrtype; + uint32_t f_attrtype; char *f_attrname; /* for ntreaddir */ - u_int32_t f_lastdattr; - u_int32_t f_lastdblnum; - u_int32_t f_lastdoff; - u_int32_t f_lastdnum; + uint32_t f_lastdattr; + uint32_t f_lastdblnum; + uint32_t f_lastdoff; + uint32_t f_lastdnum; caddr_t f_dirblbuf; - u_int32_t f_dirblsz; + uint32_t f_dirblsz; }; /* This overlays the fid structure (see ) */ diff --git a/src/include.new/fs/ntfs/ntfs_subr.h b/src/include.new/fs/ntfs/ntfs_subr.h index c4dd67a..250ba31 100644 --- a/src/include.new/fs/ntfs/ntfs_subr.h +++ b/src/include.new/fs/ntfs/ntfs_subr.h @@ -34,19 +34,19 @@ struct ntvattr { LIST_ENTRY(ntvattr) va_list; - u_int32_t va_vflag; + uint32_t va_vflag; struct vnode *va_vp; struct ntnode *va_ip; - u_int32_t va_flag; - u_int32_t va_type; + uint32_t va_flag; + uint32_t va_type; u_int8_t va_namelen; char va_name[NTFS_MAXATTRNAME]; - u_int32_t va_compression; - u_int32_t va_compressalg; - u_int32_t va_datalen; - u_int32_t va_allocated; + uint32_t va_compression; + uint32_t va_compressalg; + uint32_t va_datalen; + uint32_t va_allocated; cn_t va_vcnstart; cn_t va_vcnend; u_int16_t va_index; @@ -74,25 +74,25 @@ struct fnode; struct uio; -int ntfs_procfixups( struct ntfsmount *, u_int32_t, caddr_t, size_t ); +int ntfs_procfixups( struct ntfsmount *, uint32_t, caddr_t, size_t ); int ntfs_parserun( cn_t *, cn_t *, u_int8_t *, u_long, u_long *); int ntfs_runtocn( cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t); int ntfs_readntvattr_plain( struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *); -int ntfs_readattr_plain( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *,size_t *, struct uio *); -int ntfs_readattr( struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, struct uio *); +int ntfs_readattr_plain( struct ntfsmount *, struct ntnode *, uint32_t, char *, off_t, size_t, void *,size_t *, struct uio *); +int ntfs_readattr( struct ntfsmount *, struct ntnode *, uint32_t, char *, off_t, size_t, void *, struct uio *); int ntfs_filesize( struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *); int ntfs_times( struct ntfsmount *, struct ntnode *, ntfs_times_t *); struct timespec ntfs_nttimetounix( u_int64_t ); -int ntfs_ntreaddir( struct ntfsmount *, struct fnode *, u_int32_t, struct attr_indexentry **); +int ntfs_ntreaddir( struct ntfsmount *, struct fnode *, uint32_t, struct attr_indexentry **); int ntfs_runtovrun( cn_t **, cn_t **, u_long *, u_int8_t *); int ntfs_attrtontvattr( struct ntfsmount *, struct ntvattr **, struct attr * ); void ntfs_freentvattr( struct ntvattr * ); int ntfs_loadntvattrs( struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **); -struct ntvattr * ntfs_findntvattr( struct ntfsmount *, struct ntnode *, u_int32_t, cn_t ); +struct ntvattr * ntfs_findntvattr( struct ntfsmount *, struct ntnode *, uint32_t, cn_t ); int ntfs_ntlookupfile(struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **); int ntfs_isnamepermitted(struct ntfsmount *, struct attr_indexentry * ); int ntfs_ntvattrrele(struct ntvattr * ); -int ntfs_ntvattrget(struct ntfsmount *, struct ntnode *, u_int32_t, const char *, cn_t , struct ntvattr **); +int ntfs_ntvattrget(struct ntfsmount *, struct ntnode *, uint32_t, const char *, cn_t , struct ntvattr **); int ntfs_ntlookup(struct ntfsmount *, ino_t, struct ntnode **); int ntfs_ntget(struct ntnode *); void ntfs_ntref(struct ntnode *); @@ -100,7 +100,7 @@ void ntfs_ntput(struct ntnode *); int ntfs_loadntnode( struct ntfsmount *, struct ntnode * ); int ntfs_writentvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *); -int ntfs_writeattr_plain(struct ntfsmount *, struct ntnode *, u_int32_t, char *, off_t, size_t, void *, size_t *, struct uio *); +int ntfs_writeattr_plain(struct ntfsmount *, struct ntnode *, uint32_t, char *, off_t, size_t, void *, size_t *, struct uio *); void ntfs_toupper_init(void); void ntfs_toupper_destroy(void); int ntfs_toupper_use(struct mount *, struct ntfsmount *); diff --git a/src/include.new/fs/ntfs/ntfs_vfsops.h b/src/include.new/fs/ntfs/ntfs_vfsops.h index 09001e4..0081b91 100644 --- a/src/include.new/fs/ntfs/ntfs_vfsops.h +++ b/src/include.new/fs/ntfs/ntfs_vfsops.h @@ -39,5 +39,5 @@ struct thread; struct vnode; -int ntfs_vgetex(struct mount *, ino_t, u_int32_t, char *, u_long, u_long, +int ntfs_vgetex(struct mount *, ino_t, uint32_t, char *, u_long, u_long, struct thread *, struct vnode **); diff --git a/src/include.new/fs/nwfs/nwfs.h b/src/include.new/fs/nwfs/nwfs.h index 7700002..b963342 100644 --- a/src/include.new/fs/nwfs/nwfs.h +++ b/src/include.new/fs/nwfs/nwfs.h @@ -62,7 +62,7 @@ struct ncp_handle *connh; int name_space; struct nwnode *n_root; - u_int32_t n_volume; + uint32_t n_volume; ncpfid n_rootent; int n_id; }; diff --git a/src/include.new/fs/nwfs/nwfs_subr.h b/src/include.new/fs/nwfs/nwfs_subr.h index d1a7f28..d2f2654 100644 --- a/src/include.new/fs/nwfs/nwfs_subr.h +++ b/src/include.new/fs/nwfs/nwfs_subr.h @@ -59,31 +59,31 @@ int ncp_lookup(struct vnode *dvp, int len, char *name, struct nw_entry_info *fap, struct thread *td, struct ucred *cred); int ncp_lookup_volume(struct ncp_conn *conn, char *volname, - u_char *volNum, u_int32_t *dirEnt, + u_char *volNum, uint32_t *dirEnt, struct thread *td, struct ucred *cred); int ncp_close_file(struct ncp_conn *conn, ncp_fh *fh, struct thread *td, struct ucred *cred); int ncp_open_create_file_or_subdir(struct nwmount *nmp,struct vnode *dvp, int namelen,char *name, - int open_create_mode, u_int32_t create_attributes, + int open_create_mode, uint32_t create_attributes, int desired_acc_rights, struct ncp_open_info *nop, struct thread *td, struct ucred *cred); int ncp_DeleteNSEntry(struct nwmount *nmp, - u_int32_t dirent, int namelen, char *name, + uint32_t dirent, int namelen, char *name, struct thread *td, struct ucred *cred); int ncp_nsrename(struct ncp_conn *conn, int volume, int ns, int oldtype, struct ncp_nlstables *nt, nwdirent fdir, char *old_name, int oldlen, nwdirent tdir, char *new_name, int newlen, struct thread *td, struct ucred *cred); -int ncp_obtain_info(struct nwmount *nmp, u_int32_t dirent, +int ncp_obtain_info(struct nwmount *nmp, uint32_t dirent, int namelen, char *path, struct nw_entry_info *target, struct thread *td, struct ucred *cred); int ncp_modify_file_or_subdir_dos_info(struct nwmount *nmp, struct vnode *vp, - u_int32_t info_mask, + uint32_t info_mask, struct nw_modify_dos_info *info, struct thread *td, struct ucred *cred); int ncp_setattr(struct vnode *,struct vattr *,struct ucred *,struct thread *td); -int ncp_get_namespaces(struct ncp_conn *conn, u_int32_t volume, int *nsf, +int ncp_get_namespaces(struct ncp_conn *conn, uint32_t volume, int *nsf, struct thread *td, struct ucred *cred); int ncp_get_volume_info_with_number(struct ncp_conn *conn, int n, struct ncp_volume_info *target, diff --git a/src/include.new/fs/smbfs/smbfs_node.h b/src/include.new/fs/smbfs/smbfs_node.h index df37a2d..3cc5e7a 100644 --- a/src/include.new/fs/smbfs/smbfs_node.h +++ b/src/include.new/fs/smbfs/smbfs_node.h @@ -89,7 +89,7 @@ int smbfs_reclaim(struct vop_reclaim_args *); int smbfs_nget(struct mount *mp, struct vnode *dvp, const char *name, int nmlen, struct smbfattr *fap, struct vnode **vpp); -u_int32_t smbfs_hash(const u_char *name, int nmlen); +uint32_t smbfs_hash(const u_char *name, int nmlen); int smbfs_getpages(struct vop_getpages_args *); int smbfs_putpages(struct vop_putpages_args *); diff --git a/src/include.new/machine/apicreg.h b/src/include.new/machine/apicreg.h index b7ff0a5..9f9183d 100644 --- a/src/include.new/machine/apicreg.h +++ b/src/include.new/machine/apicreg.h @@ -127,45 +127,45 @@ struct LAPIC { /* reserved */ PAD4; /* reserved */ PAD4; - u_int32_t id; PAD3; - u_int32_t version; PAD3; + uint32_t id; PAD3; + uint32_t version; PAD3; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; - u_int32_t tpr; PAD3; - u_int32_t apr; PAD3; - u_int32_t ppr; PAD3; - u_int32_t eoi; PAD3; + uint32_t tpr; PAD3; + uint32_t apr; PAD3; + uint32_t ppr; PAD3; + uint32_t eoi; PAD3; /* reserved */ PAD4; - u_int32_t ldr; PAD3; - u_int32_t dfr; PAD3; - u_int32_t svr; PAD3; - u_int32_t isr0; PAD3; - u_int32_t isr1; PAD3; - u_int32_t isr2; PAD3; - u_int32_t isr3; PAD3; - u_int32_t isr4; PAD3; - u_int32_t isr5; PAD3; - u_int32_t isr6; PAD3; - u_int32_t isr7; PAD3; - u_int32_t tmr0; PAD3; - u_int32_t tmr1; PAD3; - u_int32_t tmr2; PAD3; - u_int32_t tmr3; PAD3; - u_int32_t tmr4; PAD3; - u_int32_t tmr5; PAD3; - u_int32_t tmr6; PAD3; - u_int32_t tmr7; PAD3; - u_int32_t irr0; PAD3; - u_int32_t irr1; PAD3; - u_int32_t irr2; PAD3; - u_int32_t irr3; PAD3; - u_int32_t irr4; PAD3; - u_int32_t irr5; PAD3; - u_int32_t irr6; PAD3; - u_int32_t irr7; PAD3; - u_int32_t esr; PAD3; + uint32_t ldr; PAD3; + uint32_t dfr; PAD3; + uint32_t svr; PAD3; + uint32_t isr0; PAD3; + uint32_t isr1; PAD3; + uint32_t isr2; PAD3; + uint32_t isr3; PAD3; + uint32_t isr4; PAD3; + uint32_t isr5; PAD3; + uint32_t isr6; PAD3; + uint32_t isr7; PAD3; + uint32_t tmr0; PAD3; + uint32_t tmr1; PAD3; + uint32_t tmr2; PAD3; + uint32_t tmr3; PAD3; + uint32_t tmr4; PAD3; + uint32_t tmr5; PAD3; + uint32_t tmr6; PAD3; + uint32_t tmr7; PAD3; + uint32_t irr0; PAD3; + uint32_t irr1; PAD3; + uint32_t irr2; PAD3; + uint32_t irr3; PAD3; + uint32_t irr4; PAD3; + uint32_t irr5; PAD3; + uint32_t irr6; PAD3; + uint32_t irr7; PAD3; + uint32_t esr; PAD3; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; @@ -173,21 +173,21 @@ /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; - u_int32_t icr_lo; PAD3; - u_int32_t icr_hi; PAD3; - u_int32_t lvt_timer; PAD3; - u_int32_t lvt_thermal; PAD3; - u_int32_t lvt_pcint; PAD3; - u_int32_t lvt_lint0; PAD3; - u_int32_t lvt_lint1; PAD3; - u_int32_t lvt_error; PAD3; - u_int32_t icr_timer; PAD3; - u_int32_t ccr_timer; PAD3; + uint32_t icr_lo; PAD3; + uint32_t icr_hi; PAD3; + uint32_t lvt_timer; PAD3; + uint32_t lvt_thermal; PAD3; + uint32_t lvt_pcint; PAD3; + uint32_t lvt_lint0; PAD3; + uint32_t lvt_lint1; PAD3; + uint32_t lvt_error; PAD3; + uint32_t icr_timer; PAD3; + uint32_t ccr_timer; PAD3; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; - u_int32_t dcr_timer; PAD3; + uint32_t dcr_timer; PAD3; /* reserved */ PAD4; }; @@ -198,8 +198,8 @@ */ struct IOAPIC { - u_int32_t ioregsel; PAD3; - u_int32_t iowin; PAD3; + uint32_t ioregsel; PAD3; + uint32_t iowin; PAD3; }; typedef struct IOAPIC ioapic_t; diff --git a/src/include.new/machine/apicvar.h b/src/include.new/machine/apicvar.h index e58aacd..90eaafa 100644 --- a/src/include.new/machine/apicvar.h +++ b/src/include.new/machine/apicvar.h @@ -207,7 +207,7 @@ void lapic_reenable_pmc(void); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); -int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); +int lapic_set_lvt_mode(u_int apic_id, u_int lvt, uint32_t mode); int lapic_set_lvt_polarity(u_int apic_id, u_int lvt, enum intr_polarity pol); int lapic_set_lvt_triggermode(u_int apic_id, u_int lvt, diff --git a/src/include.new/machine/bootinfo.h b/src/include.new/machine/bootinfo.h index ca18b3a..64fa46d 100644 --- a/src/include.new/machine/bootinfo.h +++ b/src/include.new/machine/bootinfo.h @@ -46,25 +46,25 @@ * normal value. */ struct bootinfo { - u_int32_t bi_version; - u_int32_t bi_kernelname; /* represents a char * */ - u_int32_t bi_nfs_diskless; /* struct nfs_diskless * */ + uint32_t bi_version; + uint32_t bi_kernelname; /* represents a char * */ + uint32_t bi_nfs_diskless; /* struct nfs_diskless * */ /* End of fields that are always present. */ #define bi_endcommon bi_n_bios_used - u_int32_t bi_n_bios_used; - u_int32_t bi_bios_geom[N_BIOS_GEOM]; - u_int32_t bi_size; + uint32_t bi_n_bios_used; + uint32_t bi_bios_geom[N_BIOS_GEOM]; + uint32_t bi_size; u_int8_t bi_memsizes_valid; u_int8_t bi_bios_dev; /* bootdev BIOS unit number */ u_int8_t bi_pad[2]; - u_int32_t bi_basemem; - u_int32_t bi_extmem; - u_int32_t bi_symtab; /* struct symtab * */ - u_int32_t bi_esymtab; /* struct symtab * */ + uint32_t bi_basemem; + uint32_t bi_extmem; + uint32_t bi_symtab; /* struct symtab * */ + uint32_t bi_esymtab; /* struct symtab * */ /* Items below only from advanced bootloader */ - u_int32_t bi_kernend; /* end of kernel space */ - u_int32_t bi_envp; /* environment */ - u_int32_t bi_modulep; /* preloaded modules */ + uint32_t bi_kernend; /* end of kernel space */ + uint32_t bi_envp; /* environment */ + uint32_t bi_modulep; /* preloaded modules */ uint32_t bi_memdesc_version; /* EFI memory desc version */ uint64_t bi_memdesc_size; /* sizeof EFI memory desc */ uint64_t bi_memmap; /* pa of EFI memory map */ diff --git a/src/include.new/machine/elan_mmcr.h b/src/include.new/machine/elan_mmcr.h index 0dcae87..10cdb9a 100644 --- a/src/include.new/machine/elan_mmcr.h +++ b/src/include.new/machine/elan_mmcr.h @@ -54,8 +54,8 @@ u_int8_t ECCSTA; u_int8_t ECCCKBPOS; u_int8_t ECCCKTEST; - u_int32_t ECCSBADD; - u_int32_t ECCMBADD; + uint32_t ECCSBADD; + uint32_t ECCMBADD; u_int8_t pad_0x02c[0x14]; /* SDRAM Buffer */ @@ -76,34 +76,34 @@ u_int16_t HBMSTIRQCTL; u_int16_t HBMSTIRQSTA; u_int8_t pad_0x06a[0x2]; - u_int32_t MSTINTADD; + uint32_t MSTINTADD; /* System Arbitration */ u_int8_t SYSARBCTL; u_int8_t PCIARBSTA; u_int16_t SYSARBMENB; - u_int32_t ARBPRICTL; + uint32_t ARBPRICTL; u_int8_t pad_0x078[0x8]; /* System Address Mapping */ - u_int32_t ADDDECCTL; - u_int32_t WPVSTA; - u_int32_t PAR0; - u_int32_t PAR1; - u_int32_t PAR2; - u_int32_t PAR3; - u_int32_t PAR4; - u_int32_t PAR5; - u_int32_t PAR6; - u_int32_t PAR7; - u_int32_t PAR8; - u_int32_t PAR9; - u_int32_t PAR10; - u_int32_t PAR11; - u_int32_t PAR12; - u_int32_t PAR13; - u_int32_t PAR14; - u_int32_t PAR15; + uint32_t ADDDECCTL; + uint32_t WPVSTA; + uint32_t PAR0; + uint32_t PAR1; + uint32_t PAR2; + uint32_t PAR3; + uint32_t PAR4; + uint32_t PAR5; + uint32_t PAR6; + uint32_t PAR7; + uint32_t PAR8; + uint32_t PAR9; + uint32_t PAR10; + uint32_t PAR11; + uint32_t PAR12; + uint32_t PAR13; + uint32_t PAR14; + uint32_t PAR15; u_int8_t pad_0x0c8[0xb38]; /* GP Bus Controller */ diff --git a/src/include.new/machine/i4b_ioctl.h b/src/include.new/machine/i4b_ioctl.h index 8af1c8b..3eafc6f 100644 --- a/src/include.new/machine/i4b_ioctl.h +++ b/src/include.new/machine/i4b_ioctl.h @@ -731,7 +731,7 @@ *---------------------------------------------------------------------------*/ struct isdn_diagnostic_request { int controller; /* controller number */ - u_int32_t cmd; /* diagnostic command to execute */ + uint32_t cmd; /* diagnostic command to execute */ size_t in_param_len; /* length of additional input parameter */ #define I4B_ACTIVE_DIAGNOSTIC_MAXPARAMLEN 65536 void *in_param; /* optional input parameter */ diff --git a/src/include.new/machine/in_cksum.h b/src/include.new/machine/in_cksum.h index 3fdb024..15e3b93 100644 --- a/src/include.new/machine/in_cksum.h +++ b/src/include.new/machine/in_cksum.h @@ -68,11 +68,11 @@ "adcl %5, %0\n" "adcl $0, %0" : "+r" (sum) - : "g" (((const u_int32_t *)ip)[0]), - "g" (((const u_int32_t *)ip)[1]), - "g" (((const u_int32_t *)ip)[2]), - "g" (((const u_int32_t *)ip)[3]), - "g" (((const u_int32_t *)ip)[4]) + : "g" (((const uint32_t *)ip)[0]), + "g" (((const uint32_t *)ip)[1]), + "g" (((const uint32_t *)ip)[2]), + "g" (((const uint32_t *)ip)[3]), + "g" (((const uint32_t *)ip)[4]) : "cc" ); sum = (sum & 0xffff) + (sum >> 16); diff --git a/src/include.new/machine/legacyvar.h b/src/include.new/machine/legacyvar.h index 97bd6ef..8d51d3b 100644 --- a/src/include.new/machine/legacyvar.h +++ b/src/include.new/machine/legacyvar.h @@ -46,7 +46,7 @@ int legacy_pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result); void legacy_pcib_write_config(device_t dev, int bus, int slot, int func, - int reg, u_int32_t data, int bytes); + int reg, uint32_t data, int bytes); int legacy_pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value); struct resource *legacy_pcib_alloc_resource(device_t dev, device_t child, diff --git a/src/include.new/machine/mptable.h b/src/include.new/machine/mptable.h index 9b218a3..741597a 100644 --- a/src/include.new/machine/mptable.h +++ b/src/include.new/machine/mptable.h @@ -41,7 +41,7 @@ /* MP Floating Pointer Structure */ typedef struct MPFPS { char signature[4]; - u_int32_t pap; + uint32_t pap; u_char length; u_char spec_rev; u_char checksum; @@ -63,10 +63,10 @@ u_char checksum; u_char oem_id[8]; u_char product_id[12]; - u_int32_t oem_table_pointer; + uint32_t oem_table_pointer; u_short oem_table_size; u_short entry_count; - u_int32_t apic_address; + uint32_t apic_address; u_short extended_table_length; u_char extended_table_checksum; u_char reserved; @@ -103,7 +103,7 @@ u_char apic_id; u_char apic_version; u_char apic_flags; - u_int32_t apic_address; + uint32_t apic_address; } *io_apic_entry_ptr; #define IOAPICENTRY_FLAG_EN 0x01 diff --git a/src/include.new/machine/pc/bios.h b/src/include.new/machine/pc/bios.h index f62bb56..7939085 100644 --- a/src/include.new/machine/pc/bios.h +++ b/src/include.new/machine/pc/bios.h @@ -36,7 +36,7 @@ struct bios32_SDheader { u_int8_t sig[4]; - u_int32_t entry; + uint32_t entry; u_int8_t revision; u_int8_t len; u_int8_t cksum; @@ -53,14 +53,14 @@ u_int8_t len; /* total structure length */ u_int16_t control; /* BIOS feature flags */ u_int8_t cksum; /* checksum */ - u_int32_t evflagaddr; /* address of event notificaton flag */ + uint32_t evflagaddr; /* address of event notificaton flag */ u_int16_t rmentryoffset; /* real-mode entry offset */ u_int16_t rmentryseg; /* segment */ u_int16_t pmentryoffset; /* protected-mode entry offset */ - u_int32_t pmentrybase; /* segment base */ - u_int32_t oemdevid; /* motherboard EISA ID */ + uint32_t pmentrybase; /* segment base */ + uint32_t oemdevid; /* motherboard EISA ID */ u_int16_t rmbiosseg; /* real-mode BIOS segment */ - u_int32_t pmdataseg; /* protected-mode data segment */ + uint32_t pmdataseg; /* protected-mode data segment */ } __packed; /* @@ -173,7 +173,7 @@ u_int16_t ph_pci_irqs; u_int16_t ph_router_vendor; u_int16_t ph_router_device; - u_int32_t ph_miniport; + uint32_t ph_miniport; u_int8_t ph_res[11]; u_int8_t ph_checksum; } __packed; @@ -218,15 +218,15 @@ struct bios_smap { u_int64_t base; u_int64_t length; - u_int32_t type; + uint32_t type; } __packed; /* Structure extended to include extended attribute field in ACPI 3.0. */ struct bios_smap_xattr { u_int64_t base; u_int64_t length; - u_int32_t type; - u_int32_t xattr; + uint32_t type; + uint32_t xattr; } __packed; /* @@ -323,11 +323,11 @@ union { u_int8_t name[4]; /* service identifier */ - u_int32_t id; /* as a 32-bit value */ + uint32_t id; /* as a 32-bit value */ } ident; - u_int32_t base; /* base of service */ - u_int32_t len; /* service length */ - u_int32_t entry; /* entrypoint offset from base */ + uint32_t base; /* base of service */ + uint32_t len; /* service length */ + uint32_t entry; /* entrypoint offset from base */ vm_offset_t ventry; /* entrypoint in kernel virtual segment */ }; diff --git a/src/include.new/machine/pc/vesa.h b/src/include.new/machine/pc/vesa.h index 31a8b8e..20851c0 100644 --- a/src/include.new/machine/pc/vesa.h +++ b/src/include.new/machine/pc/vesa.h @@ -34,18 +34,18 @@ /* mandatory fields */ u_int8_t v_sig[4] __packed; /* VESA */ u_int16_t v_version __packed; /* ver in BCD */ - u_int32_t v_oemstr __packed; /* OEM string */ - u_int32_t v_flags __packed; /* flags */ + uint32_t v_oemstr __packed; /* OEM string */ + uint32_t v_flags __packed; /* flags */ #define V_DAC8 (1<<0) #define V_NONVGA (1<<1) #define V_SNOW (1<<2) - u_int32_t v_modetable __packed; /* modes */ + uint32_t v_modetable __packed; /* modes */ u_int16_t v_memsize __packed; /* in 64K */ /* 2.0 */ u_int16_t v_revision __packed; /* software rev */ - u_int32_t v_venderstr __packed; /* vender */ - u_int32_t v_prodstr __packed; /* product name */ - u_int32_t v_revstr __packed; /* product rev */ + uint32_t v_venderstr __packed; /* vender */ + uint32_t v_prodstr __packed; /* product name */ + uint32_t v_revstr __packed; /* product rev */ }; struct vesa_mode @@ -70,7 +70,7 @@ u_int16_t v_wsize; u_int16_t v_waseg; u_int16_t v_wbseg; - u_int32_t v_posfunc; + uint32_t v_posfunc; u_int16_t v_bpscanline; /* fields optional for 1.0/1.1 implementations */ u_int16_t v_width; @@ -103,8 +103,8 @@ u_int8_t v_resfieldpos; u_int8_t v_dircolormode; /* 2.0 implementations */ - u_int32_t v_lfb; - u_int32_t v_offscreen; + uint32_t v_lfb; + uint32_t v_offscreen; u_int16_t v_offscreensize; }; diff --git a/src/include.new/machine/runq.h b/src/include.new/machine/runq.h index 3747b34..25adc41 100644 --- a/src/include.new/machine/runq.h +++ b/src/include.new/machine/runq.h @@ -41,6 +41,6 @@ /* * Type of run queue status word. */ -typedef u_int32_t rqb_word_t; +typedef uint32_t rqb_word_t; #endif diff --git a/src/include.new/machine/smapi.h b/src/include.new/machine/smapi.h index 5d91050..5a1215c 100644 --- a/src/include.new/machine/smapi.h +++ b/src/include.new/machine/smapi.h @@ -52,10 +52,10 @@ u_int16_t reserved2; u_int16_t prot16_offset; - u_int32_t prot16_segment; + uint32_t prot16_segment; - u_int32_t prot32_offset; - u_int32_t prot32_segment; + uint32_t prot32_offset; + uint32_t prot32_segment; } __packed; @@ -75,8 +75,8 @@ u_int16_t param2; u_int16_t param3; - u_int32_t param4; - u_int32_t param5; + uint32_t param4; + uint32_t param5; } __packed; diff --git a/src/include.new/md4.h b/src/include.new/md4.h index d47f4ba..414d2b8 100644 --- a/src/include.new/md4.h +++ b/src/include.new/md4.h @@ -27,8 +27,8 @@ #define _MD4_H_ /* MD4 context. */ typedef struct MD4Context { - u_int32_t state[4]; /* state (ABCD) */ - u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ + uint32_t state[4]; /* state (ABCD) */ + uint32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ unsigned char buffer[64]; /* input buffer */ } MD4_CTX; diff --git a/src/include.new/net/bpf.h b/src/include.new/net/bpf.h index e024d7f..7ce0080 100644 --- a/src/include.new/net/bpf.h +++ b/src/include.new/net/bpf.h @@ -44,7 +44,7 @@ #define BPF_RELEASE 199606 typedef int32_t bpf_int32; -typedef u_int32_t bpf_u_int32; +typedef uint32_t bpf_u_int32; typedef int64_t bpf_int64; typedef u_int64_t bpf_u_int64; @@ -945,11 +945,11 @@ * u_int8_t dli_version; * u_int8_t dli_family; * u_int16_t dli_htype; - * u_int32_t dli_pktlen; - * u_int32_t dli_ifindex; - * u_int32_t dli_grifindex; - * u_int32_t dli_zsrc; - * u_int32_t dli_zdst; + * uint32_t dli_pktlen; + * uint32_t dli_ifindex; + * uint32_t dli_grifindex; + * uint32_t dli_zsrc; + * uint32_t dli_zdst; * }; * * dli_version is 2 for the current version of the pseudo-header. diff --git a/src/include.new/net/ieee8023ad_lacp.h b/src/include.new/net/ieee8023ad_lacp.h index 24fa5e9..c13a3b9 100644 --- a/src/include.new/net/ieee8023ad_lacp.h +++ b/src/include.new/net/ieee8023ad_lacp.h @@ -244,12 +244,12 @@ LIST_HEAD(, lacp_port) lsc_ports; struct lacp_portmap lsc_pmap[2]; volatile u_int lsc_activemap; - u_int32_t lsc_hashkey; + uint32_t lsc_hashkey; struct { - u_int32_t lsc_rx_test; - u_int32_t lsc_tx_test; + uint32_t lsc_rx_test; + uint32_t lsc_tx_test; } lsc_debug; - u_int32_t lsc_strict_mode; + uint32_t lsc_strict_mode; }; #define LACP_TYPE_ACTORINFO 1 diff --git a/src/include.new/net/if_lagg.h b/src/include.new/net/if_lagg.h index 5fcf523..bc1fdb8 100644 --- a/src/include.new/net/if_lagg.h +++ b/src/include.new/net/if_lagg.h @@ -97,8 +97,8 @@ struct lagg_reqport { char rp_ifname[IFNAMSIZ]; /* name of the lagg */ char rp_portname[IFNAMSIZ]; /* name of the port */ - u_int32_t rp_prio; /* port priority */ - u_int32_t rp_flags; /* port flags */ + uint32_t rp_prio; /* port priority */ + uint32_t rp_flags; /* port flags */ union { struct lacp_opreq rpsc_lacp; } rp_psc; @@ -169,7 +169,7 @@ /* Private data used by the loadbalancing protocol */ struct lagg_lb { - u_int32_t lb_key; + uint32_t lb_key; struct lagg_port *lb_ports[LAGG_MAX_PORTS]; }; diff --git a/src/include.new/net/if_mib.h b/src/include.new/net/if_mib.h index 0a45a56..b128ae4 100644 --- a/src/include.new/net/if_mib.h +++ b/src/include.new/net/if_mib.h @@ -84,25 +84,25 @@ /* For IFT_ETHER, IFT_ISO88023, and IFT_STARLAN, as used by RFC 1650 */ struct ifmib_iso_8802_3 { - u_int32_t dot3StatsAlignmentErrors; - u_int32_t dot3StatsFCSErrors; - u_int32_t dot3StatsSingleCollisionFrames; - u_int32_t dot3StatsMultipleCollisionFrames; - u_int32_t dot3StatsSQETestErrors; - u_int32_t dot3StatsDeferredTransmissions; - u_int32_t dot3StatsLateCollisions; - u_int32_t dot3StatsExcessiveCollisions; - u_int32_t dot3StatsInternalMacTransmitErrors; - u_int32_t dot3StatsCarrierSenseErrors; - u_int32_t dot3StatsFrameTooLongs; - u_int32_t dot3StatsInternalMacReceiveErrors; - u_int32_t dot3StatsEtherChipSet; + uint32_t dot3StatsAlignmentErrors; + uint32_t dot3StatsFCSErrors; + uint32_t dot3StatsSingleCollisionFrames; + uint32_t dot3StatsMultipleCollisionFrames; + uint32_t dot3StatsSQETestErrors; + uint32_t dot3StatsDeferredTransmissions; + uint32_t dot3StatsLateCollisions; + uint32_t dot3StatsExcessiveCollisions; + uint32_t dot3StatsInternalMacTransmitErrors; + uint32_t dot3StatsCarrierSenseErrors; + uint32_t dot3StatsFrameTooLongs; + uint32_t dot3StatsInternalMacReceiveErrors; + uint32_t dot3StatsEtherChipSet; /* Matt Thomas wants this one, not included in RFC 1650: */ - u_int32_t dot3StatsMissedFrames; + uint32_t dot3StatsMissedFrames; - u_int32_t dot3StatsCollFrequencies[16]; /* NB: index origin */ + uint32_t dot3StatsCollFrequencies[16]; /* NB: index origin */ - u_int32_t dot3Compliance; + uint32_t dot3Compliance; #define DOT3COMPLIANCE_STATS 1 #define DOT3COMPLIANCE_COLLS 2 }; diff --git a/src/include.new/net/if_pflog.h b/src/include.new/net/if_pflog.h index 0faeb7d..64c0462 100644 --- a/src/include.new/net/if_pflog.h +++ b/src/include.new/net/if_pflog.h @@ -38,8 +38,8 @@ u_int8_t reason; char ifname[IFNAMSIZ]; char ruleset[PFLOG_RULESET_NAME_SIZE]; - u_int32_t rulenr; - u_int32_t subrulenr; + uint32_t rulenr; + uint32_t subrulenr; uid_t uid; pid_t pid; uid_t rule_uid; diff --git a/src/include.new/net/if_pfsync.h b/src/include.new/net/if_pfsync.h index f53043e..8a2993d 100644 --- a/src/include.new/net/if_pfsync.h +++ b/src/include.new/net/if_pfsync.h @@ -120,7 +120,7 @@ struct pfsync_clr { char ifname[IFNAMSIZ]; - u_int32_t creatorid; + uint32_t creatorid; } __packed; /* @@ -135,7 +135,7 @@ struct pfsync_ins_ack { u_int64_t id; - u_int32_t creatorid; + uint32_t creatorid; } __packed; /* @@ -146,8 +146,8 @@ u_int64_t id; struct pfsync_state_peer src; struct pfsync_state_peer dst; - u_int32_t creatorid; - u_int32_t expire; + uint32_t creatorid; + uint32_t expire; u_int8_t timeout; u_int8_t _pad[3]; } __packed; @@ -158,7 +158,7 @@ struct pfsync_upd_req { u_int64_t id; - u_int32_t creatorid; + uint32_t creatorid; } __packed; /* @@ -167,7 +167,7 @@ struct pfsync_del_c { u_int64_t id; - u_int32_t creatorid; + uint32_t creatorid; } __packed; /* @@ -181,8 +181,8 @@ */ struct pfsync_bus { - u_int32_t creatorid; - u_int32_t endtime; + uint32_t creatorid; + uint32_t endtime; u_int8_t status; #define PFSYNC_BUS_START 1 #define PFSYNC_BUS_END 2 @@ -194,9 +194,9 @@ */ struct pfsync_tdb { - u_int32_t spi; + uint32_t spi; union sockaddr_union dst; - u_int32_t rpl; + uint32_t rpl; u_int64_t cur_bytes; u_int8_t sproto; u_int8_t updates; diff --git a/src/include.new/net/pfkeyv2.h b/src/include.new/net/pfkeyv2.h index 7bafe9d..0f3868f 100644 --- a/src/include.new/net/pfkeyv2.h +++ b/src/include.new/net/pfkeyv2.h @@ -84,8 +84,8 @@ u_int8_t sadb_msg_satype; u_int16_t sadb_msg_len; u_int16_t sadb_msg_reserved; - u_int32_t sadb_msg_seq; - u_int32_t sadb_msg_pid; + uint32_t sadb_msg_seq; + uint32_t sadb_msg_pid; }; struct sadb_ext { @@ -96,18 +96,18 @@ struct sadb_sa { u_int16_t sadb_sa_len; u_int16_t sadb_sa_exttype; - u_int32_t sadb_sa_spi; + uint32_t sadb_sa_spi; u_int8_t sadb_sa_replay; u_int8_t sadb_sa_state; u_int8_t sadb_sa_auth; u_int8_t sadb_sa_encrypt; - u_int32_t sadb_sa_flags; + uint32_t sadb_sa_flags; }; struct sadb_lifetime { u_int16_t sadb_lifetime_len; u_int16_t sadb_lifetime_exttype; - u_int32_t sadb_lifetime_allocations; + uint32_t sadb_lifetime_allocations; u_int64_t sadb_lifetime_bytes; u_int64_t sadb_lifetime_addtime; u_int64_t sadb_lifetime_usetime; @@ -139,12 +139,12 @@ struct sadb_sens { u_int16_t sadb_sens_len; u_int16_t sadb_sens_exttype; - u_int32_t sadb_sens_dpd; + uint32_t sadb_sens_dpd; u_int8_t sadb_sens_sens_level; u_int8_t sadb_sens_sens_len; u_int8_t sadb_sens_integ_level; u_int8_t sadb_sens_integ_len; - u_int32_t sadb_sens_reserved; + uint32_t sadb_sens_reserved; }; struct sadb_prop { @@ -162,9 +162,9 @@ u_int16_t sadb_comb_auth_maxbits; u_int16_t sadb_comb_encrypt_minbits; u_int16_t sadb_comb_encrypt_maxbits; - u_int32_t sadb_comb_reserved; - u_int32_t sadb_comb_soft_allocations; - u_int32_t sadb_comb_hard_allocations; + uint32_t sadb_comb_reserved; + uint32_t sadb_comb_soft_allocations; + uint32_t sadb_comb_hard_allocations; u_int64_t sadb_comb_soft_bytes; u_int64_t sadb_comb_hard_bytes; u_int64_t sadb_comb_soft_addtime; @@ -176,7 +176,7 @@ struct sadb_supported { u_int16_t sadb_supported_len; u_int16_t sadb_supported_exttype; - u_int32_t sadb_supported_reserved; + uint32_t sadb_supported_reserved; }; struct sadb_alg { @@ -190,15 +190,15 @@ struct sadb_spirange { u_int16_t sadb_spirange_len; u_int16_t sadb_spirange_exttype; - u_int32_t sadb_spirange_min; - u_int32_t sadb_spirange_max; - u_int32_t sadb_spirange_reserved; + uint32_t sadb_spirange_min; + uint32_t sadb_spirange_max; + uint32_t sadb_spirange_reserved; }; struct sadb_x_kmprivate { u_int16_t sadb_x_kmprivate_len; u_int16_t sadb_x_kmprivate_exttype; - u_int32_t sadb_x_kmprivate_reserved; + uint32_t sadb_x_kmprivate_reserved; }; /* @@ -213,8 +213,8 @@ u_int8_t sadb_x_sa2_mode; u_int8_t sadb_x_sa2_reserved1; u_int16_t sadb_x_sa2_reserved2; - u_int32_t sadb_x_sa2_sequence; /* lowermost 32bit of sequence number */ - u_int32_t sadb_x_sa2_reqid; + uint32_t sadb_x_sa2_sequence; /* lowermost 32bit of sequence number */ + uint32_t sadb_x_sa2_reqid; }; /* XXX Policy Extension */ @@ -225,8 +225,8 @@ u_int16_t sadb_x_policy_type; /* See policy type of ipsec.h */ u_int8_t sadb_x_policy_dir; /* direction, see ipsec.h */ u_int8_t sadb_x_policy_reserved; - u_int32_t sadb_x_policy_id; - u_int32_t sadb_x_policy_reserved2; + uint32_t sadb_x_policy_id; + uint32_t sadb_x_policy_reserved2; }; /* * When policy_type == IPSEC, it is followed by some of @@ -401,7 +401,7 @@ #define SADB_KEY_FLAGS_MAX 0x0fff /* SPI size for PF_KEYv2 */ -#define PFKEY_SPI_SIZE sizeof(u_int32_t) +#define PFKEY_SPI_SIZE sizeof(uint32_t) /* Identifier for menber of lifetime structure */ #define SADB_X_LIFETIME_ALLOCATIONS 0 diff --git a/src/include.new/net/pfvar.h b/src/include.new/net/pfvar.h index 3f2fc8b..3b26ae7 100644 --- a/src/include.new/net/pfvar.h +++ b/src/include.new/net/pfvar.h @@ -52,7 +52,7 @@ struct in6_addr v6; u_int8_t addr8[16]; u_int16_t addr16[8]; - u_int32_t addr32[4]; + uint32_t addr32[4]; } pfa; /* 128-bit address */ #define v4 pfa.v4 #define v6 pfa.v6 @@ -346,7 +346,7 @@ union { u_int8_t key8[16]; u_int16_t key16[8]; - u_int32_t key32[4]; + uint32_t key32[4]; } pfk; /* 128-bit hash key */ #define key8 pfk.key8 #define key16 pfk.key16 @@ -365,7 +365,7 @@ /* A packed Operating System description for fingerprinting */ -typedef u_int32_t pf_osfp_t; +typedef uint32_t pf_osfp_t; #define PF_OSFP_ANY ((pf_osfp_t)0) #define PF_OSFP_UNKNOWN ((pf_osfp_t)-1) #define PF_OSFP_NOMATCH ((pf_osfp_t)-2) @@ -468,7 +468,7 @@ union pf_rule_ptr { struct pf_rule *ptr; - u_int32_t nr; + uint32_t nr; }; #define PF_ANCHOR_NAME_SIZE 64 @@ -511,20 +511,20 @@ pf_osfp_t os_fingerprint; int rtableid; - u_int32_t timeout[PFTM_MAX]; - u_int32_t max_states; - u_int32_t max_src_nodes; - u_int32_t max_src_states; - u_int32_t max_src_conn; + uint32_t timeout[PFTM_MAX]; + uint32_t max_states; + uint32_t max_src_nodes; + uint32_t max_src_states; + uint32_t max_src_conn; struct { - u_int32_t limit; - u_int32_t seconds; + uint32_t limit; + uint32_t seconds; } max_src_conn_rate; - u_int32_t qid; - u_int32_t pqid; - u_int32_t rt_listid; - u_int32_t nr; - u_int32_t prob; + uint32_t qid; + uint32_t pqid; + uint32_t rt_listid; + uint32_t nr; + uint32_t prob; uid_t cuid; pid_t cpid; @@ -542,7 +542,7 @@ struct pf_rule_uid uid; struct pf_rule_gid gid; - u_int32_t rule_flag; + uint32_t rule_flag; u_int8_t action; u_int8_t direction; u_int8_t log; @@ -614,12 +614,12 @@ struct pf_threshold { - u_int32_t limit; + uint32_t limit; #define PF_THRESHOLD_MULT 1000 #define PF_THRESHOLD_MAX 0xffffffff / PF_THRESHOLD_MULT - u_int32_t seconds; - u_int32_t count; - u_int32_t last; + uint32_t seconds; + uint32_t count; + uint32_t last; }; struct pf_src_node { @@ -630,11 +630,11 @@ struct pfi_kif *kif; u_int64_t bytes[2]; u_int64_t packets[2]; - u_int32_t states; - u_int32_t conn; + uint32_t states; + uint32_t conn; struct pf_threshold conn_rate; - u_int32_t creation; - u_int32_t expire; + uint32_t creation; + uint32_t expire; sa_family_t af; u_int8_t ruletype; }; @@ -643,9 +643,9 @@ struct pf_state_scrub { struct timeval pfss_last; /* time received last packet */ - u_int32_t pfss_tsecr; /* last echoed timestamp */ - u_int32_t pfss_tsval; /* largest timestamp */ - u_int32_t pfss_tsval0; /* original timestamp */ + uint32_t pfss_tsecr; /* last echoed timestamp */ + uint32_t pfss_tsval; /* largest timestamp */ + uint32_t pfss_tsval0; /* original timestamp */ u_int16_t pfss_flags; #define PFSS_TIMESTAMP 0x0001 /* modulate timestamp */ #define PFSS_PAWS 0x0010 /* stricter PAWS checks */ @@ -654,7 +654,7 @@ #define PFSS_DATA_NOTS 0x0080 /* no timestamp on data packets */ u_int8_t pfss_ttl; /* stashed TTL */ u_int8_t pad; - u_int32_t pfss_ts_mod; /* timestamp modulation */ + uint32_t pfss_ts_mod; /* timestamp modulation */ }; struct pf_state_host { @@ -665,9 +665,9 @@ struct pf_state_peer { struct pf_state_scrub *scrub; /* state is scrubbed */ - u_int32_t seqlo; /* Max sequence number sent */ - u_int32_t seqhi; /* Max the other end ACKd + win */ - u_int32_t seqdiff; /* Sequence number modulator */ + uint32_t seqlo; /* Max sequence number sent */ + uint32_t seqhi; /* Max the other end ACKd + win */ + uint32_t seqdiff; /* Sequence number modulator */ u_int16_t max_win; /* largest window (pre scaling) */ u_int16_t mss; /* Maximum segment size option */ u_int8_t state; /* active state level */ @@ -699,14 +699,14 @@ /* Keep synced with struct pf_state. */ struct pf_state_cmp { u_int64_t id; - u_int32_t creatorid; + uint32_t creatorid; u_int8_t direction; u_int8_t pad[3]; }; struct pf_state { u_int64_t id; - u_int32_t creatorid; + uint32_t creatorid; u_int8_t direction; u_int8_t pad[3]; @@ -727,9 +727,9 @@ struct pf_src_node *nat_src_node; u_int64_t packets[2]; u_int64_t bytes[2]; - u_int32_t creation; - u_int32_t expire; - u_int32_t pfsync_time; + uint32_t creation; + uint32_t expire; + uint32_t pfsync_time; u_int16_t tag; u_int8_t log; u_int8_t state_flags; @@ -755,14 +755,14 @@ u_int8_t pfss_ttl; /* stashed TTL */ #define PFSYNC_SCRUB_FLAG_VALID 0x01 u_int8_t scrub_flag; - u_int32_t pfss_ts_mod; /* timestamp modulation */ + uint32_t pfss_ts_mod; /* timestamp modulation */ } __packed; struct pfsync_state_peer { struct pfsync_state_scrub scrub; /* state is scrubbed */ - u_int32_t seqlo; /* Max sequence number sent */ - u_int32_t seqhi; /* Max the other end ACKd + win */ - u_int32_t seqdiff; /* Sequence number modulator */ + uint32_t seqlo; /* Max sequence number sent */ + uint32_t seqhi; /* Max the other end ACKd + win */ + uint32_t seqdiff; /* Sequence number modulator */ u_int16_t max_win; /* largest window (pre scaling) */ u_int16_t mss; /* Maximum segment size option */ u_int8_t state; /* active state level */ @@ -782,14 +782,14 @@ struct pfsync_state_peer src; struct pfsync_state_peer dst; struct pf_addr rt_addr; - u_int32_t rule; - u_int32_t anchor; - u_int32_t nat_rule; - u_int32_t creation; - u_int32_t expire; - u_int32_t packets[2][2]; - u_int32_t bytes[2][2]; - u_int32_t creatorid; + uint32_t rule; + uint32_t anchor; + uint32_t nat_rule; + uint32_t creation; + uint32_t expire; + uint32_t packets[2][2]; + uint32_t bytes[2][2]; + uint32_t creatorid; sa_family_t af; u_int8_t proto; u_int8_t direction; @@ -807,7 +807,7 @@ typedef void pfsync_insert_state_t(struct pf_state *); typedef void pfsync_update_state_t(struct pf_state *); typedef void pfsync_delete_state_t(struct pf_state *); -typedef void pfsync_clear_states_t(u_int32_t, const char *); +typedef void pfsync_clear_states_t(uint32_t, const char *); typedef int pfsync_defer_t(struct pf_state *, struct mbuf *); extern pfsync_state_import_t *pfsync_state_import_ptr; @@ -894,13 +894,13 @@ struct { struct pf_rulequeue *ptr; struct pf_rule **ptr_array; - u_int32_t rcount; - u_int32_t ticket; + uint32_t rcount; + uint32_t ticket; int open; } active, inactive; } rules[PF_RULESET_MAX]; struct pf_anchor *anchor; - u_int32_t tticket; + uint32_t tticket; int tables; int topen; }; @@ -951,7 +951,7 @@ struct pfr_table { char pfrt_anchor[MAXPATHLEN]; char pfrt_name[PF_TABLE_NAME_SIZE]; - u_int32_t pfrt_flags; + uint32_t pfrt_flags; u_int8_t pfrt_fback; }; @@ -1067,7 +1067,7 @@ #define pfik_list _pfik_glue._pfik_list u_int64_t pfik_packets[2][2][2]; u_int64_t pfik_bytes[2][2][2]; - u_int32_t pfik_tzero; + uint32_t pfik_tzero; u_int pfik_flags; struct ifnet *pfik_ifp; struct ifg_group *pfik_group; @@ -1102,7 +1102,7 @@ u_int16_t *dport; struct pf_mtag *pf_mtag; - u_int32_t p_len; /* total length of payload */ + uint32_t p_len; /* total length of payload */ u_int16_t *ip_sum; u_int16_t *proto_sum; @@ -1195,10 +1195,10 @@ */ struct pfioc_pooladdr { - u_int32_t action; - u_int32_t ticket; - u_int32_t nr; - u_int32_t r_num; + uint32_t action; + uint32_t ticket; + uint32_t nr; + uint32_t r_num; u_int8_t r_action; u_int8_t r_last; u_int8_t af; @@ -1207,10 +1207,10 @@ }; struct pfioc_rule { - u_int32_t action; - u_int32_t ticket; - u_int32_t pool_ticket; - u_int32_t nr; + uint32_t action; + uint32_t ticket; + uint32_t pool_ticket; + uint32_t nr; char anchor[MAXPATHLEN]; char anchor_call[MAXPATHLEN]; struct pf_rule rule; @@ -1287,22 +1287,22 @@ }; struct pfioc_altq { - u_int32_t action; - u_int32_t ticket; - u_int32_t nr; + uint32_t action; + uint32_t ticket; + uint32_t nr; struct pf_altq altq; }; struct pfioc_qstats { - u_int32_t ticket; - u_int32_t nr; + uint32_t ticket; + uint32_t nr; void *buf; int nbytes; u_int8_t scheduler; }; struct pfioc_ruleset { - u_int32_t nr; + uint32_t nr; char path[MAXPATHLEN]; char name[PF_ANCHOR_NAME_SIZE]; }; @@ -1315,7 +1315,7 @@ struct pfioc_trans_e { int rs_num; char anchor[MAXPATHLEN]; - u_int32_t ticket; + uint32_t ticket; } *array; }; @@ -1341,7 +1341,7 @@ int pfrio_ndel; int pfrio_nchange; int pfrio_flags; - u_int32_t pfrio_ticket; + uint32_t pfrio_ticket; }; #define pfrio_exists pfrio_nadd #define pfrio_nzero pfrio_nadd @@ -1376,7 +1376,7 @@ #define DIOCGETSTATUS _IOWR('D', 21, struct pf_status) #define DIOCCLRSTATUS _IO ('D', 22) #define DIOCNATLOOK _IOWR('D', 23, struct pfioc_natlook) -#define DIOCSETDEBUG _IOWR('D', 24, u_int32_t) +#define DIOCSETDEBUG _IOWR('D', 24, uint32_t) #define DIOCGETSTATES _IOWR('D', 25, struct pfioc_states) #define DIOCCHANGERULE _IOWR('D', 26, struct pfioc_rule) /* XXX cut 26 - 28 */ @@ -1426,14 +1426,14 @@ #define DIOCXROLLBACK _IOWR('D', 83, struct pfioc_trans) #define DIOCGETSRCNODES _IOWR('D', 84, struct pfioc_src_nodes) #define DIOCCLRSRCNODES _IO('D', 85) -#define DIOCSETHOSTID _IOWR('D', 86, u_int32_t) +#define DIOCSETHOSTID _IOWR('D', 86, uint32_t) #define DIOCIGETIFACES _IOWR('D', 87, struct pfioc_iface) #define DIOCSETIFFLAG _IOWR('D', 89, struct pfioc_iface) #define DIOCCLRIFFLAG _IOWR('D', 90, struct pfioc_iface) #define DIOCKILLSRCNODES _IOWR('D', 91, struct pfioc_src_node_kill) struct pf_ifspeed { char ifname[IFNAMSIZ]; - u_int32_t baudrate; + uint32_t baudrate; }; #define DIOCGIFSPEED _IOWR('D', 92, struct pf_ifspeed) @@ -1478,13 +1478,13 @@ VNET_DECLARE(struct pf_palist, pf_pabuf); #define V_pf_pabuf VNET(pf_pabuf) -VNET_DECLARE(u_int32_t, ticket_altqs_active); +VNET_DECLARE(uint32_t, ticket_altqs_active); #define V_ticket_altqs_active VNET(ticket_altqs_active) -VNET_DECLARE(u_int32_t, ticket_altqs_inactive); +VNET_DECLARE(uint32_t, ticket_altqs_inactive); #define V_ticket_altqs_inactive VNET(ticket_altqs_inactive) VNET_DECLARE(int, altqs_inactive_open); #define V_altqs_inactive_open VNET(altqs_inactive_open) -VNET_DECLARE(u_int32_t, ticket_pabuf); +VNET_DECLARE(uint32_t, ticket_pabuf); #define V_ticket_pabuf VNET(ticket_pabuf) VNET_DECLARE(struct pf_altqqueue *, pf_altqs_active); #define V_pf_altqs_active VNET(pf_altqs_active) @@ -1579,10 +1579,10 @@ int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *); #endif /* INET6 */ -u_int32_t pf_new_isn(struct pf_state *); +uint32_t pf_new_isn(struct pf_state *); void *pf_pull_hdr(struct mbuf *, int, void *, int, u_short *, u_short *, sa_family_t); -void pf_change_a(void *, u_int16_t *, u_int32_t, u_int8_t); +void pf_change_a(void *, u_int16_t *, uint32_t, u_int8_t); void pf_send_deferred_syn(struct pf_state *); int pf_match_addr(u_int8_t, struct pf_addr *, struct pf_addr *, struct pf_addr *, sa_family_t); @@ -1600,7 +1600,7 @@ int pf_normalize_tcp_stateful(struct mbuf *, int, struct pf_pdesc *, u_short *, struct tcphdr *, struct pf_state *, struct pf_state_peer *, struct pf_state_peer *, int *); -u_int32_t +uint32_t pf_state_expires(const struct pf_state *); void pf_purge_expired_fragments(void); int pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *, @@ -1631,18 +1631,18 @@ int pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_set_addrs(struct pfr_table *, struct pfr_addr *, int, int *, - int *, int *, int *, int, u_int32_t); + int *, int *, int *, int, uint32_t); int pfr_get_addrs(struct pfr_table *, struct pfr_addr *, int *, int); int pfr_get_astats(struct pfr_table *, struct pfr_astats *, int *, int); int pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_tst_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); -int pfr_ina_begin(struct pfr_table *, u_int32_t *, int *, int); -int pfr_ina_rollback(struct pfr_table *, u_int32_t, int *, int); -int pfr_ina_commit(struct pfr_table *, u_int32_t, int *, int *, int); +int pfr_ina_begin(struct pfr_table *, uint32_t *, int *, int); +int pfr_ina_rollback(struct pfr_table *, uint32_t, int *, int); +int pfr_ina_commit(struct pfr_table *, uint32_t, int *, int *, int); int pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *, - int *, u_int32_t, int); + int *, uint32_t, int); MALLOC_DECLARE(PFI_MTYPE); VNET_DECLARE(struct pfi_kif *, pfi_all); @@ -1670,7 +1670,7 @@ int pf_tag_packet(struct mbuf *, struct pf_pdesc *, int); int pf_addr_cmp(struct pf_addr *, struct pf_addr *, sa_family_t); -void pf_qid2qname(u_int32_t, char *); +void pf_qid2qname(uint32_t, char *); VNET_DECLARE(struct pf_kstatus, pf_status); #define V_pf_status VNET(pf_status) diff --git a/src/include.new/net/radix_mpath.h b/src/include.new/net/radix_mpath.h index 6b24797..5a33015 100644 --- a/src/include.new/net/radix_mpath.h +++ b/src/include.new/net/radix_mpath.h @@ -46,11 +46,11 @@ struct sockaddr; int rn_mpath_capable(struct radix_node_head *); struct radix_node *rn_mpath_next(struct radix_node *); -u_int32_t rn_mpath_count(struct radix_node *); +uint32_t rn_mpath_count(struct radix_node *); struct rtentry *rt_mpath_matchgate(struct rtentry *, struct sockaddr *); int rt_mpath_conflict(struct radix_node_head *, struct rtentry *, struct sockaddr *); -void rtalloc_mpath_fib(struct route *, u_int32_t, u_int); +void rtalloc_mpath_fib(struct route *, uint32_t, u_int); #define rtalloc_mpath(_route, _hash) rtalloc_mpath_fib((_route), (_hash), 0) struct radix_node *rn_mpath_lookup(void *, void *, struct radix_node_head *); diff --git a/src/include.new/netatm/spans/spans_kxdr.h b/src/include.new/netatm/spans/spans_kxdr.h index 3756f8f..002b9cd 100644 --- a/src/include.new/netatm/spans/spans_kxdr.h +++ b/src/include.new/netatm/spans/spans_kxdr.h @@ -44,11 +44,11 @@ typedef int32_t bool_t; typedef int32_t enum_t; -typedef u_int32_t rpcprog_t; -typedef u_int32_t rpcvers_t; -typedef u_int32_t rpcproc_t; -typedef u_int32_t rpcprot_t; -typedef u_int32_t rpcport_t; +typedef uint32_t rpcprog_t; +typedef uint32_t rpcvers_t; +typedef uint32_t rpcproc_t; +typedef uint32_t rpcprot_t; +typedef uint32_t rpcport_t; typedef int32_t rpc_inline_t; #define __dontcare__ -1 @@ -280,13 +280,13 @@ * N.B. and frozen for all time: each data type here uses 4 bytes * of external representation. */ -#define IXDR_GET_INT32(buf) ((int32_t)__ntohl((u_int32_t)*(buf)++)) -#define IXDR_PUT_INT32(buf, v) (*(buf)++ =(int32_t)__htonl((u_int32_t)v)) -#define IXDR_GET_U_INT32(buf) ((u_int32_t)IXDR_GET_INT32(buf)) +#define IXDR_GET_INT32(buf) ((int32_t)__ntohl((uint32_t)*(buf)++)) +#define IXDR_PUT_INT32(buf, v) (*(buf)++ =(int32_t)__htonl((uint32_t)v)) +#define IXDR_GET_U_INT32(buf) ((uint32_t)IXDR_GET_INT32(buf)) #define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_INT32((buf), ((int32_t)(v))) -#define IXDR_GET_LONG(buf) ((long)__ntohl((u_int32_t)*(buf)++)) -#define IXDR_PUT_LONG(buf, v) (*(buf)++ =(int32_t)__htonl((u_int32_t)v)) +#define IXDR_GET_LONG(buf) ((long)__ntohl((uint32_t)*(buf)++)) +#define IXDR_PUT_LONG(buf, v) (*(buf)++ =(int32_t)__htonl((uint32_t)v)) #define IXDR_GET_BOOL(buf) ((bool_t)IXDR_GET_LONG(buf)) #define IXDR_GET_ENUM(buf, t) ((t)IXDR_GET_LONG(buf)) @@ -314,7 +314,7 @@ extern bool_t xdr_int16_t(XDR *, int16_t *); extern bool_t xdr_u_int16_t(XDR *, u_int16_t *); extern bool_t xdr_int32_t(XDR *, int32_t *); -extern bool_t xdr_u_int32_t(XDR *, u_int32_t *); +extern bool_t xdr_uint32_t(XDR *, uint32_t *); extern bool_t xdr_int64_t(XDR *, int64_t *); extern bool_t xdr_u_int64_t(XDR *, u_int64_t *); extern bool_t xdr_bool(XDR *, bool_t *); diff --git a/src/include.new/netgraph/bluetooth/include/ng_bluetooth.h b/src/include.new/netgraph/bluetooth/include/ng_bluetooth.h index 1c18c32..f0e9454 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_bluetooth.h +++ b/src/include.new/netgraph/bluetooth/include/ng_bluetooth.h @@ -65,9 +65,9 @@ struct ng_bt_mbufq { struct mbuf *head; /* first item in the queue */ struct mbuf *tail; /* last item in the queue */ - u_int32_t len; /* number of items in the queue */ - u_int32_t maxlen; /* maximal number of items in the queue */ - u_int32_t drops; /* number if dropped items */ + uint32_t len; /* number of items in the queue */ + uint32_t maxlen; /* maximal number of items in the queue */ + uint32_t drops; /* number if dropped items */ }; typedef struct ng_bt_mbufq ng_bt_mbufq_t; typedef struct ng_bt_mbufq * ng_bt_mbufq_p; @@ -151,9 +151,9 @@ struct ng_bt_itemq { STAILQ_HEAD(, ng_item) queue; /* actually items queue */ - u_int32_t len; /* number of items in the queue */ - u_int32_t maxlen; /* maximal number of items in the queue */ - u_int32_t drops; /* number if dropped items */ + uint32_t len; /* number of items in the queue */ + uint32_t maxlen; /* maximal number of items in the queue */ + uint32_t drops; /* number if dropped items */ }; typedef struct ng_bt_itemq ng_bt_itemq_t; typedef struct ng_bt_itemq * ng_bt_itemq_p; @@ -217,12 +217,12 @@ * Get Bluetooth stack sysctl globals */ -u_int32_t bluetooth_hci_command_timeout (void); -u_int32_t bluetooth_hci_connect_timeout (void); -u_int32_t bluetooth_hci_max_neighbor_age (void); -u_int32_t bluetooth_l2cap_rtx_timeout (void); -u_int32_t bluetooth_l2cap_ertx_timeout (void); -u_int32_t bluetooth_sco_rtx_timeout (void); +uint32_t bluetooth_hci_command_timeout (void); +uint32_t bluetooth_hci_connect_timeout (void); +uint32_t bluetooth_hci_max_neighbor_age (void); +uint32_t bluetooth_l2cap_rtx_timeout (void); +uint32_t bluetooth_l2cap_ertx_timeout (void); +uint32_t bluetooth_sco_rtx_timeout (void); #endif /* _NETGRAPH_BLUETOOTH_H_ */ diff --git a/src/include.new/netgraph/bluetooth/include/ng_bt3c.h b/src/include.new/netgraph/bluetooth/include/ng_bt3c.h index 32682ac..654d186 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_bt3c.h +++ b/src/include.new/netgraph/bluetooth/include/ng_bt3c.h @@ -89,12 +89,12 @@ #define NGM_BT3C_NODE_GET_STAT 6 /* get statistic */ typedef struct { - u_int32_t pckts_recv; /* # of packets received */ - u_int32_t bytes_recv; /* # of bytes received */ - u_int32_t pckts_sent; /* # of packets sent */ - u_int32_t bytes_sent; /* # of bytes sent */ - u_int32_t oerrors; /* # of output errors */ - u_int32_t ierrors; /* # of input errors */ + uint32_t pckts_recv; /* # of packets received */ + uint32_t bytes_recv; /* # of bytes received */ + uint32_t pckts_sent; /* # of packets sent */ + uint32_t bytes_sent; /* # of bytes sent */ + uint32_t oerrors; /* # of output errors */ + uint32_t ierrors; /* # of input errors */ } ng_bt3c_node_stat_ep; #define NGM_BT3C_NODE_RESET_STAT 7 /* reset statistic */ @@ -102,7 +102,7 @@ #define NGM_BT3C_NODE_DOWNLOAD_FIRMWARE 8 /* download firmware */ typedef struct { - u_int32_t block_address; + uint32_t block_address; u_int16_t block_size; /* in words */ u_int16_t block_alignment; /* in bytes */ } ng_bt3c_firmware_block_ep; diff --git a/src/include.new/netgraph/bluetooth/include/ng_btsocket.h b/src/include.new/netgraph/bluetooth/include/ng_btsocket.h index bbfdcb5..53c7502 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_btsocket.h +++ b/src/include.new/netgraph/bluetooth/include/ng_btsocket.h @@ -141,7 +141,7 @@ /* Get neighbor cache */ struct ng_btsocket_hci_raw_node_neighbor_cache { - u_int32_t num_entries; + uint32_t num_entries; ng_hci_node_neighbor_cache_entry_ep *entries; }; #define SIOC_HCI_RAW_NODE_GET_NEIGHBOR_CACHE \ @@ -150,7 +150,7 @@ /* Get connection list */ struct ng_btsocket_hci_raw_con_list { - u_int32_t num_connections; + uint32_t num_connections; ng_hci_node_con_ep *connections; }; #define SIOC_HCI_RAW_NODE_GET_CON_LIST \ @@ -192,7 +192,7 @@ /* Get list of HCI node names */ struct ng_btsocket_hci_raw_node_list_names { - u_int32_t num_names; + uint32_t num_names; struct nodeinfo *names; }; #define SIOC_HCI_RAW_NODE_LIST_NAMES \ @@ -243,8 +243,8 @@ /* Ping */ struct ng_btsocket_l2cap_raw_ping { - u_int32_t result; - u_int32_t echo_size; + uint32_t result; + uint32_t echo_size; u_int8_t *echo_data; }; #define SIOC_L2CAP_L2CA_PING \ @@ -253,9 +253,9 @@ /* Get info */ struct ng_btsocket_l2cap_raw_get_info { - u_int32_t result; - u_int32_t info_type; - u_int32_t info_size; + uint32_t result; + uint32_t info_type; + uint32_t info_size; u_int8_t *info_data; }; #define SIOC_L2CAP_L2CA_GET_INFO \ @@ -283,7 +283,7 @@ /* Get connection list */ struct ng_btsocket_l2cap_raw_con_list { - u_int32_t num_connections; + uint32_t num_connections; ng_l2cap_node_con_ep *connections; }; #define SIOC_L2CAP_NODE_GET_CON_LIST \ @@ -292,7 +292,7 @@ /* Get channel list */ struct ng_btsocket_l2cap_raw_chan_list { - u_int32_t num_channels; + uint32_t num_channels; ng_l2cap_node_chan_ep *channels; }; #define SIOC_L2CAP_NODE_GET_CHAN_LIST \ diff --git a/src/include.new/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/src/include.new/netgraph/bluetooth/include/ng_btsocket_hci_raw.h index e5651f7..98b082b 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_btsocket_hci_raw.h +++ b/src/include.new/netgraph/bluetooth/include/ng_btsocket_hci_raw.h @@ -43,12 +43,12 @@ struct ng_btsocket_hci_raw_pcb { struct socket *so; /* socket */ - u_int32_t flags; /* flags */ + uint32_t flags; /* flags */ #define NG_BTSOCKET_HCI_RAW_DIRECTION (1 << 0) #define NG_BTSOCKET_HCI_RAW_PRIVILEGED (1 << 1) struct sockaddr_hci addr; /* local address */ struct ng_btsocket_hci_raw_filter filter; /* filter */ - u_int32_t token; /* message token */ + uint32_t token; /* message token */ struct ng_mesg *msg; /* message */ LIST_ENTRY(ng_btsocket_hci_raw_pcb) next; /* link to next */ struct mtx pcb_mtx; /* pcb mutex */ diff --git a/src/include.new/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/src/include.new/netgraph/bluetooth/include/ng_btsocket_l2cap.h index abaa8cb..c0baf7b 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_btsocket_l2cap.h +++ b/src/include.new/netgraph/bluetooth/include/ng_btsocket_l2cap.h @@ -65,14 +65,14 @@ struct ng_btsocket_l2cap_raw_pcb { struct socket *so; /* socket */ - u_int32_t flags; /* flags */ + uint32_t flags; /* flags */ #define NG_BTSOCKET_L2CAP_RAW_PRIVILEGED (1 << 0) bdaddr_t src; /* source address */ bdaddr_t dst; /* dest address */ ng_btsocket_l2cap_rtentry_p rt; /* routing info */ - u_int32_t token; /* message token */ + uint32_t token; /* message token */ struct ng_mesg *msg; /* message */ struct mtx pcb_mtx; /* pcb mutex */ @@ -164,7 +164,7 @@ struct callout_handle timo; /* timeout */ - u_int32_t token; /* message token */ + uint32_t token; /* message token */ ng_btsocket_l2cap_rtentry_p rt; /* routing info */ struct mtx pcb_mtx; /* pcb mutex */ diff --git a/src/include.new/netgraph/bluetooth/include/ng_h4.h b/src/include.new/netgraph/bluetooth/include/ng_h4.h index 5dcaf70..9a2e3bf 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_h4.h +++ b/src/include.new/netgraph/bluetooth/include/ng_h4.h @@ -98,12 +98,12 @@ /* Get node statistic */ #define NGM_H4_NODE_GET_STAT 7 typedef struct { - u_int32_t pckts_recv; /* # of packets received */ - u_int32_t bytes_recv; /* # of bytes received */ - u_int32_t pckts_sent; /* # of packets sent */ - u_int32_t bytes_sent; /* # of bytes sent */ - u_int32_t oerrors; /* # of output errors */ - u_int32_t ierrors; /* # of input errors */ + uint32_t pckts_recv; /* # of packets received */ + uint32_t bytes_recv; /* # of bytes received */ + uint32_t pckts_sent; /* # of packets sent */ + uint32_t bytes_sent; /* # of bytes sent */ + uint32_t oerrors; /* # of output errors */ + uint32_t ierrors; /* # of input errors */ } ng_h4_node_stat_ep; /* Reset node statistic */ diff --git a/src/include.new/netgraph/bluetooth/include/ng_hci.h b/src/include.new/netgraph/bluetooth/include/ng_hci.h index d081dbb..45964d6 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_hci.h +++ b/src/include.new/netgraph/bluetooth/include/ng_hci.h @@ -448,10 +448,10 @@ u_int16_t con_handle; /* connection handle */ u_int8_t flags; /* reserved */ u_int8_t service_type; /* service type */ - u_int32_t token_rate; /* bytes/sec */ - u_int32_t peak_bandwidth; /* bytes/sec */ - u_int32_t latency; /* msec */ - u_int32_t delay_variation; /* msec */ + uint32_t token_rate; /* bytes/sec */ + uint32_t peak_bandwidth; /* bytes/sec */ + uint32_t latency; /* msec */ + uint32_t delay_variation; /* msec */ } ng_hci_lp_qos_req_ep; /* QoS Conformition Event */ @@ -526,14 +526,14 @@ #define NGM_HCI_NODE_GET_STAT 107 /* HCI -> User */ typedef struct { - u_int32_t cmd_sent; /* number of HCI commands sent */ - u_int32_t evnt_recv; /* number of HCI events received */ - u_int32_t acl_recv; /* number of ACL packets received */ - u_int32_t acl_sent; /* number of ACL packets sent */ - u_int32_t sco_recv; /* number of SCO packets received */ - u_int32_t sco_sent; /* number of SCO packets sent */ - u_int32_t bytes_recv; /* total number of bytes received */ - u_int32_t bytes_sent; /* total number of bytes sent */ + uint32_t cmd_sent; /* number of HCI commands sent */ + uint32_t evnt_recv; /* number of HCI events received */ + uint32_t acl_recv; /* number of ACL packets received */ + uint32_t acl_sent; /* number of ACL packets sent */ + uint32_t sco_recv; /* number of SCO packets received */ + uint32_t sco_sent; /* number of SCO packets sent */ + uint32_t bytes_recv; /* total number of bytes received */ + uint32_t bytes_sent; /* total number of bytes sent */ } ng_hci_node_stat_ep; #define NGM_HCI_NODE_RESET_STAT 108 /* User -> HCI */ @@ -543,7 +543,7 @@ #define NGM_HCI_NODE_GET_NEIGHBOR_CACHE 110 /* HCI -> User */ typedef struct { - u_int32_t num_entries; /* number of entries */ + uint32_t num_entries; /* number of entries */ } ng_hci_node_get_neighbor_cache_ep; typedef struct { @@ -559,7 +559,7 @@ #define NGM_HCI_NODE_GET_CON_LIST 111 /* HCI -> User */ typedef struct { - u_int32_t num_connections; /* number of connections */ + uint32_t num_connections; /* number of connections */ } ng_hci_node_con_list_ep; typedef struct { @@ -833,10 +833,10 @@ u_int16_t con_handle; /* connection handle */ u_int8_t flags; /* reserved for future use */ u_int8_t service_type; /* service type */ - u_int32_t token_rate; /* bytes per second */ - u_int32_t peak_bandwidth; /* bytes per second */ - u_int32_t latency; /* microseconds */ - u_int32_t delay_variation; /* microseconds */ + uint32_t token_rate; /* bytes per second */ + uint32_t peak_bandwidth; /* bytes per second */ + uint32_t latency; /* microseconds */ + uint32_t delay_variation; /* microseconds */ } __attribute__ ((packed)) ng_hci_qos_setup_cp; /* No return parameter(s) */ @@ -1530,10 +1530,10 @@ u_int16_t con_handle; /* connection handle */ u_int8_t flags; /* reserved for future use */ u_int8_t service_type; /* service type */ - u_int32_t token_rate; /* bytes per second */ - u_int32_t peak_bandwidth; /* bytes per second */ - u_int32_t latency; /* microseconds */ - u_int32_t delay_variation; /* microseconds */ + uint32_t token_rate; /* bytes per second */ + uint32_t peak_bandwidth; /* bytes per second */ + uint32_t latency; /* microseconds */ + uint32_t delay_variation; /* microseconds */ } __attribute__ ((packed)) ng_hci_qos_setup_compl_ep; #define NG_HCI_EVENT_COMMAND_COMPL 0x0e diff --git a/src/include.new/netgraph/bluetooth/include/ng_l2cap.h b/src/include.new/netgraph/bluetooth/include/ng_l2cap.h index f6cc85b..4a9ceb9 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_l2cap.h +++ b/src/include.new/netgraph/bluetooth/include/ng_l2cap.h @@ -147,11 +147,11 @@ typedef struct { u_int8_t flags; /* reserved for future use */ u_int8_t service_type; /* service type */ - u_int32_t token_rate; /* bytes per second */ - u_int32_t token_bucket_size; /* bytes */ - u_int32_t peak_bandwidth; /* bytes per second */ - u_int32_t latency; /* microseconds */ - u_int32_t delay_variation; /* microseconds */ + uint32_t token_rate; /* bytes per second */ + uint32_t token_bucket_size; /* bytes */ + uint32_t peak_bandwidth; /* bytes per second */ + uint32_t latency; /* microseconds */ + uint32_t delay_variation; /* microseconds */ } __attribute__ ((packed)) ng_l2cap_flow_t; typedef ng_l2cap_flow_t * ng_l2cap_flow_p; @@ -329,7 +329,7 @@ /* L2CA data packet header */ typedef struct { - u_int32_t token; /* token to use in L2CAP_L2CA_WRITE */ + uint32_t token; /* token to use in L2CAP_L2CA_WRITE */ u_int16_t length; /* length of the data */ u_int16_t lcid; /* local channel ID */ } __attribute__ ((packed)) ng_l2cap_l2ca_hdr_t; @@ -614,7 +614,7 @@ #define NGM_L2CAP_NODE_GET_CON_LIST 0x40a /* L2CAP -> User */ typedef struct { - u_int32_t num_connections; /* number of connections */ + uint32_t num_connections; /* number of connections */ } ng_l2cap_node_con_list_ep; /* Connection flags */ @@ -638,11 +638,11 @@ #define NGM_L2CAP_NODE_GET_CHAN_LIST 0x40b /* L2CAP -> User */ typedef struct { - u_int32_t num_channels; /* number of channels */ + uint32_t num_channels; /* number of channels */ } ng_l2cap_node_chan_list_ep; typedef struct { - u_int32_t state; /* channel state */ + uint32_t state; /* channel state */ u_int16_t scid; /* source (local) channel ID */ u_int16_t dcid; /* destination (remote) channel ID */ diff --git a/src/include.new/netgraph/bluetooth/include/ng_ubt.h b/src/include.new/netgraph/bluetooth/include/ng_ubt.h index 809d230..4c08267 100644 --- a/src/include.new/netgraph/bluetooth/include/ng_ubt.h +++ b/src/include.new/netgraph/bluetooth/include/ng_ubt.h @@ -74,12 +74,12 @@ #define NGM_UBT_NODE_GET_STAT 5 /* get statistic */ typedef struct { - u_int32_t pckts_recv; /* # of packets received */ - u_int32_t bytes_recv; /* # of bytes received */ - u_int32_t pckts_sent; /* # of packets sent */ - u_int32_t bytes_sent; /* # of bytes sent */ - u_int32_t oerrors; /* # of output errors */ - u_int32_t ierrors; /* # of input errors */ + uint32_t pckts_recv; /* # of packets received */ + uint32_t bytes_recv; /* # of bytes received */ + uint32_t pckts_sent; /* # of packets sent */ + uint32_t bytes_sent; /* # of bytes sent */ + uint32_t oerrors; /* # of output errors */ + uint32_t ierrors; /* # of input errors */ } ng_ubt_node_stat_ep; #define NGM_UBT_NODE_RESET_STAT 6 /* reset statistic */ diff --git a/src/include.new/netgraph/netgraph.h b/src/include.new/netgraph/netgraph.h index 8d17cd5..78339a9 100644 --- a/src/include.new/netgraph/netgraph.h +++ b/src/include.new/netgraph/netgraph.h @@ -1049,7 +1049,7 @@ */ struct ng_cmdlist { - u_int32_t cookie; /* command typecookie */ + uint32_t cookie; /* command typecookie */ int cmd; /* command number */ const char *name; /* command name */ const struct ng_parse_type *mesgType; /* args if !NGF_RESP */ @@ -1071,7 +1071,7 @@ */ struct ng_type { - u_int32_t version; /* must equal NG_API_VERSION */ + uint32_t version; /* must equal NG_API_VERSION */ const char *name; /* Unique type name */ modeventhand_t mod_event; /* Module event handler (optional) */ ng_constructor_t *constructor; /* Node constructor */ diff --git a/src/include.new/netgraph/ng_async.h b/src/include.new/netgraph/ng_async.h index 528b857..ad37648 100644 --- a/src/include.new/netgraph/ng_async.h +++ b/src/include.new/netgraph/ng_async.h @@ -59,14 +59,14 @@ /* Frame statistics */ struct ng_async_stat { - u_int32_t syncOctets; - u_int32_t syncFrames; - u_int32_t syncOverflows; - u_int32_t asyncOctets; - u_int32_t asyncFrames; - u_int32_t asyncRunts; - u_int32_t asyncOverflows; - u_int32_t asyncBadCheckSums; + uint32_t syncOctets; + uint32_t syncFrames; + uint32_t syncOverflows; + uint32_t asyncOctets; + uint32_t asyncFrames; + uint32_t asyncRunts; + uint32_t asyncOverflows; + uint32_t asyncBadCheckSums; }; /* Keep this in sync with the above structure definition */ @@ -87,7 +87,7 @@ u_char enabled; /* Turn encoding on/off */ u_int16_t amru; /* Max receive async frame length */ u_int16_t smru; /* Max receive sync frame length */ - u_int32_t accm; /* ACCM encoding */ + uint32_t accm; /* ACCM encoding */ }; /* Keep this in sync with the above structure definition */ diff --git a/src/include.new/netgraph/ng_bridge.h b/src/include.new/netgraph/ng_bridge.h index 5d52eb0..03cfaa3 100644 --- a/src/include.new/netgraph/ng_bridge.h +++ b/src/include.new/netgraph/ng_bridge.h @@ -58,9 +58,9 @@ struct ng_bridge_config { u_char ipfw[NG_BRIDGE_MAX_LINKS]; /* enable ipfw */ u_char debugLevel; /* debug level */ - u_int32_t loopTimeout; /* link loopback mute time */ - u_int32_t maxStaleness; /* max host age before nuking */ - u_int32_t minStableAge; /* min time for a stable host */ + uint32_t loopTimeout; /* link loopback mute time */ + uint32_t maxStaleness; /* max host age before nuking */ + uint32_t minStableAge; /* min time for a stable host */ }; /* Keep this in sync with the above structure definition */ @@ -129,7 +129,7 @@ /* Structure returned by NGM_BRIDGE_GET_TABLE */ struct ng_bridge_host_ary { - u_int32_t numHosts; + uint32_t numHosts; struct ng_bridge_host hosts[]; }; diff --git a/src/include.new/netgraph/ng_etf.h b/src/include.new/netgraph/ng_etf.h index 356cdcd..720ae77 100644 --- a/src/include.new/netgraph/ng_etf.h +++ b/src/include.new/netgraph/ng_etf.h @@ -59,8 +59,8 @@ /* This structure is returned by the NGM_ETF_GET_STATUS command */ struct ng_etfstat { - u_int32_t packets_in; /* packets in from downstream */ - u_int32_t packets_out; /* packets out towards downstream */ + uint32_t packets_in; /* packets in from downstream */ + uint32_t packets_out; /* packets out towards downstream */ }; /* diff --git a/src/include.new/netgraph/ng_ksocket.h b/src/include.new/netgraph/ng_ksocket.h index 8fdd77f..e2cee4b 100644 --- a/src/include.new/netgraph/ng_ksocket.h +++ b/src/include.new/netgraph/ng_ksocket.h @@ -72,7 +72,7 @@ /* For NGM_KSOCKET_ACCEPT control message responses */ struct ng_ksocket_accept { - u_int32_t nodeid; /* node ID of connected ksocket */ + uint32_t nodeid; /* node ID of connected ksocket */ struct sockaddr addr; /* peer's address (variable length) */ }; diff --git a/src/include.new/netgraph/ng_l2tp.h b/src/include.new/netgraph/ng_l2tp.h index d1b703f..0ce3204 100644 --- a/src/include.new/netgraph/ng_l2tp.h +++ b/src/include.new/netgraph/ng_l2tp.h @@ -113,26 +113,26 @@ /* Statistics struct */ struct ng_l2tp_stats { - u_int32_t xmitPackets; /* number of packets xmit */ - u_int32_t xmitOctets; /* number of octets xmit */ - u_int32_t xmitZLBs; /* ack-only packets transmitted */ - u_int32_t xmitDrops; /* xmits dropped due to full window */ - u_int32_t xmitTooBig; /* ctrl pkts dropped because too big */ - u_int32_t xmitInvalid; /* ctrl packets with no session ID */ - u_int32_t xmitDataTooBig; /* data pkts dropped because too big */ - u_int32_t xmitRetransmits; /* retransmitted packets */ - u_int32_t recvPackets; /* number of packets rec'd */ - u_int32_t recvOctets; /* number of octets rec'd */ - u_int32_t recvRunts; /* too short packets rec'd */ - u_int32_t recvInvalid; /* invalid packets rec'd */ - u_int32_t recvWrongTunnel; /* packets rec'd with wrong tunnel id */ - u_int32_t recvUnknownSID; /* pkts rec'd with unknown session id */ - u_int32_t recvBadAcks; /* ctrl pkts rec'd with invalid 'nr' */ - u_int32_t recvOutOfOrder; /* out of order ctrl pkts rec'd */ - u_int32_t recvDuplicates; /* duplicate ctrl pkts rec'd */ - u_int32_t recvDataDrops; /* dup/out of order data pkts rec'd */ - u_int32_t recvZLBs; /* ack-only packets rec'd */ - u_int32_t memoryFailures; /* times we couldn't allocate memory */ + uint32_t xmitPackets; /* number of packets xmit */ + uint32_t xmitOctets; /* number of octets xmit */ + uint32_t xmitZLBs; /* ack-only packets transmitted */ + uint32_t xmitDrops; /* xmits dropped due to full window */ + uint32_t xmitTooBig; /* ctrl pkts dropped because too big */ + uint32_t xmitInvalid; /* ctrl packets with no session ID */ + uint32_t xmitDataTooBig; /* data pkts dropped because too big */ + uint32_t xmitRetransmits; /* retransmitted packets */ + uint32_t recvPackets; /* number of packets rec'd */ + uint32_t recvOctets; /* number of octets rec'd */ + uint32_t recvRunts; /* too short packets rec'd */ + uint32_t recvInvalid; /* invalid packets rec'd */ + uint32_t recvWrongTunnel; /* packets rec'd with wrong tunnel id */ + uint32_t recvUnknownSID; /* pkts rec'd with unknown session id */ + uint32_t recvBadAcks; /* ctrl pkts rec'd with invalid 'nr' */ + uint32_t recvOutOfOrder; /* out of order ctrl pkts rec'd */ + uint32_t recvDuplicates; /* duplicate ctrl pkts rec'd */ + uint32_t recvDataDrops; /* dup/out of order data pkts rec'd */ + uint32_t recvZLBs; /* ack-only packets rec'd */ + uint32_t memoryFailures; /* times we couldn't allocate memory */ }; /* Keep this in sync with the above structure definition */ diff --git a/src/include.new/netgraph/ng_message.h b/src/include.new/netgraph/ng_message.h index 7e4df9f..7e821d4 100644 --- a/src/include.new/netgraph/ng_message.h +++ b/src/include.new/netgraph/ng_message.h @@ -59,11 +59,11 @@ u_char version; /* == NGM_VERSION */ u_char spare; /* pad to 4 bytes */ u_int16_t spare2; - u_int32_t arglen; /* length of data */ - u_int32_t cmd; /* command identifier */ - u_int32_t flags; /* message status */ - u_int32_t token; /* match with reply */ - u_int32_t typecookie; /* node's type cookie */ + uint32_t arglen; /* length of data */ + uint32_t cmd; /* command identifier */ + uint32_t flags; /* message status */ + uint32_t token; /* match with reply */ + uint32_t typecookie; /* node's type cookie */ u_char cmdstr[NG_CMDSTRSIZ]; /* cmd string + \0 */ } header; char data[]; /* placeholder for actual data */ @@ -225,7 +225,7 @@ char name[NG_NODESIZ]; /* node name (if any) */ char type[NG_TYPESIZ]; /* peer type */ ng_ID_t id; /* unique identifier */ - u_int32_t hooks; /* number of active hooks */ + uint32_t hooks; /* number of active hooks */ }; /* Keep this in sync with the above structure definition */ @@ -266,7 +266,7 @@ /* Structure used for NGM_LISTNAMES/NGM_LISTNODES */ struct namelist { - u_int32_t numnames; + uint32_t numnames; struct nodeinfo nodeinfo[]; }; @@ -280,7 +280,7 @@ /* Structure used for NGM_LISTTYPES */ struct typeinfo { char type_name[NG_TYPESIZ]; /* name of type */ - u_int32_t numnodes; /* number alive */ + uint32_t numnodes; /* number alive */ }; /* Keep this in sync with the above structure definition */ @@ -291,7 +291,7 @@ } struct typelist { - u_int32_t numtypes; + uint32_t numtypes; struct typeinfo typeinfo[]; }; diff --git a/src/include.new/netgraph/ng_mppc.h b/src/include.new/netgraph/ng_mppc.h index 03386ce..c3555e9 100644 --- a/src/include.new/netgraph/ng_mppc.h +++ b/src/include.new/netgraph/ng_mppc.h @@ -70,7 +70,7 @@ /* Config struct (per-direction) */ struct ng_mppc_config { u_char enable; /* enable */ - u_int32_t bits; /* config bits */ + uint32_t bits; /* config bits */ u_char startkey[MPPE_KEY_LEN]; /* start key */ }; diff --git a/src/include.new/netgraph/ng_one2many.h b/src/include.new/netgraph/ng_one2many.h index c39c5f3..171b6eb 100644 --- a/src/include.new/netgraph/ng_one2many.h +++ b/src/include.new/netgraph/ng_one2many.h @@ -69,8 +69,8 @@ /* Node configuration structure */ struct ng_one2many_config { - u_int32_t xmitAlg; /* how to distribute packets */ - u_int32_t failAlg; /* how to detect link failure */ + uint32_t xmitAlg; /* how to distribute packets */ + uint32_t failAlg; /* how to detect link failure */ u_char enabledLinks[NG_ONE2MANY_MAX_LINKS]; }; diff --git a/src/include.new/netgraph/ng_pipe.h b/src/include.new/netgraph/ng_pipe.h index 470db24..53da643 100644 --- a/src/include.new/netgraph/ng_pipe.h +++ b/src/include.new/netgraph/ng_pipe.h @@ -80,11 +80,11 @@ /* Runtime structure for one hook */ struct ng_pipe_hookrun { - u_int32_t fifo_queues; - u_int32_t qin_octets; - u_int32_t qin_frames; - u_int32_t qout_octets; - u_int32_t qout_frames; + uint32_t fifo_queues; + uint32_t qin_octets; + uint32_t qin_frames; + uint32_t qout_octets; + uint32_t qout_frames; }; /* Keep this in sync with the above structure definition */ @@ -114,14 +114,14 @@ struct ng_pipe_hookcfg { u_int64_t bandwidth; u_int64_t ber; - u_int32_t qin_size_limit; - u_int32_t qout_size_limit; - u_int32_t duplicate; - u_int32_t fifo; - u_int32_t drr; - u_int32_t wfq; - u_int32_t droptail; - u_int32_t drophead; + uint32_t qin_size_limit; + uint32_t qout_size_limit; + uint32_t duplicate; + uint32_t fifo; + uint32_t drr; + uint32_t wfq; + uint32_t droptail; + uint32_t drophead; }; /* Keep this in sync with the above structure definition */ @@ -143,8 +143,8 @@ struct ng_pipe_cfg { u_int64_t bandwidth; u_int64_t delay; - u_int32_t header_offset; - u_int32_t overhead; + uint32_t header_offset; + uint32_t overhead; struct ng_pipe_hookcfg downstream; struct ng_pipe_hookcfg upstream; }; diff --git a/src/include.new/netgraph/ng_ppp.h b/src/include.new/netgraph/ng_ppp.h index acda969..341b624 100644 --- a/src/include.new/netgraph/ng_ppp.h +++ b/src/include.new/netgraph/ng_ppp.h @@ -125,8 +125,8 @@ u_char enableProtoComp;/* enable protocol field compression */ u_char enableACFComp; /* enable addr/ctrl field compression */ u_int16_t mru; /* peer MRU */ - u_int32_t latency; /* link latency (in milliseconds) */ - u_int32_t bandwidth; /* link bandwidth (in bytes/sec/10) */ + uint32_t latency; /* link latency (in milliseconds) */ + uint32_t bandwidth; /* link bandwidth (in bytes/sec/10) */ }; /* Keep this in sync with the above structure definition */ @@ -194,14 +194,14 @@ /* Statistics struct for a link (or the bundle if NG_PPP_BUNDLE_LINKNUM) */ struct ng_ppp_link_stat { - u_int32_t xmitFrames; /* xmit frames on link */ - u_int32_t xmitOctets; /* xmit octets on link */ - u_int32_t recvFrames; /* recv frames on link */ - u_int32_t recvOctets; /* recv octets on link */ - u_int32_t badProtos; /* frames rec'd with bogus protocol */ - u_int32_t runts; /* Too short MP fragments */ - u_int32_t dupFragments; /* MP frames with duplicate seq # */ - u_int32_t dropFragments; /* MP fragments we had to drop */ + uint32_t xmitFrames; /* xmit frames on link */ + uint32_t xmitOctets; /* xmit octets on link */ + uint32_t recvFrames; /* recv frames on link */ + uint32_t recvOctets; /* recv octets on link */ + uint32_t badProtos; /* frames rec'd with bogus protocol */ + uint32_t runts; /* Too short MP fragments */ + uint32_t dupFragments; /* MP frames with duplicate seq # */ + uint32_t dropFragments; /* MP fragments we had to drop */ }; /* Keep this in sync with the above structure definition */ diff --git a/src/include.new/netgraph/ng_pptpgre.h b/src/include.new/netgraph/ng_pptpgre.h index 713c36c..ee0b67b 100644 --- a/src/include.new/netgraph/ng_pptpgre.h +++ b/src/include.new/netgraph/ng_pptpgre.h @@ -84,22 +84,22 @@ /* Statistics struct */ struct ng_pptpgre_stats { - u_int32_t xmitPackets; /* number of GRE packets xmit */ - u_int32_t xmitOctets; /* number of GRE octets xmit */ - u_int32_t xmitLoneAcks; /* ack-only packets transmitted */ - u_int32_t xmitDrops; /* xmits dropped due to full window */ - u_int32_t xmitTooBig; /* xmits dropped because too big */ - u_int32_t recvPackets; /* number of GRE packets rec'd */ - u_int32_t recvOctets; /* number of GRE octets rec'd */ - u_int32_t recvRunts; /* too short packets rec'd */ - u_int32_t recvBadGRE; /* bogus packets rec'd (bad GRE hdr) */ - u_int32_t recvBadAcks; /* bogus ack's rec'd in GRE header */ - u_int32_t recvBadCID; /* pkts with unknown call ID rec'd */ - u_int32_t recvOutOfOrder; /* packets rec'd out of order */ - u_int32_t recvDuplicates; /* packets rec'd with duplicate seq # */ - u_int32_t recvLoneAcks; /* ack-only packets rec'd */ - u_int32_t recvAckTimeouts; /* times peer failed to ack in time */ - u_int32_t memoryFailures; /* times we couldn't allocate memory */ + uint32_t xmitPackets; /* number of GRE packets xmit */ + uint32_t xmitOctets; /* number of GRE octets xmit */ + uint32_t xmitLoneAcks; /* ack-only packets transmitted */ + uint32_t xmitDrops; /* xmits dropped due to full window */ + uint32_t xmitTooBig; /* xmits dropped because too big */ + uint32_t recvPackets; /* number of GRE packets rec'd */ + uint32_t recvOctets; /* number of GRE octets rec'd */ + uint32_t recvRunts; /* too short packets rec'd */ + uint32_t recvBadGRE; /* bogus packets rec'd (bad GRE hdr) */ + uint32_t recvBadAcks; /* bogus ack's rec'd in GRE header */ + uint32_t recvBadCID; /* pkts with unknown call ID rec'd */ + uint32_t recvOutOfOrder; /* packets rec'd out of order */ + uint32_t recvDuplicates; /* packets rec'd with duplicate seq # */ + uint32_t recvLoneAcks; /* ack-only packets rec'd */ + uint32_t recvAckTimeouts; /* times peer failed to ack in time */ + uint32_t memoryFailures; /* times we couldn't allocate memory */ }; /* Keep this in sync with the above structure definition */ diff --git a/src/include.new/netgraph/ng_sample.h b/src/include.new/netgraph/ng_sample.h index 0c18ba6..ab1c37f 100644 --- a/src/include.new/netgraph/ng_sample.h +++ b/src/include.new/netgraph/ng_sample.h @@ -69,8 +69,8 @@ /* This structure is returned by the NGM_XXX_GET_STATUS command */ struct ngxxxstat { - u_int32_t packets_in; /* packets in from downstream */ - u_int32_t packets_out; /* packets out towards downstream */ + uint32_t packets_in; /* packets in from downstream */ + uint32_t packets_out; /* packets out towards downstream */ }; /* diff --git a/src/include.new/netgraph/ng_vlan.h b/src/include.new/netgraph/ng_vlan.h index b0552b7..c6bcc3a 100644 --- a/src/include.new/netgraph/ng_vlan.h +++ b/src/include.new/netgraph/ng_vlan.h @@ -94,7 +94,7 @@ /* Structure returned by NGM_VLAN_GET_TABLE. */ struct ng_vlan_table { - u_int32_t n; + uint32_t n; struct ng_vlan_filter filter[]; }; diff --git a/src/include.new/netinet/icmp6.h b/src/include.new/netinet/icmp6.h index dadcbf9..9464bc1 100644 --- a/src/include.new/netinet/icmp6.h +++ b/src/include.new/netinet/icmp6.h @@ -72,7 +72,7 @@ u_int8_t icmp6_code; /* code field */ u_int16_t icmp6_cksum; /* checksum field */ union { - u_int32_t icmp6_un_data32[1]; /* type-specific field */ + uint32_t icmp6_un_data32[1]; /* type-specific field */ u_int16_t icmp6_un_data16[2]; /* type-specific field */ u_int8_t icmp6_un_data8[4]; /* type-specific field */ } icmp6_dataun; @@ -214,8 +214,8 @@ struct nd_router_advert { /* router advertisement */ struct icmp6_hdr nd_ra_hdr; - u_int32_t nd_ra_reachable; /* reachable time */ - u_int32_t nd_ra_retransmit; /* retransmit timer */ + uint32_t nd_ra_reachable; /* reachable time */ + uint32_t nd_ra_retransmit; /* retransmit timer */ /* could be followed by options */ } __packed; @@ -308,9 +308,9 @@ u_int8_t nd_opt_pi_len; u_int8_t nd_opt_pi_prefix_len; u_int8_t nd_opt_pi_flags_reserved; - u_int32_t nd_opt_pi_valid_time; - u_int32_t nd_opt_pi_preferred_time; - u_int32_t nd_opt_pi_reserved2; + uint32_t nd_opt_pi_valid_time; + uint32_t nd_opt_pi_preferred_time; + uint32_t nd_opt_pi_reserved2; struct in6_addr nd_opt_pi_prefix; } __packed; @@ -321,7 +321,7 @@ u_int8_t nd_opt_rh_type; u_int8_t nd_opt_rh_len; u_int16_t nd_opt_rh_reserved1; - u_int32_t nd_opt_rh_reserved2; + uint32_t nd_opt_rh_reserved2; /* followed by IP header and data */ } __packed; @@ -329,7 +329,7 @@ u_int8_t nd_opt_mtu_type; u_int8_t nd_opt_mtu_len; u_int16_t nd_opt_mtu_reserved; - u_int32_t nd_opt_mtu_mtu; + uint32_t nd_opt_mtu_mtu; } __packed; #define ND_OPT_NONCE_LEN ((1 * 8) - 2) @@ -347,7 +347,7 @@ u_int8_t nd_opt_rti_len; u_int8_t nd_opt_rti_prefixlen; u_int8_t nd_opt_rti_flags; - u_int32_t nd_opt_rti_lifetime; + uint32_t nd_opt_rti_lifetime; /* prefix follows */ } __packed; @@ -355,7 +355,7 @@ u_int8_t nd_opt_rdnss_type; u_int8_t nd_opt_rdnss_len; u_int16_t nd_opt_rdnss_reserved; - u_int32_t nd_opt_rdnss_lifetime; + uint32_t nd_opt_rdnss_lifetime; /* followed by list of recursive DNS servers */ } __packed; @@ -363,7 +363,7 @@ u_int8_t nd_opt_dnssl_type; u_int8_t nd_opt_dnssl_len; u_int16_t nd_opt_dnssl_reserved; - u_int32_t nd_opt_dnssl_lifetime; + uint32_t nd_opt_dnssl_lifetime; /* followed by list of DNS search domains */ } __packed; @@ -449,7 +449,7 @@ #endif struct ni_reply_fqdn { - u_int32_t ni_fqdn_ttl; /* TTL */ + uint32_t ni_fqdn_ttl; /* TTL */ u_int8_t ni_fqdn_namelen; /* length in octets of the FQDN */ u_int8_t ni_fqdn_name[3]; /* XXX: alignment */ } __packed; @@ -462,7 +462,7 @@ u_int8_t rr_segnum; u_int8_t rr_flags; u_int16_t rr_maxdelay; - u_int32_t rr_reserved; + uint32_t rr_reserved; } __packed; #define ICMP6_RR_FLAGS_TEST 0x80 @@ -497,9 +497,9 @@ u_int8_t rpu_keeplen; u_int8_t rpu_ramask; u_int8_t rpu_raflags; - u_int32_t rpu_vltime; - u_int32_t rpu_pltime; - u_int32_t rpu_flags; + uint32_t rpu_vltime; + uint32_t rpu_pltime; + uint32_t rpu_flags; struct in6_addr rpu_prefix; } __packed; #define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK 0x80 @@ -517,7 +517,7 @@ u_int16_t rrr_flags; u_int8_t rrr_ordinal; u_int8_t rrr_matchedlen; - u_int32_t rrr_ifid; + uint32_t rrr_ifid; struct in6_addr rrr_prefix; } __packed; #if BYTE_ORDER == BIG_ENDIAN @@ -533,7 +533,7 @@ */ struct icmp6_filter { - u_int32_t icmp6_filt[8]; + uint32_t icmp6_filt[8]; }; #ifdef _KERNEL diff --git a/src/include.new/netinet/in.h b/src/include.new/netinet/in.h index 1e88ad1..2e90f46 100644 --- a/src/include.new/netinet/in.h +++ b/src/include.new/netinet/in.h @@ -43,8 +43,8 @@ #define IPPROTO_TCP 6 /* tcp */ #define IPPROTO_UDP 17 /* user datagram protocol */ -#define INADDR_ANY (u_int32_t)0x00000000 -#define INADDR_BROADCAST (u_int32_t)0xffffffff /* must be masked */ +#define INADDR_ANY (uint32_t)0x00000000 +#define INADDR_BROADCAST (uint32_t)0xffffffff /* must be masked */ #ifndef _UINT8_T_DECLARED typedef __uint8_t uint8_t; @@ -344,61 +344,61 @@ * On subnets, the decomposition of addresses to host and net parts * is done according to subnet mask, not the masks here. */ -#define IN_CLASSA(i) (((u_int32_t)(i) & 0x80000000) == 0) +#define IN_CLASSA(i) (((uint32_t)(i) & 0x80000000) == 0) #define IN_CLASSA_NET 0xff000000 #define IN_CLASSA_NSHIFT 24 #define IN_CLASSA_HOST 0x00ffffff #define IN_CLASSA_MAX 128 -#define IN_CLASSB(i) (((u_int32_t)(i) & 0xc0000000) == 0x80000000) +#define IN_CLASSB(i) (((uint32_t)(i) & 0xc0000000) == 0x80000000) #define IN_CLASSB_NET 0xffff0000 #define IN_CLASSB_NSHIFT 16 #define IN_CLASSB_HOST 0x0000ffff #define IN_CLASSB_MAX 65536 -#define IN_CLASSC(i) (((u_int32_t)(i) & 0xe0000000) == 0xc0000000) +#define IN_CLASSC(i) (((uint32_t)(i) & 0xe0000000) == 0xc0000000) #define IN_CLASSC_NET 0xffffff00 #define IN_CLASSC_NSHIFT 8 #define IN_CLASSC_HOST 0x000000ff -#define IN_CLASSD(i) (((u_int32_t)(i) & 0xf0000000) == 0xe0000000) +#define IN_CLASSD(i) (((uint32_t)(i) & 0xf0000000) == 0xe0000000) #define IN_CLASSD_NET 0xf0000000 /* These ones aren't really */ #define IN_CLASSD_NSHIFT 28 /* net and host fields, but */ #define IN_CLASSD_HOST 0x0fffffff /* routing needn't know. */ #define IN_MULTICAST(i) IN_CLASSD(i) -#define IN_EXPERIMENTAL(i) (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) -#define IN_BADCLASS(i) (((u_int32_t)(i) & 0xf0000000) == 0xf0000000) +#define IN_EXPERIMENTAL(i) (((uint32_t)(i) & 0xf0000000) == 0xf0000000) +#define IN_BADCLASS(i) (((uint32_t)(i) & 0xf0000000) == 0xf0000000) -#define IN_LINKLOCAL(i) (((u_int32_t)(i) & 0xffff0000) == 0xa9fe0000) -#define IN_LOOPBACK(i) (((u_int32_t)(i) & 0xff000000) == 0x7f000000) -#define IN_ZERONET(i) (((u_int32_t)(i) & 0xff000000) == 0) +#define IN_LINKLOCAL(i) (((uint32_t)(i) & 0xffff0000) == 0xa9fe0000) +#define IN_LOOPBACK(i) (((uint32_t)(i) & 0xff000000) == 0x7f000000) +#define IN_ZERONET(i) (((uint32_t)(i) & 0xff000000) == 0) -#define IN_PRIVATE(i) ((((u_int32_t)(i) & 0xff000000) == 0x0a000000) || \ - (((u_int32_t)(i) & 0xfff00000) == 0xac100000) || \ - (((u_int32_t)(i) & 0xffff0000) == 0xc0a80000)) +#define IN_PRIVATE(i) ((((uint32_t)(i) & 0xff000000) == 0x0a000000) || \ + (((uint32_t)(i) & 0xfff00000) == 0xac100000) || \ + (((uint32_t)(i) & 0xffff0000) == 0xc0a80000)) -#define IN_LOCAL_GROUP(i) (((u_int32_t)(i) & 0xffffff00) == 0xe0000000) +#define IN_LOCAL_GROUP(i) (((uint32_t)(i) & 0xffffff00) == 0xe0000000) #define IN_ANY_LOCAL(i) (IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i)) -#define INADDR_LOOPBACK (u_int32_t)0x7f000001 +#define INADDR_LOOPBACK (uint32_t)0x7f000001 #ifndef _KERNEL #define INADDR_NONE 0xffffffff /* -1 return */ #endif -#define INADDR_UNSPEC_GROUP (u_int32_t)0xe0000000 /* 224.0.0.0 */ -#define INADDR_ALLHOSTS_GROUP (u_int32_t)0xe0000001 /* 224.0.0.1 */ -#define INADDR_ALLRTRS_GROUP (u_int32_t)0xe0000002 /* 224.0.0.2 */ -#define INADDR_ALLRPTS_GROUP (u_int32_t)0xe0000016 /* 224.0.0.22, IGMPv3 */ -#define INADDR_CARP_GROUP (u_int32_t)0xe0000012 /* 224.0.0.18 */ -#define INADDR_PFSYNC_GROUP (u_int32_t)0xe00000f0 /* 224.0.0.240 */ -#define INADDR_ALLMDNS_GROUP (u_int32_t)0xe00000fb /* 224.0.0.251 */ -#define INADDR_MAX_LOCAL_GROUP (u_int32_t)0xe00000ff /* 224.0.0.255 */ +#define INADDR_UNSPEC_GROUP (uint32_t)0xe0000000 /* 224.0.0.0 */ +#define INADDR_ALLHOSTS_GROUP (uint32_t)0xe0000001 /* 224.0.0.1 */ +#define INADDR_ALLRTRS_GROUP (uint32_t)0xe0000002 /* 224.0.0.2 */ +#define INADDR_ALLRPTS_GROUP (uint32_t)0xe0000016 /* 224.0.0.22, IGMPv3 */ +#define INADDR_CARP_GROUP (uint32_t)0xe0000012 /* 224.0.0.18 */ +#define INADDR_PFSYNC_GROUP (uint32_t)0xe00000f0 /* 224.0.0.240 */ +#define INADDR_ALLMDNS_GROUP (uint32_t)0xe00000fb /* 224.0.0.251 */ +#define INADDR_MAX_LOCAL_GROUP (uint32_t)0xe00000ff /* 224.0.0.255 */ #define IN_LOOPBACKNET 127 /* official! */ -#define IN_RFC3021_MASK (u_int32_t)0xfffffffe +#define IN_RFC3021_MASK (uint32_t)0xfffffffe /* * Options for use with [gs]etsockopt at the IP level. diff --git a/src/include.new/netinet/in_pcb.h b/src/include.new/netinet/in_pcb.h index 735ce5f..eaff1c2 100644 --- a/src/include.new/netinet/in_pcb.h +++ b/src/include.new/netinet/in_pcb.h @@ -72,7 +72,7 @@ * the following structure. */ struct in_addr_4in6 { - u_int32_t ia46_pad32[3]; + uint32_t ia46_pad32[3]; struct in_addr ia46_addr4; }; @@ -170,7 +170,7 @@ LIST_ENTRY(inpcb) inp_pcbgroup_wild; /* (g/i/p) group wildcard entry */ struct socket *inp_socket; /* (i) back pointer to socket */ struct ucred *inp_cred; /* (c) cache of socket cred */ - u_int32_t inp_flow; /* (i) IPv6 flow information */ + uint32_t inp_flow; /* (i) IPv6 flow information */ int inp_flags; /* (i) generic IP/datagram flags */ int inp_flags2; /* (i) generic IP/datagram flags #2*/ u_char inp_vflag; /* (i) IP version flag (v4/v6) */ diff --git a/src/include.new/netinet/in_systm.h b/src/include.new/netinet/in_systm.h index ebec8ce..721f282 100644 --- a/src/include.new/netinet/in_systm.h +++ b/src/include.new/netinet/in_systm.h @@ -47,9 +47,9 @@ * represent the types with the bytes in ``high-ender'' order. */ typedef u_int16_t n_short; /* short as received from the net */ -typedef u_int32_t n_long; /* long as received from the net */ +typedef uint32_t n_long; /* long as received from the net */ -typedef u_int32_t n_time; /* ms since 00:00 GMT, byte rev */ +typedef uint32_t n_time; /* ms since 00:00 GMT, byte rev */ #ifdef _KERNEL uint32_t iptime(void); diff --git a/src/include.new/netinet/ip6.h b/src/include.new/netinet/ip6.h index c970866..8e8bd5f 100644 --- a/src/include.new/netinet/ip6.h +++ b/src/include.new/netinet/ip6.h @@ -72,7 +72,7 @@ struct ip6_hdr { union { struct ip6_hdrctl { - u_int32_t ip6_un1_flow; /* 20 bits of flow-ID */ + uint32_t ip6_un1_flow; /* 20 bits of flow-ID */ u_int16_t ip6_un1_plen; /* payload length */ u_int8_t ip6_un1_nxt; /* next header */ u_int8_t ip6_un1_hlim; /* hop limit */ @@ -225,7 +225,7 @@ u_int8_t ip6r0_len; /* length in units of 8 octets */ u_int8_t ip6r0_type; /* always zero */ u_int8_t ip6r0_segleft; /* segments left */ - u_int32_t ip6r0_reserved; /* reserved field */ + uint32_t ip6r0_reserved; /* reserved field */ /* followed by up to 127 struct in6_addr */ } __packed; @@ -234,7 +234,7 @@ u_int8_t ip6f_nxt; /* next header */ u_int8_t ip6f_reserved; /* reserved field */ u_int16_t ip6f_offlg; /* offset, reserved, and flag */ - u_int32_t ip6f_ident; /* identification */ + uint32_t ip6f_ident; /* identification */ } __packed; #if BYTE_ORDER == BIG_ENDIAN diff --git a/src/include.new/netinet/ip_carp.h b/src/include.new/netinet/ip_carp.h index ad91286..c8e64ae 100644 --- a/src/include.new/netinet/ip_carp.h +++ b/src/include.new/netinet/ip_carp.h @@ -72,7 +72,7 @@ u_int8_t carp_pad1; /* reserved */ u_int8_t carp_advbase; /* advertisement interval */ u_int16_t carp_cksum; - u_int32_t carp_counter[2]; + uint32_t carp_counter[2]; unsigned char carp_md[20]; /* SHA1 HMAC */ } __packed; diff --git a/src/include.new/netinet/ip_compat.h b/src/include.new/netinet/ip_compat.h index 717c2c5..9cde03c 100644 --- a/src/include.new/netinet/ip_compat.h +++ b/src/include.new/netinet/ip_compat.h @@ -221,7 +221,7 @@ typedef u_long ioctlcmd_t; typedef struct uio uio_t; typedef int minor_t; -typedef u_int32_t u_32_t; +typedef uint32_t u_32_t; # define U_32_T 1 diff --git a/src/include.new/netinet/ip_fw.h b/src/include.new/netinet/ip_fw.h index 213a7b0..0e94a0a 100644 --- a/src/include.new/netinet/ip_fw.h +++ b/src/include.new/netinet/ip_fw.h @@ -261,7 +261,7 @@ * to skip past the last instruction of the block. * * NOTA BENE: in a couple of places we assume that - * sizeof(ipfw_insn) == sizeof(u_int32_t) + * sizeof(ipfw_insn) == sizeof(uint32_t) * this needs to be fixed. * */ @@ -280,7 +280,7 @@ * The F_INSN_SIZE(type) computes the size, in 4-byte words, of * a given type. */ -#define F_INSN_SIZE(t) ((sizeof (t))/sizeof(u_int32_t)) +#define F_INSN_SIZE(t) ((sizeof (t))/sizeof(uint32_t)) /* * This is used to store an array of 16-bit entries (ports etc.) @@ -296,7 +296,7 @@ */ typedef struct _ipfw_insn_u32 { ipfw_insn o; - u_int32_t d[1]; /* one or more */ + uint32_t d[1]; /* one or more */ } ipfw_insn_u32; /* @@ -350,7 +350,7 @@ */ typedef struct _ipfw_insn_altq { ipfw_insn o; - u_int32_t qid; + uint32_t qid; } ipfw_insn_altq; /* @@ -373,8 +373,8 @@ */ typedef struct _ipfw_insn_log { ipfw_insn o; - u_int32_t max_log; /* how many do we log -- 0 = all */ - u_int32_t log_left; /* how many left to log */ + uint32_t max_log; /* how many do we log -- 0 = all */ + uint32_t log_left; /* how many left to log */ } ipfw_insn_log; /* @@ -517,7 +517,7 @@ }; #define ACTION_PTR(rule) \ - (ipfw_insn *)( (u_int32_t *)((rule)->cmd) + ((rule)->act_ofs) ) + (ipfw_insn *)( (uint32_t *)((rule)->cmd) + ((rule)->act_ofs) ) #define RULESIZE(rule) (sizeof(struct ip_fw) + \ ((struct ip_fw *)(rule))->cmd_len * 4 - 4) @@ -562,13 +562,13 @@ u_int64_t pcnt; /* packet match counter */ u_int64_t bcnt; /* byte match counter */ struct ipfw_flow_id id; /* (masked) flow id */ - u_int32_t expire; /* expire time */ - u_int32_t bucket; /* which bucket in hash table */ - u_int32_t state; /* state of this rule (typically a + uint32_t expire; /* expire time */ + uint32_t bucket; /* which bucket in hash table */ + uint32_t state; /* state of this rule (typically a * combination of TCP flags) */ - u_int32_t ack_fwd; /* most recent ACKs in forward */ - u_int32_t ack_rev; /* and reverse directions (used */ + uint32_t ack_fwd; /* most recent ACKs in forward */ + uint32_t ack_rev; /* and reverse directions (used */ /* to generate keepalives) */ u_int16_t dyn_type; /* rule type */ u_int16_t count; /* refcount */ @@ -604,7 +604,7 @@ typedef struct _ipfw_table_entry { in_addr_t addr; /* network address */ - u_int32_t value; /* value */ + uint32_t value; /* value */ u_int16_t tbl; /* table number */ u_int8_t masklen; /* mask length */ } ipfw_table_entry; @@ -623,8 +623,8 @@ } ipfw_table_xentry; typedef struct _ipfw_table { - u_int32_t size; /* size of entries in bytes */ - u_int32_t cnt; /* # of entries */ + uint32_t size; /* size of entries in bytes */ + uint32_t cnt; /* # of entries */ u_int16_t tbl; /* table number */ ipfw_table_entry ent[0]; /* entries */ } ipfw_table; diff --git a/src/include.new/netinet/ip_icmp.h b/src/include.new/netinet/ip_icmp.h index 7dc9b70..ac30500 100644 --- a/src/include.new/netinet/ip_icmp.h +++ b/src/include.new/netinet/ip_icmp.h @@ -42,8 +42,8 @@ * Internal of an ICMP Router Advertisement */ struct icmp_ra_addr { - u_int32_t ira_addr; - u_int32_t ira_preference; + uint32_t ira_addr; + uint32_t ira_preference; }; /* @@ -110,7 +110,7 @@ /* options and then 64 bits of data */ } id_ip; struct icmp_ra_addr id_radv; - u_int32_t id_mask; + uint32_t id_mask; char id_data[1]; } icmp_dun; #define icmp_otime icmp_dun.id_ts.its_otime diff --git a/src/include.new/netinet/tcp.h b/src/include.new/netinet/tcp.h index 33ea713..524094c 100644 --- a/src/include.new/netinet/tcp.h +++ b/src/include.new/netinet/tcp.h @@ -38,7 +38,7 @@ #if __BSD_VISIBLE -typedef u_int32_t tcp_seq; +typedef uint32_t tcp_seq; #define tcp6_seq tcp_seq /* for KAME src sync over BSD*'s */ #define tcp6hdr tcphdr /* for KAME src sync over BSD*'s */ @@ -199,48 +199,48 @@ u_int8_t tcpi_snd_wscale:4, /* RFC1323 send shift value. */ tcpi_rcv_wscale:4; /* RFC1323 recv shift value. */ - u_int32_t tcpi_rto; /* Retransmission timeout (usec). */ - u_int32_t __tcpi_ato; - u_int32_t tcpi_snd_mss; /* Max segment size for send. */ - u_int32_t tcpi_rcv_mss; /* Max segment size for receive. */ + uint32_t tcpi_rto; /* Retransmission timeout (usec). */ + uint32_t __tcpi_ato; + uint32_t tcpi_snd_mss; /* Max segment size for send. */ + uint32_t tcpi_rcv_mss; /* Max segment size for receive. */ - u_int32_t __tcpi_unacked; - u_int32_t __tcpi_sacked; - u_int32_t __tcpi_lost; - u_int32_t __tcpi_retrans; - u_int32_t __tcpi_fackets; + uint32_t __tcpi_unacked; + uint32_t __tcpi_sacked; + uint32_t __tcpi_lost; + uint32_t __tcpi_retrans; + uint32_t __tcpi_fackets; /* Times; measurements in usecs. */ - u_int32_t __tcpi_last_data_sent; - u_int32_t __tcpi_last_ack_sent; /* Also unimpl. on Linux? */ - u_int32_t tcpi_last_data_recv; /* Time since last recv data. */ - u_int32_t __tcpi_last_ack_recv; + uint32_t __tcpi_last_data_sent; + uint32_t __tcpi_last_ack_sent; /* Also unimpl. on Linux? */ + uint32_t tcpi_last_data_recv; /* Time since last recv data. */ + uint32_t __tcpi_last_ack_recv; /* Metrics; variable units. */ - u_int32_t __tcpi_pmtu; - u_int32_t __tcpi_rcv_ssthresh; - u_int32_t tcpi_rtt; /* Smoothed RTT in usecs. */ - u_int32_t tcpi_rttvar; /* RTT variance in usecs. */ - u_int32_t tcpi_snd_ssthresh; /* Slow start threshold. */ - u_int32_t tcpi_snd_cwnd; /* Send congestion window. */ - u_int32_t __tcpi_advmss; - u_int32_t __tcpi_reordering; + uint32_t __tcpi_pmtu; + uint32_t __tcpi_rcv_ssthresh; + uint32_t tcpi_rtt; /* Smoothed RTT in usecs. */ + uint32_t tcpi_rttvar; /* RTT variance in usecs. */ + uint32_t tcpi_snd_ssthresh; /* Slow start threshold. */ + uint32_t tcpi_snd_cwnd; /* Send congestion window. */ + uint32_t __tcpi_advmss; + uint32_t __tcpi_reordering; - u_int32_t __tcpi_rcv_rtt; - u_int32_t tcpi_rcv_space; /* Advertised recv window. */ + uint32_t __tcpi_rcv_rtt; + uint32_t tcpi_rcv_space; /* Advertised recv window. */ /* FreeBSD extensions to tcp_info. */ - u_int32_t tcpi_snd_wnd; /* Advertised send window. */ - u_int32_t tcpi_snd_bwnd; /* No longer used. */ - u_int32_t tcpi_snd_nxt; /* Next egress seqno */ - u_int32_t tcpi_rcv_nxt; /* Next ingress seqno */ - u_int32_t tcpi_toe_tid; /* HWTID for TOE endpoints */ - u_int32_t tcpi_snd_rexmitpack; /* Retransmitted packets */ - u_int32_t tcpi_rcv_ooopack; /* Out-of-order packets */ - u_int32_t tcpi_snd_zerowin; /* Zero-sized windows sent */ + uint32_t tcpi_snd_wnd; /* Advertised send window. */ + uint32_t tcpi_snd_bwnd; /* No longer used. */ + uint32_t tcpi_snd_nxt; /* Next egress seqno */ + uint32_t tcpi_rcv_nxt; /* Next ingress seqno */ + uint32_t tcpi_toe_tid; /* HWTID for TOE endpoints */ + uint32_t tcpi_snd_rexmitpack; /* Retransmitted packets */ + uint32_t tcpi_rcv_ooopack; /* Out-of-order packets */ + uint32_t tcpi_snd_zerowin; /* Zero-sized windows sent */ /* Padding to grow without breaking ABI. */ - u_int32_t __tcpi_pad[26]; /* Padding. */ + uint32_t __tcpi_pad[26]; /* Padding. */ }; #endif diff --git a/src/include.new/netinet/tcp_syncache.h b/src/include.new/netinet/tcp_syncache.h index 126549c..4aeb553 100644 --- a/src/include.new/netinet/tcp_syncache.h +++ b/src/include.new/netinet/tcp_syncache.h @@ -54,10 +54,10 @@ struct in_conninfo sc_inc; /* addresses */ int sc_rxttime; /* retransmit time */ u_int16_t sc_rxmits; /* retransmit counter */ - u_int32_t sc_tsreflect; /* timestamp to reflect */ - u_int32_t sc_ts; /* our timestamp to send */ - u_int32_t sc_tsoff; /* ts offset w/ syncookies */ - u_int32_t sc_flowlabel; /* IPv6 flowlabel */ + uint32_t sc_tsreflect; /* timestamp to reflect */ + uint32_t sc_ts; /* our timestamp to send */ + uint32_t sc_tsoff; /* ts offset w/ syncookies */ + uint32_t sc_flowlabel; /* IPv6 flowlabel */ tcp_seq sc_irs; /* seq from peer */ tcp_seq sc_iss; /* our ISS */ struct mbuf *sc_ipopts; /* source route */ @@ -76,7 +76,7 @@ struct ucred *sc_cred; /* cred cache for jail checks */ void *sc_pspare; /* TCP_SIGNATURE */ - u_int32_t sc_spare[2]; /* UTO */ + uint32_t sc_spare[2]; /* UTO */ }; /* diff --git a/src/include.new/netinet/tcp_var.h b/src/include.new/netinet/tcp_var.h index cf2b560..9d44be6 100644 --- a/src/include.new/netinet/tcp_var.h +++ b/src/include.new/netinet/tcp_var.h @@ -169,9 +169,9 @@ u_char snd_scale; /* window scaling for send window */ u_char rcv_scale; /* window scaling for recv window */ u_char request_r_scale; /* pending window scaling */ - u_int32_t ts_recent; /* timestamp echo data */ + uint32_t ts_recent; /* timestamp echo data */ u_int ts_recent_age; /* when last updated */ - u_int32_t ts_offset; /* our timestamp offset */ + uint32_t ts_offset; /* our timestamp offset */ tcp_seq last_ack_sent; /* experimental */ @@ -192,7 +192,7 @@ episode starts at this seq number */ struct sackhint sackhint; /* SACK scoreboard hint */ int t_rttlow; /* smallest observerved RTT */ - u_int32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ + uint32_t rfbuf_ts; /* recv buffer autoscaling timestamp */ int rfbuf_cnt; /* recv buffer autoscaling byte count */ struct toedev *tod; /* toedev handling this connection */ int t_sndrexmitpack; /* retransmit packets sent */ @@ -311,14 +311,14 @@ #define TOF_SIGNATURE 0x0040 /* TCP-MD5 signature option (RFC2385) */ #define TOF_SACK 0x0080 /* Peer sent SACK option */ #define TOF_MAXOPT 0x0100 - u_int32_t to_tsval; /* new timestamp */ - u_int32_t to_tsecr; /* reflected timestamp */ + uint32_t to_tsval; /* new timestamp */ + uint32_t to_tsecr; /* reflected timestamp */ u_char *to_sacks; /* pointer to the first SACK blocks */ u_char *to_signature; /* pointer to the TCP-MD5 signature */ u_int16_t to_mss; /* maximum segment size */ u_int8_t to_wscale; /* window scaling */ u_int8_t to_nsacks; /* number of SACK blocks */ - u_int32_t to_spare; /* UTO */ + uint32_t to_spare; /* UTO */ }; /* @@ -361,8 +361,8 @@ u_short last_win; /* cached window value */ u_short tw_so_options; /* copy of so_options */ struct ucred *tw_cred; /* user credentials */ - u_int32_t t_recent; - u_int32_t ts_offset; /* our timestamp offset */ + uint32_t t_recent; + uint32_t ts_offset; /* our timestamp offset */ u_int t_starttime; int tw_time; TAILQ_ENTRY(tcptw) tw_2msl; diff --git a/src/include.new/netinet6/ah.h b/src/include.new/netinet6/ah.h index d3ad0d9..0ee33af 100644 --- a/src/include.new/netinet6/ah.h +++ b/src/include.new/netinet6/ah.h @@ -45,7 +45,7 @@ u_int8_t ah_nxt; /* Next Header */ u_int8_t ah_len; /* Length of data, in 32bit */ u_int16_t ah_reserve; /* Reserved for future use */ - u_int32_t ah_spi; /* Security parameter index */ + uint32_t ah_spi; /* Security parameter index */ /* variable size, 32bit bound*/ /* Authentication data */ }; @@ -53,8 +53,8 @@ u_int8_t ah_nxt; /* Next Header */ u_int8_t ah_len; /* Length of data + 1, in 32bit */ u_int16_t ah_reserve; /* Reserved for future use */ - u_int32_t ah_spi; /* Security parameter index */ - u_int32_t ah_seq; /* Sequence number field */ + uint32_t ah_spi; /* Security parameter index */ + uint32_t ah_seq; /* Sequence number field */ /* variable size, 32bit bound*/ /* Authentication data */ }; diff --git a/src/include.new/netinet6/esp.h b/src/include.new/netinet6/esp.h index 09b9387..a2d7e45 100644 --- a/src/include.new/netinet6/esp.h +++ b/src/include.new/netinet6/esp.h @@ -42,7 +42,7 @@ #endif struct esp { - u_int32_t esp_spi; /* ESP */ + uint32_t esp_spi; /* ESP */ /* variable size, 32bit bound */ /* Initialization Vector */ /* variable size */ /* Payload data */ /* variable size */ /* padding */ @@ -53,8 +53,8 @@ }; struct newesp { - u_int32_t esp_spi; /* ESP */ - u_int32_t esp_seq; /* Sequence number */ + uint32_t esp_spi; /* ESP */ + uint32_t esp_seq; /* Sequence number */ /* variable size */ /* (IV and) Payload data */ /* variable size */ /* padding */ /* 8bit */ /* pad size */ diff --git a/src/include.new/netinet6/in6.h b/src/include.new/netinet6/in6.h index 6c8a690..8ca0845 100644 --- a/src/include.new/netinet6/in6.h +++ b/src/include.new/netinet6/in6.h @@ -361,11 +361,11 @@ #define IFA6_IS_DEPRECATED(a) \ ((a)->ia6_lifetime.ia6t_pltime != ND6_INFINITE_LIFETIME && \ - (u_int32_t)((time_uptime - (a)->ia6_updatetime)) > \ + (uint32_t)((time_uptime - (a)->ia6_updatetime)) > \ (a)->ia6_lifetime.ia6t_pltime) #define IFA6_IS_INVALID(a) \ ((a)->ia6_lifetime.ia6t_vltime != ND6_INFINITE_LIFETIME && \ - (u_int32_t)((time_uptime - (a)->ia6_updatetime)) > \ + (uint32_t)((time_uptime - (a)->ia6_updatetime)) > \ (a)->ia6_lifetime.ia6t_vltime) #endif /* _KERNEL */ @@ -640,9 +640,9 @@ struct ip6_hdr; int in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t); -int in6_cksum(struct mbuf *, u_int8_t, u_int32_t, u_int32_t); -int in6_cksum_partial(struct mbuf *, u_int8_t, u_int32_t, u_int32_t, - u_int32_t); +int in6_cksum(struct mbuf *, u_int8_t, uint32_t, uint32_t); +int in6_cksum_partial(struct mbuf *, u_int8_t, uint32_t, uint32_t, + uint32_t); int in6_localaddr(struct in6_addr *); int in6_localip(struct in6_addr *); int in6_addrscope(struct in6_addr *); diff --git a/src/include.new/netinet6/in6_var.h b/src/include.new/netinet6/in6_var.h index 8544b48..de4b6a9 100644 --- a/src/include.new/netinet6/in6_var.h +++ b/src/include.new/netinet6/in6_var.h @@ -89,8 +89,8 @@ struct in6_addrlifetime { time_t ia6t_expire; /* valid lifetime expiration time */ time_t ia6t_preferred; /* preferred lifetime expiration time */ - u_int32_t ia6t_vltime; /* valid lifetime */ - u_int32_t ia6t_pltime; /* prefix lifetime */ + uint32_t ia6t_vltime; /* valid lifetime */ + uint32_t ia6t_pltime; /* prefix lifetime */ }; struct nd_ifinfo; @@ -131,7 +131,7 @@ struct sockaddr_in6 ia_net; /* network number of interface */ struct sockaddr_in6 ia_dstaddr; /* space for destination addr */ struct sockaddr_in6 ia_prefixmask; /* prefix mask */ - u_int32_t ia_plen; /* prefix length */ + uint32_t ia_plen; /* prefix length */ TAILQ_ENTRY(in6_ifaddr) ia_link; /* list of IPv6 addresses */ int ia6_flags; @@ -294,7 +294,7 @@ struct in6_addrlifetime ifru_lifetime; struct in6_ifstat ifru_stat; struct icmp6_ifstat ifru_icmp6stat; - u_int32_t ifru_scope_id[16]; + uint32_t ifru_scope_id[16]; } ifr_ifru; }; @@ -348,8 +348,8 @@ char ipr_name[IFNAMSIZ]; u_char ipr_origin; u_char ipr_plen; - u_int32_t ipr_vltime; - u_int32_t ipr_pltime; + uint32_t ipr_vltime; + uint32_t ipr_pltime; struct in6_prflags ipr_flags; struct sockaddr_in6 ipr_prefix; }; @@ -380,8 +380,8 @@ u_char autonomous : 1; u_char reserved : 6; } irr_raflagmask; - u_int32_t irr_vltime; - u_int32_t irr_pltime; + uint32_t irr_vltime; + uint32_t irr_pltime; struct in6_prflags irr_flags; struct sockaddr_in6 irr_matchprefix; struct sockaddr_in6 irr_useprefix; @@ -817,7 +817,7 @@ struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, struct in6_addr *); struct in6_ifaddr *in6ifa_llaonifp(struct ifnet *); char *ip6_sprintf(char *, const struct in6_addr *); -int in6_addr2zoneid(struct ifnet *, struct in6_addr *, u_int32_t *); +int in6_addr2zoneid(struct ifnet *, struct in6_addr *, uint32_t *); int in6_matchlen(struct in6_addr *, struct in6_addr *); int in6_are_prefix_equal(struct in6_addr *, struct in6_addr *, int); void in6_prefixlen2mask(struct in6_addr *, int); diff --git a/src/include.new/netinet6/ip6_ecn.h b/src/include.new/netinet6/ip6_ecn.h index 92aa889..1ac2e8b 100644 --- a/src/include.new/netinet6/ip6_ecn.h +++ b/src/include.new/netinet6/ip6_ecn.h @@ -36,6 +36,6 @@ */ #ifdef _KERNEL -extern void ip6_ecn_ingress(int, u_int32_t *, const u_int32_t *); -extern int ip6_ecn_egress(int, const u_int32_t *, u_int32_t *); +extern void ip6_ecn_ingress(int, uint32_t *, const uint32_t *); +extern int ip6_ecn_egress(int, const uint32_t *, uint32_t *); #endif diff --git a/src/include.new/netinet6/ip6_mroute.h b/src/include.new/netinet6/ip6_mroute.h index 7aa9d16..6038748 100644 --- a/src/include.new/netinet6/ip6_mroute.h +++ b/src/include.new/netinet6/ip6_mroute.h @@ -79,7 +79,7 @@ #define IF_SETSIZE 256 #endif -typedef u_int32_t if_mask; +typedef uint32_t if_mask; #define NIFBITS (sizeof(if_mask) * NBBY) /* bits per mask */ #ifndef howmany @@ -167,7 +167,7 @@ u_char im6_mbz; /* must be zero */ u_char im6_msgtype; /* what type of message */ u_int16_t im6_mif; /* mif rec'd on */ - u_int32_t im6_pad; /* padding for 64bit arch */ + uint32_t im6_pad; /* padding for 64bit arch */ struct in6_addr im6_src, im6_dst; }; diff --git a/src/include.new/netinet6/ip6_var.h b/src/include.new/netinet6/ip6_var.h index 580b8c2..7aab07e 100644 --- a/src/include.new/netinet6/ip6_var.h +++ b/src/include.new/netinet6/ip6_var.h @@ -71,7 +71,7 @@ struct ip6q { struct ip6asfrag *ip6q_down; struct ip6asfrag *ip6q_up; - u_int32_t ip6q_ident; + uint32_t ip6q_ident; u_int8_t ip6q_nxt; u_int8_t ip6q_ecn; u_int8_t ip6q_ttl; @@ -263,7 +263,7 @@ * XXX do not make it a kitchen sink! */ struct ip6aux { - u_int32_t ip6a_flags; + uint32_t ip6a_flags; #define IP6A_SWAP 0x01 /* swapped home/care-of on packet */ #define IP6A_HASEEN 0x02 /* HA was present */ #define IP6A_BRUID 0x04 /* BR Unique Identifier was present */ @@ -401,12 +401,12 @@ extern int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, struct mbuf *); -int ip6_process_hopopts(struct mbuf *, u_int8_t *, int, u_int32_t *, - u_int32_t *); +int ip6_process_hopopts(struct mbuf *, u_int8_t *, int, uint32_t *, + uint32_t *); struct mbuf **ip6_savecontrol_v4(struct inpcb *, struct mbuf *, struct mbuf **, int *); void ip6_savecontrol(struct inpcb *, struct mbuf *, struct mbuf **); -void ip6_notify_pmtu(struct inpcb *, struct sockaddr_in6 *, u_int32_t); +void ip6_notify_pmtu(struct inpcb *, struct sockaddr_in6 *, uint32_t); int ip6_sysctl(int *, u_int, void *, size_t *, void *, size_t); void ip6_forward(struct mbuf *, int); @@ -456,8 +456,8 @@ int in6_selectroute_fib(struct sockaddr_in6 *, struct ip6_pktopts *, struct ip6_moptions *, struct route_in6 *, struct ifnet **, struct rtentry **, u_int); -u_int32_t ip6_randomid(void); -u_int32_t ip6_randomflowlabel(void); +uint32_t ip6_randomid(void); +uint32_t ip6_randomflowlabel(void); void in6_delayed_cksum(struct mbuf *m, uint32_t plen, u_short offset); #endif /* _KERNEL */ diff --git a/src/include.new/netinet6/ipsec.h b/src/include.new/netinet6/ipsec.h index 2472b7d..2600753 100644 --- a/src/include.new/netinet6/ipsec.h +++ b/src/include.new/netinet6/ipsec.h @@ -77,7 +77,7 @@ int persist; /* will never be removed */ int refcnt; /* reference count */ struct secpolicyindex *spidx; /* selector - NULL if not valid */ - u_int32_t id; /* it identifies a policy in the SPD. */ + uint32_t id; /* it identifies a policy in the SPD. */ #define IPSEC_MANUAL_POLICYID_MAX 0x3fff /* * 1 - 0x3fff are reserved for user operation. @@ -308,7 +308,7 @@ struct ipsec_history { int ih_proto; - u_int32_t ih_spi; + uint32_t ih_spi; }; extern int ipsec_debug; @@ -353,14 +353,14 @@ struct secas; struct tcpcb; struct tcp6cb; -extern int ipsec_chkreplay __P((u_int32_t, struct secasvar *)); -extern int ipsec_updatereplay __P((u_int32_t, struct secasvar *)); +extern int ipsec_chkreplay __P((uint32_t, struct secasvar *)); +extern int ipsec_updatereplay __P((uint32_t, struct secasvar *)); extern size_t ipsec4_hdrsiz __P((struct mbuf *, u_int, struct inpcb *)); extern size_t ipsec_hdrsiz_tcp __P((struct tcpcb *)); struct ip; -extern const char *ipsec4_logpacketstr __P((struct ip *, u_int32_t)); +extern const char *ipsec4_logpacketstr __P((struct ip *, uint32_t)); extern const char *ipsec_logsastr __P((struct secasvar *)); extern void ipsec_dumpmbuf __P((struct mbuf *)); @@ -371,7 +371,7 @@ struct secasvar *)); extern struct mbuf *ipsec_copypkt __P((struct mbuf *)); extern void ipsec_delaux __P((struct mbuf *)); -extern int ipsec_addhist __P((struct mbuf *, int, u_int32_t)); +extern int ipsec_addhist __P((struct mbuf *, int, uint32_t)); extern int ipsec_getnhist __P((struct mbuf *)); extern void ipsec_clearhist __P((struct mbuf *)); diff --git a/src/include.new/netinet6/ipsec6.h b/src/include.new/netinet6/ipsec6.h index caae321..2ae9906 100644 --- a/src/include.new/netinet6/ipsec6.h +++ b/src/include.new/netinet6/ipsec6.h @@ -67,7 +67,7 @@ extern size_t ipsec6_hdrsiz __P((struct mbuf *, u_int, struct inpcb *)); struct ip6_hdr; -extern const char *ipsec6_logpacketstr __P((struct ip6_hdr *, u_int32_t)); +extern const char *ipsec6_logpacketstr __P((struct ip6_hdr *, uint32_t)); extern int ipsec6_output_trans __P((struct ipsec_output_state *, u_char *, struct mbuf *, struct secpolicy *, int, int *)); diff --git a/src/include.new/netinet6/nd6.h b/src/include.new/netinet6/nd6.h index 62cdc9d..1bbae02 100644 --- a/src/include.new/netinet6/nd6.h +++ b/src/include.new/netinet6/nd6.h @@ -62,12 +62,12 @@ #define ND6_LLINFO_PERMANENT(n) (((n)->la_expire == 0) && ((n)->ln_state > ND6_LLINFO_INCOMPLETE)) struct nd_ifinfo { - u_int32_t linkmtu; /* LinkMTU */ - u_int32_t maxmtu; /* Upper bound of LinkMTU */ - u_int32_t basereachable; /* BaseReachableTime */ - u_int32_t reachable; /* Reachable Time */ - u_int32_t retrans; /* Retrans Timer */ - u_int32_t flags; /* Flags */ + uint32_t linkmtu; /* LinkMTU */ + uint32_t maxmtu; /* Upper bound of LinkMTU */ + uint32_t basereachable; /* BaseReachableTime */ + uint32_t reachable; /* Reachable Time */ + uint32_t retrans; /* Retrans Timer */ + uint32_t flags; /* Flags */ int recalctm; /* BaseReacable re-calculation timer */ u_int8_t chlim; /* CurHopLimit */ u_int8_t initialized; /* Flag to see the entry is initialized */ @@ -157,8 +157,8 @@ struct prf_ra raflags; u_char prefixlen; u_char origin; - u_int32_t vltime; - u_int32_t pltime; + uint32_t vltime; + uint32_t pltime; time_t expire; u_short if_index; u_short advrtrs; /* number of advertisement routers */ @@ -171,10 +171,10 @@ struct prf_ra raflags; u_char prefixlen; u_char origin; - u_int32_t vltime; - u_int32_t pltime; + uint32_t vltime; + uint32_t pltime; time_t expire; - u_int32_t flags; + uint32_t flags; int refcnt; u_short if_index; u_short advrtrs; /* number of advertisement routers */ @@ -185,12 +185,12 @@ struct in6_ondireq { char ifname[IFNAMSIZ]; struct { - u_int32_t linkmtu; /* LinkMTU */ - u_int32_t maxmtu; /* Upper bound of LinkMTU */ - u_int32_t basereachable; /* BaseReachableTime */ - u_int32_t reachable; /* Reachable Time */ - u_int32_t retrans; /* Retrans Timer */ - u_int32_t flags; /* Flags */ + uint32_t linkmtu; /* LinkMTU */ + uint32_t maxmtu; /* Upper bound of LinkMTU */ + uint32_t basereachable; /* BaseReachableTime */ + uint32_t reachable; /* Reachable Time */ + uint32_t retrans; /* Retrans Timer */ + uint32_t flags; /* Flags */ int recalctm; /* BaseReacable re-calculation timer */ u_int8_t chlim; /* CurHopLimit */ u_int8_t receivedra; @@ -252,8 +252,8 @@ struct sockaddr_in6 ndpr_prefix; u_char ndpr_plen; - u_int32_t ndpr_vltime; /* advertised valid lifetime */ - u_int32_t ndpr_pltime; /* advertised preferred lifetime */ + uint32_t ndpr_vltime; /* advertised valid lifetime */ + uint32_t ndpr_pltime; /* advertised preferred lifetime */ struct prf_ra ndpr_flags; }; @@ -265,15 +265,15 @@ struct sockaddr_in6 ndpr_prefix; /* prefix */ struct in6_addr ndpr_mask; /* netmask derived from the prefix */ - u_int32_t ndpr_vltime; /* advertised valid lifetime */ - u_int32_t ndpr_pltime; /* advertised preferred lifetime */ + uint32_t ndpr_vltime; /* advertised valid lifetime */ + uint32_t ndpr_pltime; /* advertised preferred lifetime */ time_t ndpr_expire; /* expiration time of the prefix */ time_t ndpr_preferred; /* preferred time of the prefix */ time_t ndpr_lastupdate; /* reception time of last advertisement */ struct prf_ra ndpr_flags; - u_int32_t ndpr_stateflags; /* actual state flags */ + uint32_t ndpr_stateflags; /* actual state flags */ /* list of routers that advertise the prefix: */ LIST_HEAD(pr_rtrhead, nd_pfxrouter) ndpr_advrtrs; u_char ndpr_plen; @@ -350,8 +350,8 @@ /* nd6_rtr.c */ VNET_DECLARE(int, nd6_defifindex); VNET_DECLARE(int, ip6_desync_factor); /* seconds */ -VNET_DECLARE(u_int32_t, ip6_temp_preferred_lifetime); /* seconds */ -VNET_DECLARE(u_int32_t, ip6_temp_valid_lifetime); /* seconds */ +VNET_DECLARE(uint32_t, ip6_temp_preferred_lifetime); /* seconds */ +VNET_DECLARE(uint32_t, ip6_temp_valid_lifetime); /* seconds */ VNET_DECLARE(int, ip6_temp_regen_advance); /* seconds */ #define V_nd6_defifindex VNET(nd6_defifindex) #define V_ip6_desync_factor VNET(ip6_desync_factor) diff --git a/src/include.new/netinet6/scope6_var.h b/src/include.new/netinet6/scope6_var.h index 195d635..c8e22f9 100644 --- a/src/include.new/netinet6/scope6_var.h +++ b/src/include.new/netinet6/scope6_var.h @@ -41,7 +41,7 @@ * 16 is correspondent to 4bit multicast scope field. * i.e. from node-local to global with some reserved/unassigned types. */ - u_int32_t s6id_list[16]; + uint32_t s6id_list[16]; }; VNET_DECLARE(int, deembed_scopeid); @@ -53,10 +53,10 @@ int scope6_ioctl(u_long cmd, caddr_t data, struct ifnet *); void scope6_setdefault(struct ifnet *); int scope6_get_default(struct scope6_id *); -u_int32_t scope6_addr2default(struct in6_addr *); +uint32_t scope6_addr2default(struct in6_addr *); int sa6_embedscope(struct sockaddr_in6 *, int); int sa6_recoverscope(struct sockaddr_in6 *); -int in6_setscope(struct in6_addr *, struct ifnet *, u_int32_t *); +int in6_setscope(struct in6_addr *, struct ifnet *, uint32_t *); int in6_clearscope(struct in6_addr *); uint16_t in6_getscope(struct in6_addr *); #endif /* _KERNEL */ diff --git a/src/include.new/netipsec/ah.h b/src/include.new/netipsec/ah.h index 7cb57ed..4991339 100644 --- a/src/include.new/netipsec/ah.h +++ b/src/include.new/netipsec/ah.h @@ -41,7 +41,7 @@ u_int8_t ah_nxt; /* Next Header */ u_int8_t ah_len; /* Length of data, in 32bit */ u_int16_t ah_reserve; /* Reserved for future use */ - u_int32_t ah_spi; /* Security parameter index */ + uint32_t ah_spi; /* Security parameter index */ /* variable size, 32bit bound*/ /* Authentication data */ }; @@ -49,8 +49,8 @@ u_int8_t ah_nxt; /* Next Header */ u_int8_t ah_len; /* Length of data + 1, in 32bit */ u_int16_t ah_reserve; /* Reserved for future use */ - u_int32_t ah_spi; /* Security parameter index */ - u_int32_t ah_seq; /* Sequence number field */ + uint32_t ah_spi; /* Security parameter index */ + uint32_t ah_seq; /* Sequence number field */ /* variable size, 32bit bound*/ /* Authentication data */ }; #endif /*_NETIPSEC_AH_H_*/ diff --git a/src/include.new/netipsec/esp.h b/src/include.new/netipsec/esp.h index da8730f..c121186 100644 --- a/src/include.new/netipsec/esp.h +++ b/src/include.new/netipsec/esp.h @@ -38,7 +38,7 @@ #define _NETIPSEC_ESP_H_ struct esp { - u_int32_t esp_spi; /* ESP */ + uint32_t esp_spi; /* ESP */ /*variable size, 32bit bound*/ /* Initialization Vector */ /*variable size*/ /* Payload data */ /*variable size*/ /* padding */ @@ -49,8 +49,8 @@ }; struct newesp { - u_int32_t esp_spi; /* ESP */ - u_int32_t esp_seq; /* Sequence number */ + uint32_t esp_spi; /* ESP */ + uint32_t esp_seq; /* Sequence number */ /*variable size*/ /* (IV and) Payload data */ /*variable size*/ /* padding */ /*8bit*/ /* pad size */ diff --git a/src/include.new/netipsec/ipsec.h b/src/include.new/netipsec/ipsec.h index 02796e4..53a4655 100644 --- a/src/include.new/netipsec/ipsec.h +++ b/src/include.new/netipsec/ipsec.h @@ -86,7 +86,7 @@ u_int refcnt; /* reference count */ struct secpolicyindex spidx; /* selector */ - u_int32_t id; /* It's unique number on the system. */ + uint32_t id; /* It's unique number on the system. */ u_int state; /* 0: dead, others: alive */ #define IPSEC_SPSTATE_DEAD 0 #define IPSEC_SPSTATE_ALIVE 1 @@ -279,7 +279,7 @@ struct ipsec_history { int ih_proto; - u_int32_t ih_spi; + uint32_t ih_spi; }; VNET_DECLARE(int, ipsec_debug); @@ -348,8 +348,8 @@ struct secas; struct tcpcb; -extern int ipsec_chkreplay(u_int32_t, struct secasvar *); -extern int ipsec_updatereplay(u_int32_t, struct secasvar *); +extern int ipsec_chkreplay(uint32_t, struct secasvar *); +extern int ipsec_updatereplay(uint32_t, struct secasvar *); extern size_t ipsec_hdrsiz(struct mbuf *, u_int, struct inpcb *); extern size_t ipsec_hdrsiz_tcp(struct tcpcb *); diff --git a/src/include.new/netipsec/key.h b/src/include.new/netipsec/key.h index aa3f348..852fb0d 100644 --- a/src/include.new/netipsec/key.h +++ b/src/include.new/netipsec/key.h @@ -50,7 +50,7 @@ extern int key_havesp(u_int dir); extern struct secpolicy *key_allocsp(struct secpolicyindex *, u_int, const char*, int); -extern struct secpolicy *key_allocsp2(u_int32_t spi, union sockaddr_union *dst, +extern struct secpolicy *key_allocsp2(uint32_t spi, union sockaddr_union *dst, u_int8_t proto, u_int dir, const char*, int); extern struct secpolicy *key_newsp(const char*, int); #if 0 @@ -74,7 +74,7 @@ #define KEY_FREESP(spp) \ _key_freesp(spp, __FILE__, __LINE__) -extern struct secasvar *key_allocsa(union sockaddr_union *, u_int, u_int32_t, +extern struct secasvar *key_allocsa(union sockaddr_union *, u_int, uint32_t, const char*, int); extern void key_addrefsa(struct secasvar *, const char*, int); extern void key_freesav(struct secasvar **, const char*, int); diff --git a/src/include.new/netipsec/key_debug.h b/src/include.new/netipsec/key_debug.h index 9b7ae49..f8e2f57 100644 --- a/src/include.new/netipsec/key_debug.h +++ b/src/include.new/netipsec/key_debug.h @@ -56,7 +56,7 @@ #define KEYDEBUG(lev,arg) \ do { if ((V_key_debug_level & (lev)) == (lev)) { arg; } } while (0) -VNET_DECLARE(u_int32_t, key_debug_level); +VNET_DECLARE(uint32_t, key_debug_level); #define V_key_debug_level VNET(key_debug_level) #endif /*_KERNEL*/ diff --git a/src/include.new/netipsec/keydb.h b/src/include.new/netipsec/keydb.h index da5235d..5b554e3 100644 --- a/src/include.new/netipsec/keydb.h +++ b/src/include.new/netipsec/keydb.h @@ -56,7 +56,7 @@ union sockaddr_union dst; /* destination address for SA */ u_int16_t proto; /* IPPROTO_ESP or IPPROTO_AH */ u_int8_t mode; /* mode of protocol, see ipsec.h */ - u_int32_t reqid; /* reqid id who owned this SA */ + uint32_t reqid; /* reqid id who owned this SA */ /* see IPSEC_MANUAL_REQID_MAX. */ }; @@ -79,7 +79,7 @@ }; struct seclifetime { - u_int32_t allocations; + uint32_t allocations; u_int64_t bytes; u_int64_t addtime; u_int64_t usetime; @@ -117,8 +117,8 @@ u_int8_t alg_auth; /* Authentication Algorithm Identifier*/ u_int8_t alg_enc; /* Cipher Algorithm Identifier */ u_int8_t alg_comp; /* Compression Algorithm Identifier */ - u_int32_t spi; /* SPI Value, network byte order */ - u_int32_t flags; /* holder for SADB_KEY_FLAGS */ + uint32_t spi; /* SPI Value, network byte order */ + uint32_t flags; /* holder for SADB_KEY_FLAGS */ struct seckey *key_auth; /* Key for Authentication */ struct seckey *key_enc; /* Key for Encryption */ @@ -134,7 +134,7 @@ struct seclifetime *lft_h; /* HARD lifetime */ struct seclifetime *lft_s; /* SOFT lifetime */ - u_int32_t seq; /* sequence number */ + uint32_t seq; /* sequence number */ pid_t pid; /* message's pid */ struct secashead *sah; /* back pointer to the secashead */ @@ -166,10 +166,10 @@ /* replay prevention */ struct secreplay { - u_int32_t count; + uint32_t count; u_int wsize; /* window size, i.g. 4 bytes */ - u_int32_t seq; /* used by sender */ - u_int32_t lastseq; /* used by receiver */ + uint32_t seq; /* used by sender */ + uint32_t lastseq; /* used by receiver */ caddr_t bitmap; /* used by receiver */ int overflow; /* overflow flag */ }; @@ -187,7 +187,7 @@ struct secasindex saidx; - u_int32_t seq; /* sequence number */ + uint32_t seq; /* sequence number */ time_t created; /* for lifetime */ int count; /* for lifetime */ }; diff --git a/src/include.new/netipsec/xform.h b/src/include.new/netipsec/xform.h index 010f975..b3948e0 100644 --- a/src/include.new/netipsec/xform.h +++ b/src/include.new/netipsec/xform.h @@ -55,7 +55,7 @@ * processing. */ struct tdb_ident { - u_int32_t spi; + uint32_t spi; union sockaddr_union dst; u_int8_t proto; /* Cache those two for enc(4) in xform_ipip. */ @@ -68,7 +68,7 @@ */ struct tdb_crypto { struct ipsecrequest *tc_isr; /* ipsec request state */ - u_int32_t tc_spi; /* associated SPI */ + uint32_t tc_spi; /* associated SPI */ union sockaddr_union tc_dst; /* dst addr of packet */ u_int8_t tc_proto; /* current protocol, e.g. AH */ u_int8_t tc_nxt; /* next protocol, e.g. IPV4 */ diff --git a/src/include.new/netkey/key.h b/src/include.new/netkey/key.h index 3f14f58..b2fc89e 100644 --- a/src/include.new/netkey/key.h +++ b/src/include.new/netkey/key.h @@ -58,10 +58,10 @@ struct sockaddr *, struct sockaddr *, struct sockaddr *); extern int key_checkrequest (struct ipsecrequest *isr, struct secasindex *); -extern struct secasvar *key_allocsa(u_int, caddr_t, caddr_t, u_int, u_int32_t); +extern struct secasvar *key_allocsa(u_int, caddr_t, caddr_t, u_int, uint32_t); extern void key_freesp(struct secpolicy *); extern void key_freesav(struct secasvar *); -extern struct secpolicy *key_newsp(u_int32_t); +extern struct secpolicy *key_newsp(uint32_t); extern struct secpolicy *key_msg2sp(struct sadb_x_policy *, size_t, int *); extern struct mbuf *key_sp2msg(struct secpolicy *); extern int key_cmpspidx_exactly diff --git a/src/include.new/netkey/key_debug.h b/src/include.new/netkey/key_debug.h index d66b319..c811044 100644 --- a/src/include.new/netkey/key_debug.h +++ b/src/include.new/netkey/key_debug.h @@ -56,7 +56,7 @@ #define KEYDEBUG(lev,arg) \ do { if ((key_debug_level & (lev)) == (lev)) { arg; } } while (/*CONSTCOND*/ 0) -extern u_int32_t key_debug_level; +extern uint32_t key_debug_level; #endif /*_KERNEL*/ struct sadb_msg; diff --git a/src/include.new/netkey/keydb.h b/src/include.new/netkey/keydb.h index dc5eb69..da76489 100644 --- a/src/include.new/netkey/keydb.h +++ b/src/include.new/netkey/keydb.h @@ -56,7 +56,7 @@ struct sockaddr_storage dst; /* destination address for SA */ u_int16_t proto; /* IPPROTO_ESP or IPPROTO_AH */ u_int8_t mode; /* mode of protocol, see ipsec.h */ - u_int32_t reqid; /* reqid id who owned this SA */ + uint32_t reqid; /* reqid id who owned this SA */ /* see IPSEC_MANUAL_REQID_MAX. */ }; @@ -93,8 +93,8 @@ u_int8_t alg_auth; /* Authentication Algorithm Identifier*/ u_int8_t alg_enc; /* Cipher Algorithm Identifier */ - u_int32_t spi; /* SPI Value, network byte order */ - u_int32_t flags; /* holder for SADB_KEY_FLAGS */ + uint32_t spi; /* SPI Value, network byte order */ + uint32_t flags; /* holder for SADB_KEY_FLAGS */ struct sadb_key *key_auth; /* Key for Authentication */ struct sadb_key *key_enc; /* Key for Encryption */ @@ -115,7 +115,7 @@ struct secashead *sah; /* back pointer to the secashead */ - u_int32_t id; /* SA id */ + uint32_t id; /* SA id */ }; /* replay prevention */ @@ -142,7 +142,7 @@ struct secasindex saidx; - u_int32_t seq; /* sequence number */ + uint32_t seq; /* sequence number */ long created; /* for lifetime */ int count; /* for lifetime */ }; @@ -162,7 +162,7 @@ struct secpolicy; struct secpolicyindex; extern struct secpolicy *keydb_newsecpolicy(void); -extern u_int32_t keydb_newspid(void); +extern uint32_t keydb_newspid(void); extern void keydb_delsecpolicy(struct secpolicy *); extern int keydb_setsecpolicyindex (struct secpolicy *, struct secpolicyindex *); diff --git a/src/include.new/netncp/ncp.h b/src/include.new/netncp/ncp.h index 26f9918..74d2315 100644 --- a/src/include.new/netncp/ncp.h +++ b/src/include.new/netncp/ncp.h @@ -15,7 +15,7 @@ #define NCP_VERMIN 3500 #define NCP_VERSION (NCP_VERMAJ*100000 + NCP_VERMIN) -typedef u_int32_t nwdirent; +typedef uint32_t nwdirent; typedef char nstr8; typedef nstr8* pnstr8; @@ -23,7 +23,7 @@ typedef u_int8_t* pnuint8; typedef u_int16_t nuint16; typedef nuint16* pnuint16; -typedef u_int32_t nuint32; +typedef uint32_t nuint32; typedef nuint32* pnuint32; @@ -64,7 +64,7 @@ struct ncp_fh_s { u_int16_t val1; union { - u_int32_t val32; + uint32_t val32; u_int16_t val16; } val; } __packed; @@ -78,7 +78,7 @@ /* -- Bindery properties -- */ struct ncp_bindery_object { - u_int32_t object_id; + uint32_t object_id; u_int16_t object_type; u_int8_t object_name[NCP_BINDERY_NAME_LEN]; u_int8_t object_flags; @@ -105,7 +105,7 @@ char file_name[NCP_MAX_FILENAME + 1]; u_int8_t file_attributes; u_int8_t file_mode; - u_int32_t file_length; + uint32_t file_length; u_int16_t creation_date; u_int16_t access_date; u_int16_t update_date; @@ -114,24 +114,24 @@ struct nw_queue_job_entry { u_int16_t InUse; - u_int32_t prev; - u_int32_t next; - u_int32_t ClientStation; - u_int32_t ClientTask; - u_int32_t ClientObjectID; - u_int32_t TargetServerID; + uint32_t prev; + uint32_t next; + uint32_t ClientStation; + uint32_t ClientTask; + uint32_t ClientObjectID; + uint32_t TargetServerID; u_int8_t TargetExecTime[6]; u_int8_t JobEntryTime[6]; - u_int32_t JobNumber; + uint32_t JobNumber; u_int16_t JobType; u_int16_t JobPosition; u_int16_t JobControlFlags; u_int8_t FileNameLen; char JobFileName[13]; - u_int32_t JobFileHandle; - u_int32_t ServerStation; - u_int32_t ServerTaskNumber; - u_int32_t ServerObjectID; + uint32_t JobFileHandle; + uint32_t ServerStation; + uint32_t ServerTaskNumber; + uint32_t ServerObjectID; char JobTextDescription[50]; char ClientRecordArea[152]; } __packed; @@ -172,7 +172,7 @@ } __packed; struct ncp_station_addr { - u_int32_t NetWork; + uint32_t NetWork; u_int8_t Node[6]; u_int16_t Socket; } __packed; @@ -190,21 +190,21 @@ u_int8_t LastLogin[6]; u_int8_t RestrictionMask; u_int8_t reserved; - u_int32_t MaxDiskUsage; + uint32_t MaxDiskUsage; u_int16_t BadLoginCount; - u_int32_t BadLoginCountDown; + uint32_t BadLoginCountDown; struct ncp_station_addr LastIntruder; } __packed; #define NCP_VOLNAME_LEN (16) #define NCP_NUMBER_OF_VOLUMES (64) struct ncp_volume_info { - u_int32_t total_blocks; - u_int32_t free_blocks; - u_int32_t purgeable_blocks; - u_int32_t not_yet_purgeable_blocks; - u_int32_t total_dir_entries; - u_int32_t available_dir_entries; + uint32_t total_blocks; + uint32_t free_blocks; + uint32_t purgeable_blocks; + uint32_t not_yet_purgeable_blocks; + uint32_t total_dir_entries; + uint32_t available_dir_entries; u_int8_t sectors_per_block; char volume_name[NCP_VOLNAME_LEN + 1]; }; @@ -288,30 +288,30 @@ #endif struct nw_entry_info { - u_int32_t spaceAlloc; - u_int32_t attributes; /* LH */ + uint32_t spaceAlloc; + uint32_t attributes; /* LH */ u_int16_t flags; /* internal */ - u_int32_t dataStreamSize; - u_int32_t totalStreamSize; + uint32_t dataStreamSize; + uint32_t totalStreamSize; u_int16_t numberOfStreams; u_int16_t creationTime; /* LH */ u_int16_t creationDate; /* LH */ - u_int32_t creatorID; /* HL */ + uint32_t creatorID; /* HL */ u_int16_t modifyTime; /* LH */ u_int16_t modifyDate; /* LH */ - u_int32_t modifierID; /* HL */ + uint32_t modifierID; /* HL */ u_int16_t lastAccessDate; /* LH */ u_int16_t archiveTime; /* LH */ u_int16_t archiveDate; /* LH */ - u_int32_t archiverID; /* HL */ + uint32_t archiverID; /* HL */ u_int16_t inheritedRightsMask; /* LH */ - u_int32_t dirEntNum; - u_int32_t DosDirNum; - u_int32_t volNumber; - u_int32_t EADataSize; - u_int32_t EAKeyCount; - u_int32_t EAKeySize; - u_int32_t NSCreator; + uint32_t dirEntNum; + uint32_t DosDirNum; + uint32_t volNumber; + uint32_t EADataSize; + uint32_t EAKeyCount; + uint32_t EAKeySize; + uint32_t NSCreator; u_int8_t nameLen; u_int8_t entryName[256]; } __packed; @@ -334,26 +334,26 @@ #define DM_MAXIMUM_SPACE 0x2000L struct nw_modify_dos_info { - u_int32_t attributes; + uint32_t attributes; u_int16_t creationDate; u_int16_t creationTime; - u_int32_t creatorID; + uint32_t creatorID; u_int16_t modifyDate; u_int16_t modifyTime; - u_int32_t modifierID; + uint32_t modifierID; u_int16_t archiveDate; u_int16_t archiveTime; - u_int32_t archiverID; + uint32_t archiverID; u_int16_t lastAccessDate; u_int16_t inheritanceGrantMask; u_int16_t inheritanceRevokeMask; - u_int32_t maximumSpace; + uint32_t maximumSpace; } __packed; struct nw_search_seq { u_int8_t volNumber; - u_int32_t dirNumber; - u_int32_t searchDirNumber; + uint32_t dirNumber; + uint32_t searchDirNumber; } __packed; typedef struct nw_search_seq SEARCH_SEQUENCE; diff --git a/src/include.new/netncp/ncp_conn.h b/src/include.new/netncp/ncp_conn.h index 535de9e..26e7b4a 100644 --- a/src/include.new/netncp/ncp_conn.h +++ b/src/include.new/netncp/ncp_conn.h @@ -87,7 +87,7 @@ char server[NCP_BINDERY_NAME_LEN+1]; char *user; char *password; - u_int32_t objtype; + uint32_t objtype; union { struct sockaddr addr; struct sockaddr_ipx ipxaddr; @@ -180,8 +180,8 @@ u_int8_t seq; int buffer_size; /* Negotiated bufsize */ /* Fields used to make packet signatures */ - u_int32_t sign_root[2]; - u_int32_t sign_state[4]; /* md4 state */ + uint32_t sign_root[2]; + uint32_t sign_state[4]; /* md4 state */ #ifdef NCPBURST /* Fields used for packet bursting */ u_long bc_pktseq; /* raw packet sequence */ diff --git a/src/include.new/netncp/ncp_lib.h b/src/include.new/netncp/ncp_lib.h index ffe1262..7d49627 100644 --- a/src/include.new/netncp/ncp_lib.h +++ b/src/include.new/netncp/ncp_lib.h @@ -177,9 +177,9 @@ /* bindery calls */ int ncp_get_bindery_object_id(NWCONN_HANDLE, u_int16_t, const char *, struct ncp_bindery_object *); -int ncp_get_bindery_object_name(NWCONN_HANDLE, u_int32_t, +int ncp_get_bindery_object_name(NWCONN_HANDLE, uint32_t, struct ncp_bindery_object *); -int ncp_scan_bindery_object(NWCONN_HANDLE, u_int32_t, u_int16_t, +int ncp_scan_bindery_object(NWCONN_HANDLE, uint32_t, u_int16_t, char *, struct ncp_bindery_object *); int ncp_read_property_value(NWCONN_HANDLE, int object_type, const char *, int, const char *, struct nw_property *); @@ -191,18 +191,18 @@ struct ncp_bindery_object *); /* queue calls */ -int ncp_create_queue_job_and_file(NWCONN_HANDLE, u_int32_t, struct queue_job *); -int ncp_close_file_and_start_job(NWCONN_HANDLE, u_int32_t, struct queue_job *); -int ncp_attach_to_queue(NWCONN_HANDLE, u_int32_t); -int ncp_detach_from_queue(NWCONN_HANDLE, u_int32_t); -int ncp_service_queue_job(NWCONN_HANDLE, u_int32_t, u_int16_t, +int ncp_create_queue_job_and_file(NWCONN_HANDLE, uint32_t, struct queue_job *); +int ncp_close_file_and_start_job(NWCONN_HANDLE, uint32_t, struct queue_job *); +int ncp_attach_to_queue(NWCONN_HANDLE, uint32_t); +int ncp_detach_from_queue(NWCONN_HANDLE, uint32_t); +int ncp_service_queue_job(NWCONN_HANDLE, uint32_t, u_int16_t, struct queue_job *); -int ncp_finish_servicing_job(NWCONN_HANDLE, u_int32_t, u_int32_t, u_int32_t); -int ncp_abort_servicing_job(NWCONN_HANDLE, u_int32_t, u_int32_t); -int ncp_get_queue_length(NWCONN_HANDLE, u_int32_t, u_int32_t *); -int ncp_get_queue_job_ids(NWCONN_HANDLE, u_int32_t, u_int32_t, - u_int32_t *, u_int32_t *, u_int32_t []); -int ncp_get_queue_job_info(NWCONN_HANDLE, u_int32_t, u_int32_t, +int ncp_finish_servicing_job(NWCONN_HANDLE, uint32_t, uint32_t, uint32_t); +int ncp_abort_servicing_job(NWCONN_HANDLE, uint32_t, uint32_t); +int ncp_get_queue_length(NWCONN_HANDLE, uint32_t, uint32_t *); +int ncp_get_queue_job_ids(NWCONN_HANDLE, uint32_t, uint32_t, + uint32_t *, uint32_t *, uint32_t []); +int ncp_get_queue_job_info(NWCONN_HANDLE, uint32_t, uint32_t, struct nw_queue_job_entry *); /* * filesystem and volume calls @@ -216,9 +216,9 @@ /* misc ncp calls */ int ncp_get_file_server_information(NWCONN_HANDLE, struct ncp_file_server_info *); -int ncp_get_stations_logged_info(NWCONN_HANDLE, u_int32_t, +int ncp_get_stations_logged_info(NWCONN_HANDLE, uint32_t, struct ncp_bindery_object *, time_t *); -int ncp_get_internet_address(NWCONN_HANDLE, u_int32_t, struct ipx_addr *, +int ncp_get_internet_address(NWCONN_HANDLE, uint32_t, struct ipx_addr *, u_int8_t *); NWCCODE NWGetObjectConnectionNumbers(NWCONN_HANDLE, pnstr8, nuint16, pnuint16, pnuint16, nuint16); diff --git a/src/include.new/netncp/ncp_rq.h b/src/include.new/netncp/ncp_rq.h index 509bf50..3c7ed07 100644 --- a/src/include.new/netncp/ncp_rq.h +++ b/src/include.new/netncp/ncp_rq.h @@ -41,18 +41,18 @@ #define getbw(buf,ofs) ((u_int16_t)(getb(buf,ofs))) #define getwle(buf,ofs) (le16toh(*((u_int16_t*)(&((u_int8_t*)(buf))[ofs])))) -#define getdle(buf,ofs) (le32toh(*((u_int32_t*)(&((u_int8_t*)(buf))[ofs])))) +#define getdle(buf,ofs) (le32toh(*((uint32_t*)(&((u_int8_t*)(buf))[ofs])))) #define getwbe(buf,ofs) (be16toh(*((u_int16_t*)(&((u_int8_t*)(buf))[ofs])))) -#define getdbe(buf,ofs) (be32toh(*((u_int32_t*)(&((u_int8_t*)(buf))[ofs])))) +#define getdbe(buf,ofs) (be32toh(*((uint32_t*)(&((u_int8_t*)(buf))[ofs])))) #define setwle(buf,ofs,val) \ (*((u_int16_t*)(&((u_int8_t*)(buf))[ofs])))=htole16(val) #define setdle(buf,ofs,val) \ - (*((u_int32_t*)(&((u_int8_t*)(buf))[ofs])))=htole32(val) + (*((uint32_t*)(&((u_int8_t*)(buf))[ofs])))=htole32(val) #define setwbe(buf,ofs,val) \ (*((u_int16_t*)(&((u_int8_t*)(buf))[ofs])))=htobe16(val) #define setdbe(buf,ofs,val) \ - (*((u_int32_t*)(&((u_int8_t*)(buf))[ofs])))=htobe32(val) + (*((uint32_t*)(&((u_int8_t*)(buf))[ofs])))=htobe32(val) #ifdef _KERNEL @@ -80,11 +80,11 @@ int ncp_rq_alloc(u_int8_t fn, struct ncp_conn *ncp, struct thread *td, struct ucred *cred, struct ncp_rq **rqpp); -int ncp_rq_alloc_any(u_int32_t ptype, u_int8_t fn, struct ncp_conn *ncp, +int ncp_rq_alloc_any(uint32_t ptype, u_int8_t fn, struct ncp_conn *ncp, struct thread *td, struct ucred *cred, struct ncp_rq **rqpp); int ncp_rq_alloc_subfn(u_int8_t fn, u_int8_t subfn, struct ncp_conn *ncp, struct thread *td, struct ucred *cred, struct ncp_rq **rqpp); -int ncp_rq_init_any(struct ncp_rq *rqp, u_int32_t ptype, u_int8_t fn, +int ncp_rq_init_any(struct ncp_rq *rqp, uint32_t ptype, u_int8_t fn, struct ncp_conn *ncp, struct thread *td, struct ucred *cred); void ncp_rq_done(struct ncp_rq *rqp); @@ -95,7 +95,7 @@ int ncp_rq_pathstring(struct ncp_rq *rqp, int size, const char *name, struct ncp_nlstables*); int ncp_rq_dbase_path(struct ncp_rq *, u_int8_t vol_num, - u_int32_t dir_base, int namelen, u_char *name, struct ncp_nlstables *nt); + uint32_t dir_base, int namelen, u_char *name, struct ncp_nlstables *nt); int ncp_rq_pstring(struct ncp_rq *rqp, const char *s); void ncp_sign_init(const char *logindata, char *sign_root); @@ -113,9 +113,9 @@ void ncp_init_request(struct ncp_buf *); void ncp_init_request_s(struct ncp_buf *, int); void ncp_add_word_lh(struct ncp_buf *, u_int16_t); -void ncp_add_dword_lh(struct ncp_buf *, u_int32_t); +void ncp_add_dword_lh(struct ncp_buf *, uint32_t); void ncp_add_word_hl(struct ncp_buf *, u_int16_t); -void ncp_add_dword_hl(struct ncp_buf *, u_int32_t); +void ncp_add_dword_hl(struct ncp_buf *, uint32_t); void ncp_add_mem(struct ncp_buf *, const void *, int); void ncp_add_mem_nls(struct ncp_buf *, const void *, int); void ncp_add_pstring(struct ncp_buf *, const char *); @@ -126,11 +126,11 @@ u_int16_t ncp_reply_word_hl(struct ncp_buf *, int); u_int16_t ncp_reply_word_lh(struct ncp_buf *, int); -u_int32_t ncp_reply_dword_hl(struct ncp_buf *, int); -u_int32_t ncp_reply_dword_lh(struct ncp_buf *, int); +uint32_t ncp_reply_dword_hl(struct ncp_buf *, int); +uint32_t ncp_reply_dword_lh(struct ncp_buf *, int); static __inline void -ConvertToNWfromDWORD(u_int32_t sfd, ncp_fh *fh) { +ConvertToNWfromDWORD(uint32_t sfd, ncp_fh *fh) { fh->val1 = (fh->val.val32 = sfd); return; } diff --git a/src/include.new/netncp/ncp_subr.h b/src/include.new/netncp/ncp_subr.h index 1c228d1..395d176 100644 --- a/src/include.new/netncp/ncp_subr.h +++ b/src/include.new/netncp/ncp_subr.h @@ -98,7 +98,7 @@ struct ncp_nlstables; struct ncp_open_info { - u_int32_t origfh; + uint32_t origfh; ncp_fh fh; u_int8_t action; struct nw_entry_info fattr; @@ -117,6 +117,6 @@ /* ncp_crypt.c */ void nw_keyhash(const u_char *key, const u_char *buf, int buflen, u_char *target); void nw_encrypt(const u_char *fra, const u_char *buf, u_char *target); -void ncp_sign(const u_int32_t *state, const char *x, u_int32_t *ostate); +void ncp_sign(const uint32_t *state, const char *x, uint32_t *ostate); #endif /* _NCP_SUBR_H_ */ diff --git a/src/include.new/netncp/ncp_user.h b/src/include.new/netncp/ncp_user.h index 59485ab..a3b81f7 100644 --- a/src/include.new/netncp/ncp_user.h +++ b/src/include.new/netncp/ncp_user.h @@ -67,7 +67,7 @@ /* user side structures to issue fragmented ncp calls */ typedef struct { char *fragAddress; - u_int32_t fragSize; + uint32_t fragSize; } NW_FRAGMENT; diff --git a/src/include.new/netpfil/pf/pf_mtag.h b/src/include.new/netpfil/pf/pf_mtag.h index 0f93569..b0473ca 100644 --- a/src/include.new/netpfil/pf/pf_mtag.h +++ b/src/include.new/netpfil/pf/pf_mtag.h @@ -43,7 +43,7 @@ struct pf_mtag { void *hdr; /* saved hdr pos in mbuf, for ECN */ - u_int32_t qid; /* queue id */ + uint32_t qid; /* queue id */ u_int16_t tag; /* tag id */ u_int8_t flags; u_int8_t routed; diff --git a/src/include.new/netsmb/smb_conn.h b/src/include.new/netsmb/smb_conn.h index 8a0f8bc..0523848 100644 --- a/src/include.new/netsmb/smb_conn.h +++ b/src/include.new/netsmb/smb_conn.h @@ -102,14 +102,14 @@ struct smb_sopt { int sv_proto; int16_t sv_tz; /* offset in min relative to UTC */ - u_int32_t sv_maxtx; /* maximum transmit buf size */ + uint32_t sv_maxtx; /* maximum transmit buf size */ u_char sv_sm; /* security mode */ u_int16_t sv_maxmux; /* max number of outstanding rq's */ u_int16_t sv_maxvcs; /* max number of VCs */ u_int16_t sv_rawmode; - u_int32_t sv_maxraw; /* maximum raw-buffer size */ - u_int32_t sv_skey; /* session key */ - u_int32_t sv_caps; /* capabilities SMB_CAP_ */ + uint32_t sv_maxraw; /* maximum raw-buffer size */ + uint32_t sv_skey; /* session key */ + uint32_t sv_caps; /* capabilities SMB_CAP_ */ }; /* @@ -266,7 +266,7 @@ int vc_wxmax; /* max writex data size */ struct smbiod * vc_iod; struct smb_slock vc_stlock; - u_int32_t vc_seqno; /* my next sequence number */ + uint32_t vc_seqno; /* my next sequence number */ u_int8_t *vc_mackey; /* MAC key */ int vc_mackeylen; /* length of MAC key */ }; diff --git a/src/include.new/netsmb/smb_dev.h b/src/include.new/netsmb/smb_dev.h index 8d0bafd..57fc7b5 100644 --- a/src/include.new/netsmb/smb_dev.h +++ b/src/include.new/netsmb/smb_dev.h @@ -99,7 +99,7 @@ u_short ioc_rbc; u_int8_t ioc_errclass; u_int16_t ioc_serror; - u_int32_t ioc_error; + uint32_t ioc_error; }; struct smbioc_t2rq { diff --git a/src/include.new/netsmb/smb_rq.h b/src/include.new/netsmb/smb_rq.h index 5169740..b2c154c 100644 --- a/src/include.new/netsmb/smb_rq.h +++ b/src/include.new/netsmb/smb_rq.h @@ -70,8 +70,8 @@ struct smb_vc * sr_vc; struct smb_share* sr_share; u_short sr_mid; - u_int32_t sr_seqno; - u_int32_t sr_rseqno; + uint32_t sr_seqno; + uint32_t sr_rseqno; struct mbchain sr_rq; u_int8_t sr_rqflags; u_int16_t sr_rqflags2; @@ -93,7 +93,7 @@ void * sr_rquid; /* Points to 2-byte buffer. */ u_int8_t sr_errclass; u_int16_t sr_serror; - u_int32_t sr_error; + uint32_t sr_error; u_int8_t sr_rpflags; u_int16_t sr_rpflags2; u_int16_t sr_rptid; diff --git a/src/include.new/nfs/nfs_common.h b/src/include.new/nfs/nfs_common.h index cd29b45..ae3537a 100644 --- a/src/include.new/nfs/nfs_common.h +++ b/src/include.new/nfs/nfs_common.h @@ -42,7 +42,7 @@ #define vtonfsv2_mode(t, m) \ txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : MAKEIMODE((t), (m))) -#define nfsv3tov_type(a) nv3tov_type[fxdr_unsigned(u_int32_t,(a))&0x7] +#define nfsv3tov_type(a) nv3tov_type[fxdr_unsigned(uint32_t,(a))&0x7] #define vtonfsv3_type(a) txdr_unsigned(nfsv3_type[((int32_t)(a))]) int nfs_adv(struct mbuf **, caddr_t *, int, int); diff --git a/src/include.new/nfs/nfs_fha.h b/src/include.new/nfs/nfs_fha.h index 884ca35..2870951 100644 --- a/src/include.new/nfs/nfs_fha.h +++ b/src/include.new/nfs/nfs_fha.h @@ -61,8 +61,8 @@ struct mtx *mtx; LIST_ENTRY(fha_hash_entry) link; u_int64_t fh; - u_int32_t num_rw; - u_int32_t num_exclusive; + uint32_t num_rw; + uint32_t num_exclusive; u_int8_t num_threads; struct svcthread_list threads; }; diff --git a/src/include.new/nfs/nfsproto.h b/src/include.new/nfs/nfsproto.h index f647656..ef45af2 100644 --- a/src/include.new/nfs/nfsproto.h +++ b/src/include.new/nfs/nfsproto.h @@ -381,14 +381,14 @@ typedef union nfsfh nfsfh_t; struct nfsv2_time { - u_int32_t nfsv2_sec; - u_int32_t nfsv2_usec; + uint32_t nfsv2_sec; + uint32_t nfsv2_usec; }; typedef struct nfsv2_time nfstime2; struct nfsv3_time { - u_int32_t nfsv3_sec; - u_int32_t nfsv3_nsec; + uint32_t nfsv3_sec; + uint32_t nfsv3_nsec; }; typedef struct nfsv3_time nfstime3; @@ -397,7 +397,7 @@ * protocol and to facilitate xdr conversion. */ struct nfs_uquad { - u_int32_t nfsuquad[2]; + uint32_t nfsuquad[2]; }; typedef struct nfs_uquad nfsuint64; @@ -405,7 +405,7 @@ * Used to convert between two u_longs and a u_quad_t. */ union nfs_quadconvert { - u_int32_t lval[2]; + uint32_t lval[2]; u_quad_t qval; }; typedef union nfs_quadconvert nfsquad_t; @@ -414,8 +414,8 @@ * NFS Version 3 special file number. */ struct nfsv3_spec { - u_int32_t specdata1; - u_int32_t specdata2; + uint32_t specdata1; + uint32_t specdata2; }; typedef struct nfsv3_spec nfsv3spec; @@ -445,19 +445,19 @@ * NFSX_FATTR(v3) macro. */ struct nfs_fattr { - u_int32_t fa_type; - u_int32_t fa_mode; - u_int32_t fa_nlink; - u_int32_t fa_uid; - u_int32_t fa_gid; + uint32_t fa_type; + uint32_t fa_mode; + uint32_t fa_nlink; + uint32_t fa_uid; + uint32_t fa_gid; union { struct { - u_int32_t nfsv2fa_size; - u_int32_t nfsv2fa_blocksize; - u_int32_t nfsv2fa_rdev; - u_int32_t nfsv2fa_blocks; - u_int32_t nfsv2fa_fsid; - u_int32_t nfsv2fa_fileid; + uint32_t nfsv2fa_size; + uint32_t nfsv2fa_blocksize; + uint32_t nfsv2fa_rdev; + uint32_t nfsv2fa_blocks; + uint32_t nfsv2fa_fsid; + uint32_t nfsv2fa_fileid; nfstime2 nfsv2fa_atime; nfstime2 nfsv2fa_mtime; nfstime2 nfsv2fa_ctime; @@ -617,10 +617,10 @@ #define FA4_SKIP(p) ((p) += 2) struct nfsv2_sattr { - u_int32_t sa_mode; - u_int32_t sa_uid; - u_int32_t sa_gid; - u_int32_t sa_size; + uint32_t sa_mode; + uint32_t sa_uid; + uint32_t sa_gid; + uint32_t sa_size; nfstime2 sa_atime; nfstime2 sa_mtime; }; @@ -629,25 +629,25 @@ * NFS Version 3 sattr structure for the new node creation case. */ struct nfsv3_sattr { - u_int32_t sa_modetrue; - u_int32_t sa_mode; - u_int32_t sa_uidfalse; - u_int32_t sa_gidfalse; - u_int32_t sa_sizefalse; - u_int32_t sa_atimetype; + uint32_t sa_modetrue; + uint32_t sa_mode; + uint32_t sa_uidfalse; + uint32_t sa_gidfalse; + uint32_t sa_sizefalse; + uint32_t sa_atimetype; nfstime3 sa_atime; - u_int32_t sa_mtimetype; + uint32_t sa_mtimetype; nfstime3 sa_mtime; }; struct nfs_statfs { union { struct { - u_int32_t nfsv2sf_tsize; - u_int32_t nfsv2sf_bsize; - u_int32_t nfsv2sf_blocks; - u_int32_t nfsv2sf_bfree; - u_int32_t nfsv2sf_bavail; + uint32_t nfsv2sf_tsize; + uint32_t nfsv2sf_bsize; + uint32_t nfsv2sf_blocks; + uint32_t nfsv2sf_bfree; + uint32_t nfsv2sf_bavail; } sf_nfsv2; struct { nfsuint64 nfsv3sf_tbytes; @@ -656,7 +656,7 @@ nfsuint64 nfsv3sf_tfiles; nfsuint64 nfsv3sf_ffiles; nfsuint64 nfsv3sf_afiles; - u_int32_t nfsv3sf_invarsec; + uint32_t nfsv3sf_invarsec; } sf_nfsv3; } sf_un; }; @@ -675,25 +675,25 @@ #define sf_invarsec sf_un.sf_nfsv3.nfsv3sf_invarsec struct nfsv3_fsinfo { - u_int32_t fs_rtmax; - u_int32_t fs_rtpref; - u_int32_t fs_rtmult; - u_int32_t fs_wtmax; - u_int32_t fs_wtpref; - u_int32_t fs_wtmult; - u_int32_t fs_dtpref; + uint32_t fs_rtmax; + uint32_t fs_rtpref; + uint32_t fs_rtmult; + uint32_t fs_wtmax; + uint32_t fs_wtpref; + uint32_t fs_wtmult; + uint32_t fs_dtpref; nfsuint64 fs_maxfilesize; nfstime3 fs_timedelta; - u_int32_t fs_properties; + uint32_t fs_properties; }; struct nfsv3_pathconf { - u_int32_t pc_linkmax; - u_int32_t pc_namemax; - u_int32_t pc_notrunc; - u_int32_t pc_chownrestricted; - u_int32_t pc_caseinsensitive; - u_int32_t pc_casepreserving; + uint32_t pc_linkmax; + uint32_t pc_namemax; + uint32_t pc_notrunc; + uint32_t pc_chownrestricted; + uint32_t pc_caseinsensitive; + uint32_t pc_casepreserving; }; #endif diff --git a/src/include.new/nfs/xdr_subs.h b/src/include.new/nfs/xdr_subs.h index 103df3e..b6cb5f0 100644 --- a/src/include.new/nfs/xdr_subs.h +++ b/src/include.new/nfs/xdr_subs.h @@ -80,12 +80,12 @@ } while (0) #define fxdr_hyper(f) \ - ((((u_quad_t)ntohl(((u_int32_t *)(f))[0])) << 32) | \ - (u_quad_t)(ntohl(((u_int32_t *)(f))[1]))) + ((((u_quad_t)ntohl(((uint32_t *)(f))[0])) << 32) | \ + (u_quad_t)(ntohl(((uint32_t *)(f))[1]))) #define txdr_hyper(f, t) \ do { \ - ((u_int32_t *)(t))[0] = htonl((u_int32_t)((f) >> 32)); \ - ((u_int32_t *)(t))[1] = htonl((u_int32_t)((f) & 0xffffffff)); \ + ((uint32_t *)(t))[0] = htonl((uint32_t)((f) >> 32)); \ + ((uint32_t *)(t))[1] = htonl((uint32_t)((f) & 0xffffffff)); \ } while (0) #endif diff --git a/src/include.new/nfsclient/nfs.h b/src/include.new/nfsclient/nfs.h index 6afdbb8..6aa8faf 100644 --- a/src/include.new/nfsclient/nfs.h +++ b/src/include.new/nfsclient/nfs.h @@ -133,9 +133,9 @@ extern int nfs_ticks; /* Data constants in XDR form */ -extern u_int32_t nfs_true, nfs_false, nfs_xdrneg1; -extern u_int32_t rpc_reply, rpc_msgdenied, rpc_mismatch, rpc_vers; -extern u_int32_t rpc_auth_unix, rpc_msgaccepted, rpc_call, rpc_autherr; +extern uint32_t nfs_true, nfs_false, nfs_xdrneg1; +extern uint32_t rpc_reply, rpc_msgdenied, rpc_mismatch, rpc_vers; +extern uint32_t rpc_auth_unix, rpc_msgaccepted, rpc_call, rpc_autherr; extern int nfsv3_procid[NFS_NPROCS]; diff --git a/src/include.new/nfsclient/nfsm_subs.h b/src/include.new/nfsclient/nfsm_subs.h index 8b4c318..71ec887 100644 --- a/src/include.new/nfsclient/nfsm_subs.h +++ b/src/include.new/nfsclient/nfsm_subs.h @@ -38,7 +38,7 @@ #include -#define nfsv2tov_type(a) nv2tov_type[fxdr_unsigned(u_int32_t,(a))&0x7] +#define nfsv2tov_type(a) nv2tov_type[fxdr_unsigned(uint32_t,(a))&0x7] struct ucred; struct vnode; @@ -52,7 +52,7 @@ /* * First define what the actual subs. return */ -u_int32_t nfs_xid_gen(void); +uint32_t nfs_xid_gen(void); /* *********************************** */ /* Request generation phase macros */ diff --git a/src/include.new/nfsclient/nfsnode.h b/src/include.new/nfsclient/nfsnode.h index 2afacaf..1cb3ac0 100644 --- a/src/include.new/nfsclient/nfsnode.h +++ b/src/include.new/nfsclient/nfsnode.h @@ -77,7 +77,7 @@ #define ndm4_cookies ndm_un1.ndmu4_cookies struct nfs_accesscache { - u_int32_t mode; /* ACCESS mode cache */ + uint32_t mode; /* ACCESS mode cache */ uid_t uid; /* credentials having mode */ time_t stamp; /* mode cache timestamp */ }; diff --git a/src/include.new/nfsserver/nfs.h b/src/include.new/nfsserver/nfs.h index 998a9c7..accef32 100644 --- a/src/include.new/nfsserver/nfs.h +++ b/src/include.new/nfsserver/nfs.h @@ -152,11 +152,11 @@ extern int nfsrv_numnfsd; /* Various values converted to XDR form. */ -extern u_int32_t nfsrv_nfs_false, nfsrv_nfs_true, nfsrv_nfs_xdrneg1, +extern uint32_t nfsrv_nfs_false, nfsrv_nfs_true, nfsrv_nfs_xdrneg1, nfsrv_nfs_prog; -extern u_int32_t nfsrv_rpc_reply, nfsrv_rpc_msgdenied, nfsrv_rpc_mismatch, +extern uint32_t nfsrv_rpc_reply, nfsrv_rpc_msgdenied, nfsrv_rpc_mismatch, nfsrv_rpc_vers; -extern u_int32_t nfsrv_rpc_auth_unix, nfsrv_rpc_msgaccepted, nfsrv_rpc_call, +extern uint32_t nfsrv_rpc_auth_unix, nfsrv_rpc_msgaccepted, nfsrv_rpc_call, nfsrv_rpc_autherr; /* Procedure table data */ @@ -173,7 +173,7 @@ #define NFS_WDELAYHASHSIZ 16 /* and with this */ #endif #define NWDELAYHASH(sock, f) \ - (&(sock)->ns_wdelayhashtbl[(*((u_int32_t *)(f))) % NFS_WDELAYHASHSIZ]) + (&(sock)->ns_wdelayhashtbl[(*((uint32_t *)(f))) % NFS_WDELAYHASHSIZ]) /* * This structure is used by the server for describing each request. @@ -185,7 +185,7 @@ struct sockaddr *nd_nam; /* and socket addr */ struct sockaddr *nd_nam2; /* return socket addr */ caddr_t nd_dpos; /* Current dissect pos */ - u_int32_t nd_procnum; /* RPC # */ + uint32_t nd_procnum; /* RPC # */ int nd_stable; /* storage type */ int nd_flag; /* nd_flag */ int nd_repstat; /* Reply status */ diff --git a/src/include.new/nfsserver/nfsm_subs.h b/src/include.new/nfsserver/nfsm_subs.h index c2f545c..44af494 100644 --- a/src/include.new/nfsserver/nfsm_subs.h +++ b/src/include.new/nfsserver/nfsm_subs.h @@ -38,7 +38,7 @@ #include -#define nfstov_mode(a) (fxdr_unsigned(u_int32_t, (a)) & ALLPERMS) +#define nfstov_mode(a) (fxdr_unsigned(uint32_t, (a)) & ALLPERMS) /* * These macros do strange and peculiar things to mbuf chains for @@ -159,7 +159,7 @@ void nfsm_srvfhtom_xx(fhandle_t *f, int v3, struct mbuf **mb, caddr_t *bpos); void nfsm_srvpostop_fh_xx(fhandle_t *f, struct mbuf **mb, caddr_t *bpos); -void nfsm_clget_xx(u_int32_t **tl, struct mbuf *mb, struct mbuf **mp, +void nfsm_clget_xx(uint32_t **tl, struct mbuf *mb, struct mbuf **mp, char **bp, char **be, caddr_t bpos); #define nfsm_srvfhtom(f, v3) \ diff --git a/src/include.new/nsswitch.h b/src/include.new/nsswitch.h index 17bb3a9..e7c5488 100644 --- a/src/include.new/nsswitch.h +++ b/src/include.new/nsswitch.h @@ -148,7 +148,7 @@ */ typedef struct _ns_src { const char *name; - u_int32_t flags; + uint32_t flags; } ns_src; diff --git a/src/include.new/opie.h b/src/include.new/opie.h index e22e504..9857d64 100644 --- a/src/include.new/opie.h +++ b/src/include.new/opie.h @@ -91,7 +91,7 @@ #define OPIE_SEQUENCE_RESTRICT 9 #endif /* OPIE_SEQUENCE_RESTRICT */ -#define UINT4 u_int32_t +#define UINT4 uint32_t struct opie_otpkey { UINT4 words[2]; diff --git a/src/include.new/pcap/bpf.h b/src/include.new/pcap/bpf.h index 23f85c7..ffe09d1 100644 --- a/src/include.new/pcap/bpf.h +++ b/src/include.new/pcap/bpf.h @@ -985,11 +985,11 @@ * u_int8_t dli_version; * u_int8_t dli_family; * u_int16_t dli_htype; - * u_int32_t dli_pktlen; - * u_int32_t dli_ifindex; - * u_int32_t dli_grifindex; - * u_int32_t dli_zsrc; - * u_int32_t dli_zdst; + * uint32_t dli_pktlen; + * uint32_t dli_ifindex; + * uint32_t dli_grifindex; + * uint32_t dli_zsrc; + * uint32_t dli_zdst; * }; * * dli_version is 2 for the current version of the pseudo-header. diff --git a/src/include.new/pccard/pcicvar.h b/src/include.new/pccard/pcicvar.h index a184c2a..1b4ea38 100644 --- a/src/include.new/pccard/pcicvar.h +++ b/src/include.new/pccard/pcicvar.h @@ -43,8 +43,8 @@ struct pcic_softc { - u_int32_t slotmask;/* Mask of valid slots */ - u_int32_t flags; /* Interesting flags */ + uint32_t slotmask;/* Mask of valid slots */ + uint32_t flags; /* Interesting flags */ #define PCIC_AB_POWER 0x00000001 /* Use old A/B step power */ #define PCIC_DF_POWER 0x00000002 /* Uses DF step regs */ #define PCIC_PD_POWER 0x00000004 /* Uses CL-PD regs */ @@ -102,7 +102,7 @@ void pcic_dealloc(device_t dev); void pcic_do_stat_delta(struct pcic_slot *sp); int pcic_get_memory_offset(device_t bus, device_t child, int rid, - u_int32_t *offset); + uint32_t *offset); int pcic_get_res_flags(device_t bus, device_t child, int restype, int rid, u_long *value); unsigned char pcic_getb_io(struct pcic_slot *sp, int reg); @@ -111,9 +111,9 @@ pcic_intr_mapirq_t pcic_isa_mapirq; void pcic_putb_io(struct pcic_slot *sp, int reg, unsigned char val); int pcic_set_memory_offset(device_t bus, device_t child, int rid, - u_int32_t offset + uint32_t offset #if __FreeBSD_version >= 500000 - , u_int32_t *deltap + , uint32_t *deltap #endif ); int pcic_set_res_flags(device_t bus, device_t child, int restype, int rid, diff --git a/src/include.new/posix4/_semaphore.h b/src/include.new/posix4/_semaphore.h index b3f280e..64ad946 100644 --- a/src/include.new/posix4/_semaphore.h +++ b/src/include.new/posix4/_semaphore.h @@ -39,12 +39,12 @@ * Semaphore definitions. */ struct sem { -#define SEM_MAGIC ((u_int32_t) 0x09fa4012) - u_int32_t magic; +#define SEM_MAGIC ((uint32_t) 0x09fa4012) + uint32_t magic; pthread_mutex_t lock; pthread_cond_t gtzero; - u_int32_t count; - u_int32_t nwaiters; + uint32_t count; + uint32_t nwaiters; #define SEM_USER (NULL) semid_t semid; /* semaphore id if kernel (shared) semaphore */ int syssem; /* 1 if kernel (shared) semaphore */ diff --git a/src/include.new/protocols/dumprestore.h b/src/include.new/protocols/dumprestore.h index 1e26c72..8dbfa7f 100644 --- a/src/include.new/protocols/dumprestore.h +++ b/src/include.new/protocols/dumprestore.h @@ -104,10 +104,10 @@ int64_t c_mtime; /* last modified time, seconds */ int32_t c_extsize; /* external attribute size */ int32_t c_spare4[6]; /* old block pointers */ - u_int32_t c_file_flags; /* status flags (chflags) */ + uint32_t c_file_flags; /* status flags (chflags) */ int32_t c_spare5[2]; /* old blocks, generation number */ - u_int32_t c_uid; /* file owner */ - u_int32_t c_gid; /* file group */ + uint32_t c_uid; /* file owner */ + uint32_t c_gid; /* file group */ int32_t c_spare6[2]; /* previously unused spares */ /* * End old dinode structure. diff --git a/src/include.new/protocols/routed.h b/src/include.new/protocols/routed.h index f5d9496..25c1f7e 100644 --- a/src/include.new/protocols/routed.h +++ b/src/include.new/protocols/routed.h @@ -62,7 +62,7 @@ */ struct netinfo { struct sockaddr rip_dst; /* destination net/host */ - u_int32_t rip_metric; /* cost of route */ + uint32_t rip_metric; /* cost of route */ }; #else struct netinfo { @@ -71,11 +71,11 @@ #define RIP_AF_UNSPEC 0 #define RIP_AF_AUTH 0xffff u_int16_t n_tag; /* optional in RIPv2 */ - u_int32_t n_dst; /* destination net or host */ + uint32_t n_dst; /* destination net or host */ #define RIP_DEFAULT 0 - u_int32_t n_mask; /* netmask in RIPv2 */ - u_int32_t n_nhop; /* optional next hop in RIPv2 */ - u_int32_t n_metric; /* cost of route */ + uint32_t n_mask; /* netmask in RIPv2 */ + uint32_t n_nhop; /* optional next hop in RIPv2 */ + uint32_t n_metric; /* cost of route */ }; #endif @@ -93,8 +93,8 @@ int16_t md5_pkt_len; /* RIP-II packet length */ int8_t md5_keyid; /* key ID and auth data len */ int8_t md5_auth_len; /* 16 */ - u_int32_t md5_seqno; /* sequence number */ - u_int32_t rsvd[2]; /* must be 0 */ + uint32_t md5_seqno; /* sequence number */ + uint32_t rsvd[2]; /* must be 0 */ #define RIP_AUTH_MD5_KEY_LEN RIP_AUTH_PW_LEN #define RIP_AUTH_MD5_HASH_XTRA (sizeof(struct netauth)-sizeof(struct a_md5)) #define RIP_AUTH_MD5_HASH_LEN (RIP_AUTH_MD5_KEY_LEN+RIP_AUTH_MD5_HASH_XTRA) @@ -142,7 +142,7 @@ #define NETS_LEN ((MAXPACKETSIZE-sizeof(struct rip)) \ / sizeof(struct netinfo) +1) -#define INADDR_RIP_GROUP (u_int32_t)0xe0000009 /* 224.0.0.9 */ +#define INADDR_RIP_GROUP (uint32_t)0xe0000009 /* 224.0.0.9 */ /* Timer values used in managing the routing table. diff --git a/src/include.new/protocols/talkd.h b/src/include.new/protocols/talkd.h index b4ec3cc..3d31b3b 100644 --- a/src/include.new/protocols/talkd.h +++ b/src/include.new/protocols/talkd.h @@ -60,7 +60,7 @@ u_char type; /* request type, see below */ u_char answer; /* not used */ u_char pad; - u_int32_t id_num; /* message id */ + uint32_t id_num; /* message id */ struct osockaddr addr; /* old (4.3) style */ struct osockaddr ctl_addr; /* old (4.3) style */ int32_t pid; /* caller's process id */ @@ -79,7 +79,7 @@ u_char type; /* type of request message, see below */ u_char answer; /* respose to request message, see below */ u_char pad; - u_int32_t id_num; /* message id */ + uint32_t id_num; /* message id */ struct osockaddr addr; /* address for establishing conversation */ } CTL_RESPONSE; diff --git a/src/include.new/radlib.h b/src/include.new/radlib.h index f0af775..dba0e65 100644 --- a/src/include.new/radlib.h +++ b/src/include.new/radlib.h @@ -207,7 +207,7 @@ int rad_create_response(struct rad_handle *, int); struct in_addr rad_cvt_addr(const void *); struct in6_addr rad_cvt_addr6(const void *); -u_int32_t rad_cvt_int(const void *); +uint32_t rad_cvt_int(const void *); char *rad_cvt_string(const void *, size_t); int rad_get_attr(struct rad_handle *, const void **, size_t *); @@ -218,7 +218,7 @@ int rad_put_addr6(struct rad_handle *, int, struct in6_addr); int rad_put_attr(struct rad_handle *, int, const void *, size_t); -int rad_put_int(struct rad_handle *, int, u_int32_t); +int rad_put_int(struct rad_handle *, int, uint32_t); int rad_put_string(struct rad_handle *, int, const char *); int rad_put_message_authentic(struct rad_handle *); diff --git a/src/include.new/radlib_vs.h b/src/include.new/radlib_vs.h index 4297bc1..aba46f4 100644 --- a/src/include.new/radlib_vs.h +++ b/src/include.new/radlib_vs.h @@ -71,12 +71,12 @@ struct rad_handle; __BEGIN_DECLS -int rad_get_vendor_attr(u_int32_t *, const void **, size_t *); +int rad_get_vendor_attr(uint32_t *, const void **, size_t *); int rad_put_vendor_addr(struct rad_handle *, int, int, struct in_addr); int rad_put_vendor_addr6(struct rad_handle *, int, int, struct in6_addr); int rad_put_vendor_attr(struct rad_handle *, int, int, const void *, size_t); -int rad_put_vendor_int(struct rad_handle *, int, int, u_int32_t); +int rad_put_vendor_int(struct rad_handle *, int, int, uint32_t); int rad_put_vendor_string(struct rad_handle *, int, int, const char *); u_char *rad_demangle_mppe_key(struct rad_handle *, const void *, size_t, size_t *); diff --git a/src/include.new/res_update.h b/src/include.new/res_update.h index 3fc45c6..a4499b4 100644 --- a/src/include.new/res_update.h +++ b/src/include.new/res_update.h @@ -41,7 +41,7 @@ char * r_dname; /*%< owner of the RR */ ns_class r_class; /*%< class number */ ns_type r_type; /*%< type number */ - u_int32_t r_ttl; /*%< time to live */ + uint32_t r_ttl; /*%< time to live */ u_char * r_data; /*%< rdata fields as text string */ u_int r_size; /*%< size of r_data field */ int r_opcode; /*%< type of operation */ diff --git a/src/include.new/resolv.h b/src/include.new/resolv.h index 7686176..ce73354 100644 --- a/src/include.new/resolv.h +++ b/src/include.new/resolv.h @@ -169,7 +169,7 @@ char unused[3]; struct { struct in_addr addr; - u_int32_t mask; + uint32_t mask; } sort_list[MAXRESOLVSORT]; res_send_qhook qhook; /*%< query hook */ res_send_rhook rhook; /*%< response hook */ @@ -423,14 +423,14 @@ int loc_aton(const char *, u_char *); const char * loc_ntoa(const u_char *, char *); int dn_skipname(const u_char *, const u_char *); -void putlong(u_int32_t, u_char *); +void putlong(uint32_t, u_char *); void putshort(u_int16_t, u_char *); #ifndef __ultrix__ u_int16_t _getshort(const u_char *); -u_int32_t _getlong(const u_char *); +uint32_t _getlong(const u_char *); #endif const char * p_class(int); -const char * p_time(u_int32_t); +const char * p_time(uint32_t); const char * p_type(int); const char * p_rcode(int); const char * p_sockun(union res_sockaddr_union, char *, size_t); diff --git a/src/include.new/ripemd.h b/src/include.new/ripemd.h index a2f6ffe..45265c2 100644 --- a/src/include.new/ripemd.h +++ b/src/include.new/ripemd.h @@ -74,9 +74,9 @@ #define RIPEMD160_DIGEST_LENGTH 20 typedef struct RIPEMD160state_st { - u_int32_t A,B,C,D,E; - u_int32_t Nl,Nh; - u_int32_t data[RIPEMD160_LBLOCK]; + uint32_t A,B,C,D,E; + uint32_t Nl,Nh; + uint32_t data[RIPEMD160_LBLOCK]; int num; } RIPEMD160_CTX; diff --git a/src/include.new/rpc/rpc_com.h b/src/include.new/rpc/rpc_com.h index bd2564d..3507a46 100644 --- a/src/include.new/rpc/rpc_com.h +++ b/src/include.new/rpc/rpc_com.h @@ -52,8 +52,8 @@ #define RPC_MAXDATASIZE 9000 #define RPC_MAXADDRSIZE 1024 -#define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \ - (u_int32_t)(now)->tv_usec) +#define __RPC_GETXID(now) ((uint32_t)getpid() ^ (uint32_t)(now)->tv_sec ^ \ + (uint32_t)(now)->tv_usec) __BEGIN_DECLS extern u_int __rpc_get_a_size(int); diff --git a/src/include.new/rpc/rpc_msg.h b/src/include.new/rpc/rpc_msg.h index 87c8c50..10d7ffc 100644 --- a/src/include.new/rpc/rpc_msg.h +++ b/src/include.new/rpc/rpc_msg.h @@ -42,7 +42,7 @@ #ifndef _RPC_RPC_MSG_H #define _RPC_RPC_MSG_H -#define RPC_MSG_VERSION ((u_int32_t) 2) +#define RPC_MSG_VERSION ((uint32_t) 2) #define RPC_SERVICE_PORT ((u_short) 2048) /* @@ -147,7 +147,7 @@ * The rpc message */ struct rpc_msg { - u_int32_t rm_xid; + uint32_t rm_xid; enum msg_type rm_direction; union { struct call_body RM_cmb; diff --git a/src/include.new/rpc/rpcb_prot.h b/src/include.new/rpc/rpcb_prot.h index 71d6c15..af81756 100644 --- a/src/include.new/rpc/rpcb_prot.h +++ b/src/include.new/rpc/rpcb_prot.h @@ -236,7 +236,7 @@ struct r_rpcb_rmtcallres { char *addr; struct { - u_int32_t results_len; + uint32_t results_len; char *results_val; } results; xdrproc_t xdr_res; /* decodes results */ @@ -384,7 +384,7 @@ rpcprog_t prog; /* program number */ rpcvers_t vers; /* version number */ rpcproc_t proc; /* procedure number */ - u_int32_t arglen; /* arg len */ + uint32_t arglen; /* arg len */ caddr_t args_ptr; /* argument */ xdrproc_t xdr_args; /* XDR routine for argument */ }; @@ -395,7 +395,7 @@ */ struct rpcb_rmtcallres { char *addr_ptr; /* remote universal address */ - u_int32_t resultslen; /* results length */ + uint32_t resultslen; /* results length */ caddr_t results_ptr; /* results */ xdrproc_t xdr_results; /* XDR routine for result */ }; diff --git a/src/include.new/rpc/rpcb_prot.x b/src/include.new/rpc/rpcb_prot.x index 014437d..8669099 100644 --- a/src/include.new/rpc/rpcb_prot.x +++ b/src/include.new/rpc/rpcb_prot.x @@ -227,7 +227,7 @@ %struct r_rpcb_rmtcallres { % char *addr; % struct { -% u_int32_t results_len; +% uint32_t results_len; % char *results_val; % } results; % xdrproc_t xdr_res; /* decodes results */ @@ -446,7 +446,7 @@ % rpcprog_t prog; /* program number */ % rpcvers_t vers; /* version number */ % rpcproc_t proc; /* procedure number */ -% u_int32_t arglen; /* arg len */ +% uint32_t arglen; /* arg len */ % caddr_t args_ptr; /* argument */ % xdrproc_t xdr_args; /* XDR routine for argument */ %}; @@ -457,7 +457,7 @@ % */ %struct rpcb_rmtcallres { % char *addr_ptr; /* remote universal address */ -% u_int32_t resultslen; /* results length */ +% uint32_t resultslen; /* results length */ % caddr_t results_ptr; /* results */ % xdrproc_t xdr_results; /* XDR routine for result */ %}; diff --git a/src/include.new/rpc/svc.h b/src/include.new/rpc/svc.h index b7d6954..e9cd49c 100644 --- a/src/include.new/rpc/svc.h +++ b/src/include.new/rpc/svc.h @@ -150,9 +150,9 @@ * Service request */ struct svc_req { - u_int32_t rq_prog; /* service program number */ - u_int32_t rq_vers; /* service protocol version */ - u_int32_t rq_proc; /* the desired procedure */ + uint32_t rq_prog; /* service program number */ + uint32_t rq_vers; /* service protocol version */ + uint32_t rq_proc; /* the desired procedure */ struct opaque_auth rq_cred; /* raw creds from the wire */ void *rq_clntcred; /* read only cooked cred */ SVCXPRT *rq_xprt; /* associated transport */ diff --git a/src/include.new/rpc/svc_dg.h b/src/include.new/rpc/svc_dg.h index f21130f..173dac3 100644 --- a/src/include.new/rpc/svc_dg.h +++ b/src/include.new/rpc/svc_dg.h @@ -40,7 +40,7 @@ struct svc_dg_data { /* XXX: optbuf should be the first field, used by ti_opts.c code */ size_t su_iosz; /* size of send.recv buffer */ - u_int32_t su_xid; /* transaction id */ + uint32_t su_xid; /* transaction id */ XDR su_xdrs; /* XDR handle */ char su_verfbody[MAX_AUTH_BYTES]; /* verifier body */ void *su_cache; /* cached data, NULL if none */ diff --git a/src/include.new/rpc/xdr.h b/src/include.new/rpc/xdr.h index b508c93..9b6e8e9 100644 --- a/src/include.new/rpc/xdr.h +++ b/src/include.new/rpc/xdr.h @@ -260,13 +260,13 @@ * N.B. and frozen for all time: each data type here uses 4 bytes * of external representation. */ -#define IXDR_GET_INT32(buf) ((int32_t)__ntohl((u_int32_t)*(buf)++)) -#define IXDR_PUT_INT32(buf, v) (*(buf)++ =(int32_t)__htonl((u_int32_t)v)) -#define IXDR_GET_U_INT32(buf) ((u_int32_t)IXDR_GET_INT32(buf)) +#define IXDR_GET_INT32(buf) ((int32_t)__ntohl((uint32_t)*(buf)++)) +#define IXDR_PUT_INT32(buf, v) (*(buf)++ =(int32_t)__htonl((uint32_t)v)) +#define IXDR_GET_U_INT32(buf) ((uint32_t)IXDR_GET_INT32(buf)) #define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_INT32((buf), ((int32_t)(v))) -#define IXDR_GET_LONG(buf) ((long)__ntohl((u_int32_t)*(buf)++)) -#define IXDR_PUT_LONG(buf, v) (*(buf)++ =(int32_t)__htonl((u_int32_t)v)) +#define IXDR_GET_LONG(buf) ((long)__ntohl((uint32_t)*(buf)++)) +#define IXDR_PUT_LONG(buf, v) (*(buf)++ =(int32_t)__htonl((uint32_t)v)) #define IXDR_GET_BOOL(buf) ((bool_t)IXDR_GET_LONG(buf)) #define IXDR_GET_ENUM(buf, t) ((t)IXDR_GET_LONG(buf)) @@ -295,8 +295,8 @@ extern bool_t xdr_u_int16_t(XDR *, u_int16_t *); extern bool_t xdr_uint16_t(XDR *, u_int16_t *); extern bool_t xdr_int32_t(XDR *, int32_t *); -extern bool_t xdr_u_int32_t(XDR *, u_int32_t *); -extern bool_t xdr_uint32_t(XDR *, u_int32_t *); +extern bool_t xdr_uint32_t(XDR *, uint32_t *); +extern bool_t xdr_uint32_t(XDR *, uint32_t *); extern bool_t xdr_int64_t(XDR *, int64_t *); extern bool_t xdr_u_int64_t(XDR *, u_int64_t *); extern bool_t xdr_uint64_t(XDR *, u_int64_t *); diff --git a/src/include.new/rpcsvc/nlm_prot.h b/src/include.new/rpcsvc/nlm_prot.h index 118195a..96b3c78 100644 --- a/src/include.new/rpcsvc/nlm_prot.h +++ b/src/include.new/rpcsvc/nlm_prot.h @@ -171,7 +171,7 @@ struct nlm4_holder { bool_t exclusive; - u_int32_t svid; + uint32_t svid; netobj oh; u_int64_t l_offset; u_int64_t l_len; @@ -182,7 +182,7 @@ char *caller_name; netobj fh; netobj oh; - u_int32_t svid; + uint32_t svid; u_int64_t l_offset; u_int64_t l_len; }; diff --git a/src/include.new/rpcsvc/nlm_prot.x b/src/include.new/rpcsvc/nlm_prot.x index b89fbe5..a4a2f22 100644 --- a/src/include.new/rpcsvc/nlm_prot.x +++ b/src/include.new/rpcsvc/nlm_prot.x @@ -163,7 +163,7 @@ struct nlm4_holder { bool exclusive; - u_int32_t svid; + uint32_t svid; netobj oh; u_int64_t l_offset; u_int64_t l_len; @@ -173,7 +173,7 @@ string caller_name; netobj fh; netobj oh; - u_int32_t svid; + uint32_t svid; u_int64_t l_offset; u_int64_t l_len; }; diff --git a/src/include.new/sdp.h b/src/include.new/sdp.h index 3f4c872..9214ea4 100644 --- a/src/include.new/sdp.h +++ b/src/include.new/sdp.h @@ -566,14 +566,14 @@ * * SDP_PDU_SERVICE_UNREGISTER_REQUEST * pdu_header_t hdr; - * u_int32_t record_handle; (network byte order) + * uint32_t record_handle; (network byte order) * * no additional data in response. * * * SDP_PDU_SERVICE_CHANGE_REQUEST * pdu_header_t hdr; - * u_int32_t record_handle; (network byte order) + * uint32_t record_handle; (network byte order) * profile data[pdu->len - sizeof(record_handle)] * * no additional data in response. diff --git a/src/include.new/security/audit/audit_private.h b/src/include.new/security/audit/audit_private.h index 491ab6f..5cd26cd 100644 --- a/src/include.new/security/audit/audit_private.h +++ b/src/include.new/security/audit/audit_private.h @@ -161,7 +161,7 @@ struct audit_record { /* Audit record header. */ - u_int32_t ar_magic; + uint32_t ar_magic; int ar_event; int ar_retval; /* value returned to the process */ int ar_errno; /* return status of system call */ @@ -312,7 +312,7 @@ */ struct kaudit_record { struct audit_record k_ar; - u_int32_t k_ar_commit; + uint32_t k_ar_commit; void *k_udata; /* User data. */ u_int k_ulen; /* User data length. */ struct uthread *k_uthread; /* Audited thread. */ diff --git a/src/include.new/sha.h b/src/include.new/sha.h index ed397a0..17b8d02 100644 --- a/src/include.new/sha.h +++ b/src/include.new/sha.h @@ -71,9 +71,9 @@ #define SHA_DIGEST_LENGTH 20 typedef struct SHAstate_st { - u_int32_t h0, h1, h2, h3, h4; - u_int32_t Nl, Nh; - u_int32_t data[SHA_LBLOCK]; + uint32_t h0, h1, h2, h3, h4; + uint32_t Nl, Nh; + uint32_t data[SHA_LBLOCK]; int num; } SHA_CTX; #define SHA1_CTX SHA_CTX diff --git a/src/include.new/stand.h b/src/include.new/stand.h index 31ab72f..2cc6c56 100644 --- a/src/include.new/stand.h +++ b/src/include.new/stand.h @@ -336,7 +336,7 @@ /* swaps (undocumented, useful?) */ #ifdef __i386__ -extern u_int32_t bswap32(u_int32_t x); +extern uint32_t bswap32(uint32_t x); extern u_int64_t bswap64(u_int64_t x); #endif diff --git a/src/include.new/sys/aac_ioctl.h b/src/include.new/sys/aac_ioctl.h index 879f6af..d01c300 100644 --- a/src/include.new/sys/aac_ioctl.h +++ b/src/include.new/sys/aac_ioctl.h @@ -38,15 +38,15 @@ #define AACQ_COUNT 4 /* total number of queues */ struct aac_qstat { - u_int32_t q_length; - u_int32_t q_max; + uint32_t q_length; + uint32_t q_max; }; /* * Statistics request */ union aac_statrequest { - u_int32_t as_item; + uint32_t as_item; struct aac_qstat as_qstat; }; @@ -168,7 +168,7 @@ * Context passed in by a consumer looking to collect an AIF. */ struct get_adapter_fib_ioctl { - u_int32_t AdapterFibContext; + uint32_t AdapterFibContext; int Wait; caddr_t AifFib; }; @@ -178,12 +178,12 @@ int32_t Bus; int32_t Target; int32_t Lun; - u_int32_t Valid; - u_int32_t Locked; - u_int32_t Deleted; + uint32_t Valid; + uint32_t Locked; + uint32_t Deleted; int32_t Instance; char diskDeviceName[10]; - u_int32_t UnMapped; + uint32_t UnMapped; }; /* Features, asked from the tools to know if the driver @@ -191,18 +191,18 @@ */ typedef union { struct { - u_int32_t largeLBA : 1; /* disk support greater 2TB */ - u_int32_t IoctlBuf : 1; /* ARCIOCTL call support */ - u_int32_t AIFSupport: 1; /* AIF support */ - u_int32_t JBODSupport:1; /* fw + driver support JBOD */ - u_int32_t fReserved : 28; + uint32_t largeLBA : 1; /* disk support greater 2TB */ + uint32_t IoctlBuf : 1; /* ARCIOCTL call support */ + uint32_t AIFSupport: 1; /* AIF support */ + uint32_t JBODSupport:1; /* fw + driver support JBOD */ + uint32_t fReserved : 28; } fBits; - u_int32_t fValue; + uint32_t fValue; } featuresState; struct aac_features { featuresState feat; - u_int32_t data[31]; - u_int32_t reserved[32]; + uint32_t data[31]; + uint32_t reserved[32]; } __packed; #endif diff --git a/src/include.new/sys/agpio.h b/src/include.new/sys/agpio.h index 4ad7abb..a887020 100644 --- a/src/include.new/sys/agpio.h +++ b/src/include.new/sys/agpio.h @@ -97,8 +97,8 @@ typedef struct _agp_info { agp_version version; /* version of the driver */ - u_int32_t bridge_id; /* bridge vendor/device */ - u_int32_t agp_mode; /* mode info of bridge */ + uint32_t bridge_id; /* bridge vendor/device */ + uint32_t agp_mode; /* mode info of bridge */ off_t aper_base; /* base of aperture */ size_t aper_size; /* size of aperture */ size_t pg_total; /* max pages (swap + system) */ @@ -107,7 +107,7 @@ } agp_info; typedef struct _agp_setup { - u_int32_t agp_mode; /* mode info of bridge */ + uint32_t agp_mode; /* mode info of bridge */ } agp_setup; #if 0 @@ -130,8 +130,8 @@ typedef struct _agp_allocate { int key; /* tag of allocation */ size_t pg_count; /* number of pages */ - u_int32_t type; /* 0 == normal, other devspec */ - u_int32_t physical; /* device specific (some devices + uint32_t type; /* 0 == normal, other devspec */ + uint32_t physical; /* device specific (some devices * need a phys address of the * actual page behind the gatt * table) */ @@ -144,7 +144,7 @@ typedef struct _agp_unbind { int key; /* tag of allocation */ - u_int32_t priority; /* priority for paging out */ + uint32_t priority; /* priority for paging out */ } agp_unbind; #endif /* !_SYS_AGPIO_H_ */ diff --git a/src/include.new/sys/ata.h b/src/include.new/sys/ata.h index 0117610..e8be0dc 100644 --- a/src/include.new/sys/ata.h +++ b/src/include.new/sys/ata.h @@ -204,7 +204,7 @@ /*095*/ u_int16_t stream_min_req_size; /*096*/ u_int16_t stream_transfer_time; /*097*/ u_int16_t stream_access_latency; -/*098*/ u_int32_t stream_granularity; +/*098*/ uint32_t stream_granularity; /*100*/ u_int16_t lba_size48_1; u_int16_t lba_size48_2; u_int16_t lba_size48_3; @@ -528,9 +528,9 @@ #define ATA_SENSE_EOM 0x40; #define ATA_SENSE_FILEMARK 0x80; - u_int32_t cmd_info; /* cmd information */ + uint32_t cmd_info; /* cmd information */ u_int8_t sense_length; /* additional sense len (n-7) */ - u_int32_t cmd_specific_info; /* additional cmd spec info */ + uint32_t cmd_specific_info; /* additional cmd spec info */ u_int8_t asc; /* additional sense code */ u_int8_t ascq; /* additional sense code qual */ u_int8_t replaceable_unit_code; /* replaceable unit code */ diff --git a/src/include.new/sys/blist.h b/src/include.new/sys/blist.h index cc1d617..bd5413b 100644 --- a/src/include.new/sys/blist.h +++ b/src/include.new/sys/blist.h @@ -56,7 +56,7 @@ #ifndef _SYS_BLIST_H_ #define _SYS_BLIST_H_ -typedef u_int32_t u_daddr_t; /* unsigned disk address */ +typedef uint32_t u_daddr_t; /* unsigned disk address */ /* * note: currently use SWAPBLK_NONE as an absolute value rather then diff --git a/src/include.new/sys/bus.h b/src/include.new/sys/bus.h index c6400ec..47c357e 100644 --- a/src/include.new/sys/bus.h +++ b/src/include.new/sys/bus.h @@ -439,7 +439,7 @@ const char *device_get_desc(device_t dev); devclass_t device_get_devclass(device_t dev); driver_t *device_get_driver(device_t dev); -u_int32_t device_get_flags(device_t dev); +uint32_t device_get_flags(device_t dev); device_t device_get_parent(device_t dev); int device_get_children(device_t dev, device_t **listp, int *countp); void *device_get_ivars(device_t dev); @@ -466,7 +466,7 @@ void device_set_desc_copy(device_t dev, const char* desc); int device_set_devclass(device_t dev, const char *classname); int device_set_driver(device_t dev, driver_t *driver); -void device_set_flags(device_t dev, u_int32_t flags); +void device_set_flags(device_t dev, uint32_t flags); void device_set_softc(device_t dev, void *softc); void device_free_softc(void *softc); void device_claim_softc(device_t dev); diff --git a/src/include.new/sys/busdma_bufalloc.h b/src/include.new/sys/busdma_bufalloc.h index a3b1fb9..a8e30d7 100644 --- a/src/include.new/sys/busdma_bufalloc.h +++ b/src/include.new/sys/busdma_bufalloc.h @@ -81,7 +81,7 @@ busdma_bufalloc_t busdma_bufalloc_create(const char *name, bus_size_t minimum_alignment, uma_alloc uma_alloc_func, uma_free uma_free_func, - u_int32_t uma_zcreate_flags); + uint32_t uma_zcreate_flags); /* * Destroy an allocator created by busdma_bufalloc_create(). diff --git a/src/include.new/sys/cdrio.h b/src/include.new/sys/cdrio.h index a82030d..f6664c3 100644 --- a/src/include.new/sys/cdrio.h +++ b/src/include.new/sys/cdrio.h @@ -86,19 +86,19 @@ }; struct cdr_format_capacity { - u_int32_t blocks; - u_int32_t reserved:2; - u_int32_t type:6; - u_int32_t param:24; + uint32_t blocks; + uint32_t reserved:2; + uint32_t type:6; + uint32_t param:24; }; struct cdr_format_capacities { u_int8_t reserved1[3]; u_int8_t length; - u_int32_t blocks; - u_int32_t type:2; - u_int32_t reserved2:6; - u_int32_t block_size:24; + uint32_t blocks; + uint32_t type:2; + uint32_t reserved2:6; + uint32_t block_size:24; struct cdr_format_capacity format[32]; }; diff --git a/src/include.new/sys/chio.h b/src/include.new/sys/chio.h index 5c80cfa..12d87f6 100644 --- a/src/include.new/sys/chio.h +++ b/src/include.new/sys/chio.h @@ -270,7 +270,7 @@ #define CHIOGPICKER _IOR('c', 0x04, int) #define CHIOSPICKER _IOW('c', 0x05, int) #define CHIOGPARAMS _IOR('c', 0x06, struct changer_params) -#define CHIOIELEM _IOW('c', 0x07, u_int32_t) +#define CHIOIELEM _IOW('c', 0x07, uint32_t) #define OCHIOGSTATUS _IOW('c', 0x08, struct changer_element_status_request) #define CHIOSETVOLTAG _IOW('c', 0x09, struct changer_set_voltag_request) #define CHIOGSTATUS _IOW('c', 0x0A, struct changer_element_status_request) diff --git a/src/include.new/sys/devicestat.h b/src/include.new/sys/devicestat.h index d6cfaec..9c91de9 100644 --- a/src/include.new/sys/devicestat.h +++ b/src/include.new/sys/devicestat.h @@ -145,7 +145,7 @@ * for since this time */ STAILQ_ENTRY(devstat) dev_links; - u_int32_t device_number; /* + uint32_t device_number; /* * Devstat device * number. */ @@ -159,7 +159,7 @@ * Time the device was * created. */ - u_int32_t block_size; /* Block size, bytes */ + uint32_t block_size; /* Block size, bytes */ u_int64_t tag_types[3]; /* * The number of * simple, ordered, @@ -186,7 +186,7 @@ struct bio; struct devstat *devstat_new_entry(const void *dev_name, int unit_number, - u_int32_t block_size, + uint32_t block_size, devstat_support_flags flags, devstat_type_flags device_type, devstat_priority priority); @@ -194,7 +194,7 @@ void devstat_remove_entry(struct devstat *ds); void devstat_start_transaction(struct devstat *ds, struct bintime *now); void devstat_start_transaction_bio(struct devstat *ds, struct bio *bp); -void devstat_end_transaction(struct devstat *ds, u_int32_t bytes, +void devstat_end_transaction(struct devstat *ds, uint32_t bytes, devstat_tag_type tag_type, devstat_trans_flags flags, struct bintime *now, struct bintime *then); diff --git a/src/include.new/sys/disklabel.h b/src/include.new/sys/disklabel.h index 4f03047..b6d937c 100644 --- a/src/include.new/sys/disklabel.h +++ b/src/include.new/sys/disklabel.h @@ -57,7 +57,7 @@ #define LABELOFFSET 0 /* offset of label in sector */ #endif -#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */ +#define DISKMAGIC ((uint32_t)0x82564557) /* The disk magic number */ #ifndef MAXPARTITIONS #define MAXPARTITIONS 8 #endif @@ -70,7 +70,7 @@ #define SWAP_PART 1 /* partition normally containing swap */ struct disklabel { - u_int32_t d_magic; /* the magic number */ + uint32_t d_magic; /* the magic number */ u_int16_t d_type; /* drive type */ u_int16_t d_subtype; /* controller/d_type specific */ char d_typename[16]; /* type name, e.g. "eagle" */ @@ -78,12 +78,12 @@ char d_packname[16]; /* pack identifier */ /* disk geometry: */ - u_int32_t d_secsize; /* # of bytes per sector */ - u_int32_t d_nsectors; /* # of data sectors per track */ - u_int32_t d_ntracks; /* # of tracks per cylinder */ - u_int32_t d_ncylinders; /* # of data cylinders per unit */ - u_int32_t d_secpercyl; /* # of data sectors per cylinder */ - u_int32_t d_secperunit; /* # of data sectors per unit */ + uint32_t d_secsize; /* # of bytes per sector */ + uint32_t d_nsectors; /* # of data sectors per track */ + uint32_t d_ntracks; /* # of tracks per cylinder */ + uint32_t d_ncylinders; /* # of data cylinders per unit */ + uint32_t d_secpercyl; /* # of data sectors per cylinder */ + uint32_t d_secperunit; /* # of data sectors per unit */ /* * Spares (bad sector replacements) below are not counted in @@ -97,7 +97,7 @@ * Alternate cylinders include maintenance, replacement, configuration * description areas, etc. */ - u_int32_t d_acylinders; /* # of alt. cylinders per unit */ + uint32_t d_acylinders; /* # of alt. cylinders per unit */ /* hardware characteristics: */ /* @@ -120,24 +120,24 @@ u_int16_t d_interleave; /* hardware sector interleave */ u_int16_t d_trackskew; /* sector 0 skew, per track */ u_int16_t d_cylskew; /* sector 0 skew, per cylinder */ - u_int32_t d_headswitch; /* head switch time, usec */ - u_int32_t d_trkseek; /* track-to-track seek, usec */ - u_int32_t d_flags; /* generic flags */ + uint32_t d_headswitch; /* head switch time, usec */ + uint32_t d_trkseek; /* track-to-track seek, usec */ + uint32_t d_flags; /* generic flags */ #define NDDATA 5 - u_int32_t d_drivedata[NDDATA]; /* drive-type specific information */ + uint32_t d_drivedata[NDDATA]; /* drive-type specific information */ #define NSPARE 5 - u_int32_t d_spare[NSPARE]; /* reserved for future use */ - u_int32_t d_magic2; /* the magic number (again) */ + uint32_t d_spare[NSPARE]; /* reserved for future use */ + uint32_t d_magic2; /* the magic number (again) */ u_int16_t d_checksum; /* xor of data incl. partitions */ /* filesystem and partition information: */ u_int16_t d_npartitions; /* number of partitions in following */ - u_int32_t d_bbsize; /* size of boot area at sn0, bytes */ - u_int32_t d_sbsize; /* max size of fs superblock, bytes */ + uint32_t d_bbsize; /* size of boot area at sn0, bytes */ + uint32_t d_sbsize; /* max size of fs superblock, bytes */ struct partition { /* the partition table */ - u_int32_t p_size; /* number of sectors in partition */ - u_int32_t p_offset; /* starting sector */ - u_int32_t p_fsize; /* filesystem basic fragment size */ + uint32_t p_size; /* number of sectors in partition */ + uint32_t p_offset; /* starting sector */ + uint32_t p_fsize; /* filesystem basic fragment size */ u_int8_t p_fstype; /* filesystem type, see below */ u_int8_t p_frag; /* filesystem fragments per block */ u_int16_t p_cpg; /* filesystem cylinders per group */ diff --git a/src/include.new/sys/diskmbr.h b/src/include.new/sys/diskmbr.h index 8640de4..00ec577 100644 --- a/src/include.new/sys/diskmbr.h +++ b/src/include.new/sys/diskmbr.h @@ -72,8 +72,8 @@ unsigned char dp_ehd; /* end head */ unsigned char dp_esect; /* end sector */ unsigned char dp_ecyl; /* end cylinder */ - u_int32_t dp_start; /* absolute starting sector number */ - u_int32_t dp_size; /* partition size in sectors */ + uint32_t dp_start; /* absolute starting sector number */ + uint32_t dp_size; /* partition size in sectors */ }; #ifdef CTASSERT CTASSERT(sizeof (struct dos_partition) == DOSPARTSIZE); diff --git a/src/include.new/sys/dtrace_bsd.h b/src/include.new/sys/dtrace_bsd.h index a23bbdd..4bef181 100644 --- a/src/include.new/sys/dtrace_bsd.h +++ b/src/include.new/sys/dtrace_bsd.h @@ -88,7 +88,7 @@ extern dtrace_execexit_func_t dtrace_fasttrap_exit; /* The dtmalloc provider hooks into malloc. */ -typedef void (*dtrace_malloc_probe_func_t)(u_int32_t, uintptr_t arg0, +typedef void (*dtrace_malloc_probe_func_t)(uint32_t, uintptr_t arg0, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t arg4); extern dtrace_malloc_probe_func_t dtrace_malloc_probe; diff --git a/src/include.new/sys/dvdio.h b/src/include.new/sys/dvdio.h index 0a8a247..a59b0e1 100644 --- a/src/include.new/sys/dvdio.h +++ b/src/include.new/sys/dvdio.h @@ -42,9 +42,9 @@ u_int8_t linear_density :4; u_int8_t track_density :4; u_int8_t bca :1; - u_int32_t start_sector; - u_int32_t end_sector; - u_int32_t end_sector_l0; + uint32_t start_sector; + uint32_t end_sector; + uint32_t end_sector_l0; }; struct dvd_struct { @@ -53,7 +53,7 @@ u_char cpst; u_char rmi; u_int8_t agid :2; - u_int32_t length; + uint32_t length; u_char data[2048]; }; @@ -69,7 +69,7 @@ u_int8_t user_rsts :3; u_int8_t region; u_int8_t rpc_scheme; - u_int32_t lba; + uint32_t lba; u_char keychal[10]; }; diff --git a/src/include.new/sys/elf_common.h b/src/include.new/sys/elf_common.h index 0ef0602..17fcb9a 100644 --- a/src/include.new/sys/elf_common.h +++ b/src/include.new/sys/elf_common.h @@ -44,9 +44,9 @@ */ typedef struct { - u_int32_t n_namesz; /* Length of name. */ - u_int32_t n_descsz; /* Length of descriptor. */ - u_int32_t n_type; /* Type of this note. */ + uint32_t n_namesz; /* Length of name. */ + uint32_t n_descsz; /* Length of descriptor. */ + uint32_t n_type; /* Type of this note. */ } Elf_Note; /* @@ -54,10 +54,10 @@ */ typedef struct { - u_int32_t gh_nbuckets; /* Number of hash buckets. */ - u_int32_t gh_symndx; /* First visible symbol in .dynsym. */ - u_int32_t gh_maskwords; /* #maskwords used in bloom filter. */ - u_int32_t gh_shift2; /* Bloom filter shift count. */ + uint32_t gh_nbuckets; /* Number of hash buckets. */ + uint32_t gh_symndx; /* First visible symbol in .dynsym. */ + uint32_t gh_maskwords; /* #maskwords used in bloom filter. */ + uint32_t gh_shift2; /* Bloom filter shift count. */ } Elf_GNU_Hash_Header; /* Indexes into the e_ident array. Keep synced with diff --git a/src/include.new/sys/fnv_hash.h b/src/include.new/sys/fnv_hash.h index 982e682..6cb0a70 100644 --- a/src/include.new/sys/fnv_hash.h +++ b/src/include.new/sys/fnv_hash.h @@ -10,7 +10,7 @@ #ifndef _SYS_FNV_HASH_H_ #define _SYS_FNV_HASH_H_ -typedef u_int32_t Fnv32_t; +typedef uint32_t Fnv32_t; typedef u_int64_t Fnv64_t; #define FNV1_32_INIT ((Fnv32_t) 33554467UL) diff --git a/src/include.new/sys/jail.h b/src/include.new/sys/jail.h index 7cbff5b..f4f1e9f 100644 --- a/src/include.new/sys/jail.h +++ b/src/include.new/sys/jail.h @@ -32,10 +32,10 @@ #ifdef _KERNEL struct jail_v0 { - u_int32_t version; + uint32_t version; char *path; char *hostname; - u_int32_t ip_number; + uint32_t ip_number; }; #endif @@ -61,7 +61,7 @@ int pr_id; char pr_path[MAXPATHLEN]; char pr_host[MAXHOSTNAMELEN]; - u_int32_t pr_ip; + uint32_t pr_ip; }; #endif diff --git a/src/include.new/sys/kerneldump.h b/src/include.new/sys/kerneldump.h index 4791b6b..1fd030e 100644 --- a/src/include.new/sys/kerneldump.h +++ b/src/include.new/sys/kerneldump.h @@ -87,7 +87,7 @@ /* * Parity calculation is endian insensitive. */ -static __inline u_int32_t +static __inline uint32_t kerneldump_parity(struct kerneldumpheader *kdhp) { uint32_t *up, parity; diff --git a/src/include.new/sys/mbuf.h b/src/include.new/sys/mbuf.h index 5f9c29c..bef4b9e 100644 --- a/src/include.new/sys/mbuf.h +++ b/src/include.new/sys/mbuf.h @@ -110,7 +110,7 @@ SLIST_ENTRY(m_tag) m_tag_link; /* List of packet tags */ u_int16_t m_tag_id; /* Tag ID */ u_int16_t m_tag_len; /* Length of data */ - u_int32_t m_tag_cookie; /* ABI/Module ID */ + uint32_t m_tag_cookie; /* ABI/Module ID */ void (*m_tag_free)(struct m_tag *); }; @@ -1053,11 +1053,11 @@ /* Specific cookies and tags. */ /* Packet tag routines. */ -struct m_tag *m_tag_alloc(u_int32_t, int, int, int); +struct m_tag *m_tag_alloc(uint32_t, int, int, int); void m_tag_delete(struct mbuf *, struct m_tag *); void m_tag_delete_chain(struct mbuf *, struct m_tag *); void m_tag_free_default(struct m_tag *); -struct m_tag *m_tag_locate(struct mbuf *, u_int32_t, int, struct m_tag *); +struct m_tag *m_tag_locate(struct mbuf *, uint32_t, int, struct m_tag *); struct m_tag *m_tag_copy(struct m_tag *, int); int m_tag_copy_chain(struct mbuf *, struct mbuf *, int); void m_tag_delete_nonpersistent(struct mbuf *); @@ -1079,7 +1079,7 @@ * XXX probably should be called m_tag_init, but that was already taken. */ static __inline void -m_tag_setup(struct m_tag *t, u_int32_t cookie, int type, int len) +m_tag_setup(struct m_tag *t, uint32_t cookie, int type, int len) { t->m_tag_id = type; diff --git a/src/include.new/sys/mchain.h b/src/include.new/sys/mchain.h index 645a173..4ed19fa 100644 --- a/src/include.new/sys/mchain.h +++ b/src/include.new/sys/mchain.h @@ -71,8 +71,8 @@ int mb_put_uint8(struct mbchain *mbp, u_int8_t x); int mb_put_uint16be(struct mbchain *mbp, u_int16_t x); int mb_put_uint16le(struct mbchain *mbp, u_int16_t x); -int mb_put_uint32be(struct mbchain *mbp, u_int32_t x); -int mb_put_uint32le(struct mbchain *mbp, u_int32_t x); +int mb_put_uint32be(struct mbchain *mbp, uint32_t x); +int mb_put_uint32le(struct mbchain *mbp, uint32_t x); int mb_put_int64be(struct mbchain *mbp, int64_t x); int mb_put_int64le(struct mbchain *mbp, int64_t x); int mb_put_mem(struct mbchain *mbp, c_caddr_t source, int size, int type); @@ -88,9 +88,9 @@ int md_get_uint16(struct mdchain *mdp, u_int16_t *x); int md_get_uint16le(struct mdchain *mdp, u_int16_t *x); int md_get_uint16be(struct mdchain *mdp, u_int16_t *x); -int md_get_uint32(struct mdchain *mdp, u_int32_t *x); -int md_get_uint32be(struct mdchain *mdp, u_int32_t *x); -int md_get_uint32le(struct mdchain *mdp, u_int32_t *x); +int md_get_uint32(struct mdchain *mdp, uint32_t *x); +int md_get_uint32be(struct mdchain *mdp, uint32_t *x); +int md_get_uint32le(struct mdchain *mdp, uint32_t *x); int md_get_int64(struct mdchain *mdp, int64_t *x); int md_get_int64be(struct mdchain *mdp, int64_t *x); int md_get_int64le(struct mdchain *mdp, int64_t *x); diff --git a/src/include.new/sys/md4.h b/src/include.new/sys/md4.h index de19cce..3dcb78c 100644 --- a/src/include.new/sys/md4.h +++ b/src/include.new/sys/md4.h @@ -28,8 +28,8 @@ #define _MD4_H_ /* MD4 context. */ typedef struct MD4Context { - u_int32_t state[4]; /* state (ABCD) */ - u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ + uint32_t state[4]; /* state (ABCD) */ + uint32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ unsigned char buffer[64]; /* input buffer */ } MD4_CTX; diff --git a/src/include.new/sys/md5.h b/src/include.new/sys/md5.h index de3885a..ef3f2f5 100644 --- a/src/include.new/sys/md5.h +++ b/src/include.new/sys/md5.h @@ -34,8 +34,8 @@ /* MD5 context. */ typedef struct MD5Context { - u_int32_t state[4]; /* state (ABCD) */ - u_int32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ + uint32_t state[4]; /* state (ABCD) */ + uint32_t count[2]; /* number of bits, modulo 2^64 (lsb first) */ unsigned char buffer[64]; /* input buffer */ } MD5_CTX; diff --git a/src/include.new/sys/mount.h b/src/include.new/sys/mount.h index c606eb2..1c4d47f 100644 --- a/src/include.new/sys/mount.h +++ b/src/include.new/sys/mount.h @@ -523,7 +523,7 @@ fsctlop_t vc_op; /* operation VFS_CTL_* (below) */ void *vc_ptr; /* pointer to data structure */ size_t vc_len; /* sizeof said structure */ - u_int32_t vc_spare[12]; /* spare (must be zero) */ + uint32_t vc_spare[12]; /* spare (must be zero) */ }; /* vfsidctl API version. */ @@ -541,8 +541,8 @@ #define VFS_CTL_NOLOCKS 0x00010003 /* disable file locking */ struct vfsquery { - u_int32_t vq_flags; - u_int32_t vq_spare[31]; + uint32_t vq_flags; + uint32_t vq_spare[31]; }; /* vfsquery flags */ @@ -843,7 +843,7 @@ struct vfsconf *vfs_byname(const char *); struct vfsconf *vfs_byname_kld(const char *, struct thread *td, int *); void vfs_mount_destroy(struct mount *); -void vfs_event_signal(fsid_t *, u_int32_t, intptr_t); +void vfs_event_signal(fsid_t *, uint32_t, intptr_t); void vfs_freeopts(struct vfsoptlist *opts); void vfs_deleteopt(struct vfsoptlist *opts, const char *name); int vfs_buildopts(struct uio *auio, struct vfsoptlist **options); diff --git a/src/include.new/sys/mtio.h b/src/include.new/sys/mtio.h index 8cb11de..919c59c 100644 --- a/src/include.new/sys/mtio.h +++ b/src/include.new/sys/mtio.h @@ -125,7 +125,7 @@ #if defined (__FreeBSD__) int32_t mt_blksiz; /* presently operating blocksize */ int32_t mt_density; /* presently operating density */ - u_int32_t mt_comp; /* presently operating compression */ + uint32_t mt_comp; /* presently operating compression */ int32_t mt_blksiz0; /* blocksize for mode 0 */ int32_t mt_blksiz1; /* blocksize for mode 1 */ int32_t mt_blksiz2; /* blocksize for mode 2 */ @@ -135,10 +135,10 @@ int32_t mt_density2; /* density for mode 2 */ int32_t mt_density3; /* density for mode 3 */ /* the following are not yet implemented */ - u_int32_t mt_comp0; /* compression type for mode 0 */ - u_int32_t mt_comp1; /* compression type for mode 1 */ - u_int32_t mt_comp2; /* compression type for mode 2 */ - u_int32_t mt_comp3; /* compression type for mode 3 */ + uint32_t mt_comp0; /* compression type for mode 0 */ + uint32_t mt_comp1; /* compression type for mode 1 */ + uint32_t mt_comp2; /* compression type for mode 2 */ + uint32_t mt_comp3; /* compression type for mode 3 */ /* end not yet implemented */ #endif int32_t mt_fileno; /* relative file number of current position */ @@ -165,10 +165,10 @@ * (not implemented as yet but space is being reserved for them) */ struct { - u_int32_t retries; /* total # retries performed */ - u_int32_t corrected; /* total # corrections performed */ - u_int32_t processed; /* total # corrections successful */ - u_int32_t failures; /* total # corrections/retries failed */ + uint32_t retries; /* total # retries performed */ + uint32_t corrected; /* total # corrections performed */ + uint32_t processed; /* total # corrections successful */ + uint32_t failures; /* total # corrections/retries failed */ u_int64_t nbytes; /* total # bytes processed */ } wterr, rderr; }; @@ -321,19 +321,19 @@ * rethink these ioctls to support all the entities they haul into * the picture (64 bit blocks, logical file record numbers, etc..). */ -#define MTIOCRDSPOS _IOR('m', 5, u_int32_t) /* get logical blk addr */ -#define MTIOCRDHPOS _IOR('m', 6, u_int32_t) /* get hardware blk addr */ -#define MTIOCSLOCATE _IOW('m', 5, u_int32_t) /* seek to logical blk addr */ -#define MTIOCHLOCATE _IOW('m', 6, u_int32_t) /* seek to hardware blk addr */ +#define MTIOCRDSPOS _IOR('m', 5, uint32_t) /* get logical blk addr */ +#define MTIOCRDHPOS _IOR('m', 6, uint32_t) /* get hardware blk addr */ +#define MTIOCSLOCATE _IOW('m', 5, uint32_t) /* seek to logical blk addr */ +#define MTIOCHLOCATE _IOW('m', 6, uint32_t) /* seek to hardware blk addr */ #define MTIOCERRSTAT _IOR('m', 7, union mterrstat) /* get tape errors */ /* * Set EOT model- argument is number of filemarks to end a tape with. * Note that not all possible values will be accepted. */ -#define MTIOCSETEOTMODEL _IOW('m', 8, u_int32_t) +#define MTIOCSETEOTMODEL _IOW('m', 8, uint32_t) /* Get current EOT model */ -#define MTIOCGETEOTMODEL _IOR('m', 8, u_int32_t) +#define MTIOCGETEOTMODEL _IOR('m', 8, uint32_t) #define MTIOCRBLIM _IOR('m', 9, struct mtrblim) /* get block limits */ #define MTIOCEXTLOCATE _IOW('m', 10, struct mtlocate) /* seek to position */ diff --git a/src/include.new/sys/pciio.h b/src/include.new/sys/pciio.h index abc4c0b..9a495da 100644 --- a/src/include.new/sys/pciio.h +++ b/src/include.new/sys/pciio.h @@ -56,7 +56,7 @@ } pci_getconf_flags; struct pcisel { - u_int32_t pc_domain; /* domain number */ + uint32_t pc_domain; /* domain number */ u_int8_t pc_bus; /* bus number */ u_int8_t pc_dev; /* device on this bus */ u_int8_t pc_func; /* function on this device */ @@ -90,14 +90,14 @@ }; struct pci_conf_io { - u_int32_t pat_buf_len; /* pattern buffer length */ - u_int32_t num_patterns; /* number of patterns */ + uint32_t pat_buf_len; /* pattern buffer length */ + uint32_t num_patterns; /* number of patterns */ struct pci_match_conf *patterns; /* pattern buffer */ - u_int32_t match_buf_len; /* match buffer length */ - u_int32_t num_matches; /* number of matches returned */ + uint32_t match_buf_len; /* match buffer length */ + uint32_t num_matches; /* number of matches returned */ struct pci_conf *matches; /* match buffer */ - u_int32_t offset; /* offset into device list */ - u_int32_t generation; /* device list generation */ + uint32_t offset; /* offset into device list */ + uint32_t generation; /* device list generation */ pci_getconf_status status; /* request status */ }; @@ -105,7 +105,7 @@ struct pcisel pi_sel; /* device to operate on */ int pi_reg; /* configuration register to examine */ int pi_width; /* width (in bytes) of read or write */ - u_int32_t pi_data; /* data to write or result of read */ + uint32_t pi_data; /* data to write or result of read */ }; struct pci_bar_io { diff --git a/src/include.new/sys/sun_disklabel.h b/src/include.new/sys/sun_disklabel.h index de4aa43..0ef066b 100644 --- a/src/include.new/sys/sun_disklabel.h +++ b/src/include.new/sys/sun_disklabel.h @@ -66,8 +66,8 @@ /* partition info */ struct sun_dkpart { - u_int32_t sdkp_cyloffset; /* starting cylinder */ - u_int32_t sdkp_nsectors; /* number of sectors */ + uint32_t sdkp_cyloffset; /* starting cylinder */ + uint32_t sdkp_nsectors; /* number of sectors */ }; struct sun_vtoc_info { @@ -98,11 +98,11 @@ char sl_text[128]; /* SVR4 VTOC information */ - u_int32_t sl_vtoc_vers; /* == SUN_VTOC_VERSION */ + uint32_t sl_vtoc_vers; /* == SUN_VTOC_VERSION */ char sl_vtoc_volname[SUN_VOLNAME_LEN]; u_int16_t sl_vtoc_nparts; /* == SUN_NPART */ struct sun_vtoc_info sl_vtoc_map[SUN_NPART]; /* partition tag/flag */ - u_int32_t sl_vtoc_sane; /* == SUN_VTOC_SANE */ + uint32_t sl_vtoc_sane; /* == SUN_VTOC_SANE */ /* Sun label information */ u_int16_t sl_rpm; /* rotational speed */ diff --git a/src/include.new/sys/sysent.h b/src/include.new/sys/sysent.h index 9713dd4..149d7bb 100644 --- a/src/include.new/sys/sysent.h +++ b/src/include.new/sys/sysent.h @@ -42,7 +42,7 @@ typedef int sy_call_t(struct thread *, void *); /* Used by the machine dependent syscall() code. */ -typedef void (*systrace_probe_func_t)(u_int32_t, int, struct sysent *, void *, +typedef void (*systrace_probe_func_t)(uint32_t, int, struct sysent *, void *, int); /* @@ -59,10 +59,10 @@ au_event_t sy_auevent; /* audit event associated with syscall */ systrace_args_func_t sy_systrace_args_func; /* optional argument conversion function. */ - u_int32_t sy_entry; /* DTrace entry ID for systrace. */ - u_int32_t sy_return; /* DTrace return ID for systrace. */ - u_int32_t sy_flags; /* General flags for system calls. */ - u_int32_t sy_thrcnt; + uint32_t sy_entry; /* DTrace entry ID for systrace. */ + uint32_t sy_return; /* DTrace return ID for systrace. */ + uint32_t sy_flags; /* General flags for system calls. */ + uint32_t sy_thrcnt; }; /* diff --git a/src/include.new/sys/tiio.h b/src/include.new/sys/tiio.h index b9ce4f8..5a7e530 100644 --- a/src/include.new/sys/tiio.h +++ b/src/include.new/sys/tiio.h @@ -75,45 +75,45 @@ /* * MAC stats, taken from RFC 1643, ethernet-like MIB */ - volatile u_int32_t dot3StatsAlignmentErrors; /* 0 */ - volatile u_int32_t dot3StatsFCSErrors; /* 1 */ - volatile u_int32_t dot3StatsSingleCollisionFrames; /* 2 */ - volatile u_int32_t dot3StatsMultipleCollisionFrames; /* 3 */ - volatile u_int32_t dot3StatsSQETestErrors; /* 4 */ - volatile u_int32_t dot3StatsDeferredTransmissions; /* 5 */ - volatile u_int32_t dot3StatsLateCollisions; /* 6 */ - volatile u_int32_t dot3StatsExcessiveCollisions; /* 7 */ - volatile u_int32_t dot3StatsInternalMacTransmitErrors; /* 8 */ - volatile u_int32_t dot3StatsCarrierSenseErrors; /* 9 */ - volatile u_int32_t dot3StatsFrameTooLongs; /* 10 */ - volatile u_int32_t dot3StatsInternalMacReceiveErrors; /* 11 */ + volatile uint32_t dot3StatsAlignmentErrors; /* 0 */ + volatile uint32_t dot3StatsFCSErrors; /* 1 */ + volatile uint32_t dot3StatsSingleCollisionFrames; /* 2 */ + volatile uint32_t dot3StatsMultipleCollisionFrames; /* 3 */ + volatile uint32_t dot3StatsSQETestErrors; /* 4 */ + volatile uint32_t dot3StatsDeferredTransmissions; /* 5 */ + volatile uint32_t dot3StatsLateCollisions; /* 6 */ + volatile uint32_t dot3StatsExcessiveCollisions; /* 7 */ + volatile uint32_t dot3StatsInternalMacTransmitErrors; /* 8 */ + volatile uint32_t dot3StatsCarrierSenseErrors; /* 9 */ + volatile uint32_t dot3StatsFrameTooLongs; /* 10 */ + volatile uint32_t dot3StatsInternalMacReceiveErrors; /* 11 */ /* * interface stats, taken from RFC 1213, MIB-II, interfaces group */ - volatile u_int32_t ifIndex; /* 12 */ - volatile u_int32_t ifType; /* 13 */ - volatile u_int32_t ifMtu; /* 14 */ - volatile u_int32_t ifSpeed; /* 15 */ - volatile u_int32_t ifAdminStatus; /* 16 */ + volatile uint32_t ifIndex; /* 12 */ + volatile uint32_t ifType; /* 13 */ + volatile uint32_t ifMtu; /* 14 */ + volatile uint32_t ifSpeed; /* 15 */ + volatile uint32_t ifAdminStatus; /* 16 */ #define IF_ADMIN_STATUS_UP 1 #define IF_ADMIN_STATUS_DOWN 2 #define IF_ADMIN_STATUS_TESTING 3 - volatile u_int32_t ifOperStatus; /* 17 */ + volatile uint32_t ifOperStatus; /* 17 */ #define IF_OPER_STATUS_UP 1 #define IF_OPER_STATUS_DOWN 2 #define IF_OPER_STATUS_TESTING 3 #define IF_OPER_STATUS_UNKNOWN 4 #define IF_OPER_STATUS_DORMANT 5 - volatile u_int32_t ifLastChange; /* 18 */ - volatile u_int32_t ifInDiscards; /* 19 */ - volatile u_int32_t ifInErrors; /* 20 */ - volatile u_int32_t ifInUnknownProtos; /* 21 */ - volatile u_int32_t ifOutDiscards; /* 22 */ - volatile u_int32_t ifOutErrors; /* 23 */ - volatile u_int32_t ifOutQLen; /* deprecated */ /* 24 */ + volatile uint32_t ifLastChange; /* 18 */ + volatile uint32_t ifInDiscards; /* 19 */ + volatile uint32_t ifInErrors; /* 20 */ + volatile uint32_t ifInUnknownProtos; /* 21 */ + volatile uint32_t ifOutDiscards; /* 22 */ + volatile uint32_t ifOutErrors; /* 23 */ + volatile uint32_t ifOutQLen; /* deprecated */ /* 24 */ volatile u_int8_t ifPhysAddress[8]; /* 8 bytes */ /* 25 - 26 */ volatile u_int8_t ifDescr[32]; /* 27 - 34 */ - u_int32_t alignIt; /* align to 64 bit for u_int64_ts following */ + uint32_t alignIt; /* align to 64 bit for u_int64_ts following */ /* * more interface stats, taken from RFC 1573, MIB-IIupdate, * interfaces group @@ -126,142 +126,142 @@ volatile u_int64_t ifHCOutUcastPkts; /* 46 - 47 */ volatile u_int64_t ifHCOutMulticastPkts; /* 48 - 49 */ volatile u_int64_t ifHCOutBroadcastPkts; /* 50 - 51 */ - volatile u_int32_t ifLinkUpDownTrapEnable; /* 52 */ - volatile u_int32_t ifHighSpeed; /* 53 */ - volatile u_int32_t ifPromiscuousMode; /* 54 */ - volatile u_int32_t ifConnectorPresent; /* follow link state 55 */ + volatile uint32_t ifLinkUpDownTrapEnable; /* 52 */ + volatile uint32_t ifHighSpeed; /* 53 */ + volatile uint32_t ifPromiscuousMode; /* 54 */ + volatile uint32_t ifConnectorPresent; /* follow link state 55 */ /* * Host Commands */ - volatile u_int32_t nicCmdsHostState; /* 56 */ - volatile u_int32_t nicCmdsFDRFiltering; /* 57 */ - volatile u_int32_t nicCmdsSetRecvProdIndex; /* 58 */ - volatile u_int32_t nicCmdsUpdateGencommStats; /* 59 */ - volatile u_int32_t nicCmdsResetJumboRing; /* 60 */ - volatile u_int32_t nicCmdsAddMCastAddr; /* 61 */ - volatile u_int32_t nicCmdsDelMCastAddr; /* 62 */ - volatile u_int32_t nicCmdsSetPromiscMode; /* 63 */ - volatile u_int32_t nicCmdsLinkNegotiate; /* 64 */ - volatile u_int32_t nicCmdsSetMACAddr; /* 65 */ - volatile u_int32_t nicCmdsClearProfile; /* 66 */ - volatile u_int32_t nicCmdsSetMulticastMode; /* 67 */ - volatile u_int32_t nicCmdsClearStats; /* 68 */ - volatile u_int32_t nicCmdsSetRecvJumboProdIndex; /* 69 */ - volatile u_int32_t nicCmdsSetRecvMiniProdIndex; /* 70 */ - volatile u_int32_t nicCmdsRefreshStats; /* 71 */ - volatile u_int32_t nicCmdsUnknown; /* 72 */ + volatile uint32_t nicCmdsHostState; /* 56 */ + volatile uint32_t nicCmdsFDRFiltering; /* 57 */ + volatile uint32_t nicCmdsSetRecvProdIndex; /* 58 */ + volatile uint32_t nicCmdsUpdateGencommStats; /* 59 */ + volatile uint32_t nicCmdsResetJumboRing; /* 60 */ + volatile uint32_t nicCmdsAddMCastAddr; /* 61 */ + volatile uint32_t nicCmdsDelMCastAddr; /* 62 */ + volatile uint32_t nicCmdsSetPromiscMode; /* 63 */ + volatile uint32_t nicCmdsLinkNegotiate; /* 64 */ + volatile uint32_t nicCmdsSetMACAddr; /* 65 */ + volatile uint32_t nicCmdsClearProfile; /* 66 */ + volatile uint32_t nicCmdsSetMulticastMode; /* 67 */ + volatile uint32_t nicCmdsClearStats; /* 68 */ + volatile uint32_t nicCmdsSetRecvJumboProdIndex; /* 69 */ + volatile uint32_t nicCmdsSetRecvMiniProdIndex; /* 70 */ + volatile uint32_t nicCmdsRefreshStats; /* 71 */ + volatile uint32_t nicCmdsUnknown; /* 72 */ /* * NIC Events */ - volatile u_int32_t nicEventsNICFirmwareOperational; /* 73 */ - volatile u_int32_t nicEventsStatsUpdated; /* 74 */ - volatile u_int32_t nicEventsLinkStateChanged; /* 75 */ - volatile u_int32_t nicEventsError; /* 76 */ - volatile u_int32_t nicEventsMCastListUpdated; /* 77 */ - volatile u_int32_t nicEventsResetJumboRing; /* 78 */ + volatile uint32_t nicEventsNICFirmwareOperational; /* 73 */ + volatile uint32_t nicEventsStatsUpdated; /* 74 */ + volatile uint32_t nicEventsLinkStateChanged; /* 75 */ + volatile uint32_t nicEventsError; /* 76 */ + volatile uint32_t nicEventsMCastListUpdated; /* 77 */ + volatile uint32_t nicEventsResetJumboRing; /* 78 */ /* * Ring manipulation */ - volatile u_int32_t nicRingSetSendProdIndex; /* 79 */ - volatile u_int32_t nicRingSetSendConsIndex; /* 80 */ - volatile u_int32_t nicRingSetRecvReturnProdIndex; /* 81 */ + volatile uint32_t nicRingSetSendProdIndex; /* 79 */ + volatile uint32_t nicRingSetSendConsIndex; /* 80 */ + volatile uint32_t nicRingSetRecvReturnProdIndex; /* 81 */ /* * Interrupts */ - volatile u_int32_t nicInterrupts; /* 82 */ - volatile u_int32_t nicAvoidedInterrupts; /* 83 */ + volatile uint32_t nicInterrupts; /* 82 */ + volatile uint32_t nicAvoidedInterrupts; /* 83 */ /* * BD Coalessing Thresholds */ - volatile u_int32_t nicEventThresholdHit; /* 84 */ - volatile u_int32_t nicSendThresholdHit; /* 85 */ - volatile u_int32_t nicRecvThresholdHit; /* 86 */ + volatile uint32_t nicEventThresholdHit; /* 84 */ + volatile uint32_t nicSendThresholdHit; /* 85 */ + volatile uint32_t nicRecvThresholdHit; /* 86 */ /* * DMA Attentions */ - volatile u_int32_t nicDmaRdOverrun; /* 87 */ - volatile u_int32_t nicDmaRdUnderrun; /* 88 */ - volatile u_int32_t nicDmaWrOverrun; /* 89 */ - volatile u_int32_t nicDmaWrUnderrun; /* 90 */ - volatile u_int32_t nicDmaWrMasterAborts; /* 91 */ - volatile u_int32_t nicDmaRdMasterAborts; /* 92 */ + volatile uint32_t nicDmaRdOverrun; /* 87 */ + volatile uint32_t nicDmaRdUnderrun; /* 88 */ + volatile uint32_t nicDmaWrOverrun; /* 89 */ + volatile uint32_t nicDmaWrUnderrun; /* 90 */ + volatile uint32_t nicDmaWrMasterAborts; /* 91 */ + volatile uint32_t nicDmaRdMasterAborts; /* 92 */ /* * NIC Resources */ - volatile u_int32_t nicDmaWriteRingFull; /* 93 */ - volatile u_int32_t nicDmaReadRingFull; /* 94 */ - volatile u_int32_t nicEventRingFull; /* 95 */ - volatile u_int32_t nicEventProducerRingFull; /* 96 */ - volatile u_int32_t nicTxMacDescrRingFull; /* 97 */ - volatile u_int32_t nicOutOfTxBufSpaceFrameRetry; /* 98 */ - volatile u_int32_t nicNoMoreWrDMADescriptors; /* 99 */ - volatile u_int32_t nicNoMoreRxBDs; /* 100 */ - volatile u_int32_t nicNoSpaceInReturnRing; /* 101 */ - volatile u_int32_t nicSendBDs; /* current count 102 */ - volatile u_int32_t nicRecvBDs; /* current count 103 */ - volatile u_int32_t nicJumboRecvBDs; /* current count 104 */ - volatile u_int32_t nicMiniRecvBDs; /* current count 105 */ - volatile u_int32_t nicTotalRecvBDs; /* current count 106 */ - volatile u_int32_t nicTotalSendBDs; /* current count 107 */ - volatile u_int32_t nicJumboSpillOver; /* 108 */ - volatile u_int32_t nicSbusHangCleared; /* 109 */ - volatile u_int32_t nicEnqEventDelayed; /* 110 */ + volatile uint32_t nicDmaWriteRingFull; /* 93 */ + volatile uint32_t nicDmaReadRingFull; /* 94 */ + volatile uint32_t nicEventRingFull; /* 95 */ + volatile uint32_t nicEventProducerRingFull; /* 96 */ + volatile uint32_t nicTxMacDescrRingFull; /* 97 */ + volatile uint32_t nicOutOfTxBufSpaceFrameRetry; /* 98 */ + volatile uint32_t nicNoMoreWrDMADescriptors; /* 99 */ + volatile uint32_t nicNoMoreRxBDs; /* 100 */ + volatile uint32_t nicNoSpaceInReturnRing; /* 101 */ + volatile uint32_t nicSendBDs; /* current count 102 */ + volatile uint32_t nicRecvBDs; /* current count 103 */ + volatile uint32_t nicJumboRecvBDs; /* current count 104 */ + volatile uint32_t nicMiniRecvBDs; /* current count 105 */ + volatile uint32_t nicTotalRecvBDs; /* current count 106 */ + volatile uint32_t nicTotalSendBDs; /* current count 107 */ + volatile uint32_t nicJumboSpillOver; /* 108 */ + volatile uint32_t nicSbusHangCleared; /* 109 */ + volatile uint32_t nicEnqEventDelayed; /* 110 */ /* * Stats from MAC rx completion */ - volatile u_int32_t nicMacRxLateColls; /* 111 */ - volatile u_int32_t nicMacRxLinkLostDuringPkt; /* 112 */ - volatile u_int32_t nicMacRxPhyDecodeErr; /* 113 */ - volatile u_int32_t nicMacRxMacAbort; /* 114 */ - volatile u_int32_t nicMacRxTruncNoResources; /* 115 */ + volatile uint32_t nicMacRxLateColls; /* 111 */ + volatile uint32_t nicMacRxLinkLostDuringPkt; /* 112 */ + volatile uint32_t nicMacRxPhyDecodeErr; /* 113 */ + volatile uint32_t nicMacRxMacAbort; /* 114 */ + volatile uint32_t nicMacRxTruncNoResources; /* 115 */ /* * Stats from the mac_stats area */ - volatile u_int32_t nicMacRxDropUla; /* 116 */ - volatile u_int32_t nicMacRxDropMcast; /* 117 */ - volatile u_int32_t nicMacRxFlowControl; /* 118 */ - volatile u_int32_t nicMacRxDropSpace; /* 119 */ - volatile u_int32_t nicMacRxColls; /* 120 */ + volatile uint32_t nicMacRxDropUla; /* 116 */ + volatile uint32_t nicMacRxDropMcast; /* 117 */ + volatile uint32_t nicMacRxFlowControl; /* 118 */ + volatile uint32_t nicMacRxDropSpace; /* 119 */ + volatile uint32_t nicMacRxColls; /* 120 */ /* * MAC RX Attentions */ - volatile u_int32_t nicMacRxTotalAttns; /* 121 */ - volatile u_int32_t nicMacRxLinkAttns; /* 122 */ - volatile u_int32_t nicMacRxSyncAttns; /* 123 */ - volatile u_int32_t nicMacRxConfigAttns; /* 124 */ - volatile u_int32_t nicMacReset; /* 125 */ - volatile u_int32_t nicMacRxBufDescrAttns; /* 126 */ - volatile u_int32_t nicMacRxBufAttns; /* 127 */ - volatile u_int32_t nicMacRxZeroFrameCleanup; /* 128 */ - volatile u_int32_t nicMacRxOneFrameCleanup; /* 129 */ - volatile u_int32_t nicMacRxMultipleFrameCleanup; /* 130 */ - volatile u_int32_t nicMacRxTimerCleanup; /* 131 */ - volatile u_int32_t nicMacRxDmaCleanup; /* 132 */ + volatile uint32_t nicMacRxTotalAttns; /* 121 */ + volatile uint32_t nicMacRxLinkAttns; /* 122 */ + volatile uint32_t nicMacRxSyncAttns; /* 123 */ + volatile uint32_t nicMacRxConfigAttns; /* 124 */ + volatile uint32_t nicMacReset; /* 125 */ + volatile uint32_t nicMacRxBufDescrAttns; /* 126 */ + volatile uint32_t nicMacRxBufAttns; /* 127 */ + volatile uint32_t nicMacRxZeroFrameCleanup; /* 128 */ + volatile uint32_t nicMacRxOneFrameCleanup; /* 129 */ + volatile uint32_t nicMacRxMultipleFrameCleanup; /* 130 */ + volatile uint32_t nicMacRxTimerCleanup; /* 131 */ + volatile uint32_t nicMacRxDmaCleanup; /* 132 */ /* * Stats from the mac_stats area */ - volatile u_int32_t nicMacTxCollisionHistogram[15]; /* 133 */ + volatile uint32_t nicMacTxCollisionHistogram[15]; /* 133 */ /* * MAC TX Attentions */ - volatile u_int32_t nicMacTxTotalAttns; /* 134 */ + volatile uint32_t nicMacTxTotalAttns; /* 134 */ /* * NIC Profile */ - volatile u_int32_t nicProfile[32]; /* 135 */ + volatile uint32_t nicProfile[32]; /* 135 */ /* * Pat to 1024 bytes. */ - u_int32_t pad[75]; + uint32_t pad[75]; }; struct tg_reg { - u_int32_t data; - u_int32_t addr; + uint32_t data; + uint32_t addr; }; struct tg_mem { - u_int32_t tgAddr; + uint32_t tgAddr; caddr_t userAddr; int len; }; @@ -279,12 +279,12 @@ } ti_param_mask; struct ti_params { - u_int32_t ti_stat_ticks; - u_int32_t ti_rx_coal_ticks; - u_int32_t ti_tx_coal_ticks; - u_int32_t ti_rx_max_coal_bds; - u_int32_t ti_tx_max_coal_bds; - u_int32_t ti_tx_buf_ratio; + uint32_t ti_stat_ticks; + uint32_t ti_rx_coal_ticks; + uint32_t ti_tx_coal_ticks; + uint32_t ti_rx_max_coal_bds; + uint32_t ti_tx_max_coal_bds; + uint32_t ti_tx_buf_ratio; ti_param_mask param_mask; }; diff --git a/src/include.new/sys/types.h b/src/include.new/sys/types.h index 438116b..2d996b7 100644 --- a/src/include.new/sys/types.h +++ b/src/include.new/sys/types.h @@ -64,7 +64,7 @@ typedef __uint8_t u_int8_t; /* unsigned integrals (deprecated) */ typedef __uint16_t u_int16_t; -typedef __uint32_t u_int32_t; +typedef __uint32_t uint32_t; typedef __uint64_t u_int64_t; typedef __uint64_t u_quad_t; /* quads (deprecated) */ diff --git a/src/include.new/sys/xrpuio.h b/src/include.new/sys/xrpuio.h index 928e200..b467f9c 100644 --- a/src/include.new/sys/xrpuio.h +++ b/src/include.new/sys/xrpuio.h @@ -22,7 +22,7 @@ u_int xt_addr_trigger; u_int xt_addr_latch; unsigned xt_mask; - u_int32_t xt_frequency; + uint32_t xt_frequency; char xt_name[16]; /* The PPS latches */ diff --git a/src/include.new/ufs/ffs/fs.h b/src/include.new/ufs/ffs/fs.h index 34f8275..5f0db2c 100644 --- a/src/include.new/ufs/ffs/fs.h +++ b/src/include.new/ufs/ffs/fs.h @@ -269,7 +269,7 @@ int32_t fs_old_time; /* last time written */ int32_t fs_old_size; /* number of blocks in fs */ int32_t fs_old_dsize; /* number of data blocks in fs */ - u_int32_t fs_ncg; /* number of cylinder groups */ + uint32_t fs_ncg; /* number of cylinder groups */ int32_t fs_bsize; /* size of basic blocks in fs */ int32_t fs_fsize; /* size of frag blocks in fs */ int32_t fs_frag; /* number of frags in a block in fs */ @@ -292,7 +292,7 @@ int32_t fs_spare1[2]; /* old fs_csmask */ /* old fs_csshift */ int32_t fs_nindir; /* value of NINDIR */ - u_int32_t fs_inopb; /* value of INOPB */ + uint32_t fs_inopb; /* value of INOPB */ int32_t fs_old_nspf; /* value of NSPF */ /* yet another configuration parameter */ int32_t fs_optim; /* optimization preference, see below */ @@ -309,7 +309,7 @@ int32_t fs_old_spc; /* sectors per cylinder */ int32_t fs_old_ncyl; /* cylinders in filesystem */ int32_t fs_old_cpg; /* cylinders per group */ - u_int32_t fs_ipg; /* inodes per group */ + uint32_t fs_ipg; /* inodes per group */ int32_t fs_fpg; /* blocks per group * fs_frag */ /* this data must be re-computed after crashes */ struct csum fs_old_cstotal; /* cylinder summary information */ @@ -342,10 +342,10 @@ int64_t fs_dsize; /* number of data blocks in fs */ ufs2_daddr_t fs_csaddr; /* blk addr of cyl grp summary area */ int64_t fs_pendingblocks; /* (u) blocks being freed */ - u_int32_t fs_pendinginodes; /* (u) inodes being freed */ + uint32_t fs_pendinginodes; /* (u) inodes being freed */ uint32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */ - u_int32_t fs_avgfilesize; /* expected average file size */ - u_int32_t fs_avgfpdir; /* expected # of files per directory */ + uint32_t fs_avgfilesize; /* expected average file size */ + uint32_t fs_avgfpdir; /* expected # of files per directory */ int32_t fs_save_cgsize; /* save real cg size to use fs_bsize */ ufs_time_t fs_mtime; /* Last mount or fsck time. */ int32_t fs_sujfree; /* SUJ free list */ @@ -474,26 +474,26 @@ int32_t cg_firstfield; /* historic cyl groups linked list */ int32_t cg_magic; /* magic number */ int32_t cg_old_time; /* time last written */ - u_int32_t cg_cgx; /* we are the cgx'th cylinder group */ + uint32_t cg_cgx; /* we are the cgx'th cylinder group */ int16_t cg_old_ncyl; /* number of cyl's this cg */ int16_t cg_old_niblk; /* number of inode blocks this cg */ - u_int32_t cg_ndblk; /* number of data blocks this cg */ + uint32_t cg_ndblk; /* number of data blocks this cg */ struct csum cg_cs; /* cylinder summary information */ - u_int32_t cg_rotor; /* position of last used block */ - u_int32_t cg_frotor; /* position of last used frag */ - u_int32_t cg_irotor; /* position of last used inode */ - u_int32_t cg_frsum[MAXFRAG]; /* counts of available frags */ + uint32_t cg_rotor; /* position of last used block */ + uint32_t cg_frotor; /* position of last used frag */ + uint32_t cg_irotor; /* position of last used inode */ + uint32_t cg_frsum[MAXFRAG]; /* counts of available frags */ int32_t cg_old_btotoff; /* (int32) block totals per cylinder */ int32_t cg_old_boff; /* (u_int16) free block positions */ - u_int32_t cg_iusedoff; /* (u_int8) used inode map */ - u_int32_t cg_freeoff; /* (u_int8) free block map */ - u_int32_t cg_nextfreeoff; /* (u_int8) next available space */ - u_int32_t cg_clustersumoff; /* (u_int32) counts of avail clusters */ - u_int32_t cg_clusteroff; /* (u_int8) free cluster map */ - u_int32_t cg_nclusterblks; /* number of clusters this cg */ - u_int32_t cg_niblk; /* number of inode blocks this cg */ - u_int32_t cg_initediblk; /* last initialized inode */ - u_int32_t cg_unrefs; /* number of unreferenced inodes */ + uint32_t cg_iusedoff; /* (u_int8) used inode map */ + uint32_t cg_freeoff; /* (u_int8) free block map */ + uint32_t cg_nextfreeoff; /* (u_int8) next available space */ + uint32_t cg_clustersumoff; /* (u_int32) counts of avail clusters */ + uint32_t cg_clusteroff; /* (u_int8) free cluster map */ + uint32_t cg_nclusterblks; /* number of clusters this cg */ + uint32_t cg_niblk; /* number of inode blocks this cg */ + uint32_t cg_initediblk; /* last initialized inode */ + uint32_t cg_unrefs; /* number of unreferenced inodes */ int32_t cg_sparecon32[2]; /* reserved for future use */ ufs_time_t cg_time; /* time last written */ int64_t cg_sparecon64[3]; /* reserved for future use */ diff --git a/src/include.new/ufs/ufs/dinode.h b/src/include.new/ufs/ufs/dinode.h index 3f1f016..67b15fa 100644 --- a/src/include.new/ufs/ufs/dinode.h +++ b/src/include.new/ufs/ufs/dinode.h @@ -125,9 +125,9 @@ struct ufs2_dinode { u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ int16_t di_nlink; /* 2: File link count. */ - u_int32_t di_uid; /* 4: File owner. */ - u_int32_t di_gid; /* 8: File group. */ - u_int32_t di_blksize; /* 12: Inode blocksize. */ + uint32_t di_uid; /* 4: File owner. */ + uint32_t di_gid; /* 8: File group. */ + uint32_t di_blksize; /* 12: Inode blocksize. */ u_int64_t di_size; /* 16: File byte count. */ u_int64_t di_blocks; /* 24: Blocks actually held. */ ufs_time_t di_atime; /* 32: Last access time. */ @@ -138,10 +138,10 @@ int32_t di_atimensec; /* 68: Last access time. */ int32_t di_ctimensec; /* 72: Last inode change time. */ int32_t di_birthnsec; /* 76: Inode creation time. */ - u_int32_t di_gen; /* 80: Generation number. */ - u_int32_t di_kernflags; /* 84: Kernel flags. */ - u_int32_t di_flags; /* 88: Status flags (chflags). */ - u_int32_t di_extsize; /* 92: External attributes size. */ + uint32_t di_gen; /* 80: Generation number. */ + uint32_t di_kernflags; /* 84: Kernel flags. */ + uint32_t di_flags; /* 88: Status flags (chflags). */ + uint32_t di_extsize; /* 92: External attributes size. */ ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */ ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */ @@ -178,11 +178,11 @@ int32_t di_ctimensec; /* 36: Last inode change time. */ ufs1_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */ ufs1_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */ - u_int32_t di_flags; /* 100: Status flags (chflags). */ - u_int32_t di_blocks; /* 104: Blocks actually held. */ - u_int32_t di_gen; /* 108: Generation number. */ - u_int32_t di_uid; /* 112: File owner. */ - u_int32_t di_gid; /* 116: File group. */ + uint32_t di_flags; /* 100: Status flags (chflags). */ + uint32_t di_blocks; /* 104: Blocks actually held. */ + uint32_t di_gen; /* 108: Generation number. */ + uint32_t di_uid; /* 112: File owner. */ + uint32_t di_gid; /* 116: File group. */ u_int64_t di_modrev; /* 120: i_modrev for NFSv4 */ }; diff --git a/src/include.new/ufs/ufs/dir.h b/src/include.new/ufs/ufs/dir.h index 30deee5..35484bb 100644 --- a/src/include.new/ufs/ufs/dir.h +++ b/src/include.new/ufs/ufs/dir.h @@ -75,7 +75,7 @@ #define MAXNAMLEN 255 struct direct { - u_int32_t d_ino; /* inode number of entry */ + uint32_t d_ino; /* inode number of entry */ u_int16_t d_reclen; /* length of this record */ u_int8_t d_type; /* file type, see below */ u_int8_t d_namlen; /* length of string in d_name */ @@ -127,12 +127,12 @@ * but the name field is MAXNAMLEN - 1, and this just won't do. */ struct dirtemplate { - u_int32_t dot_ino; + uint32_t dot_ino; int16_t dot_reclen; u_int8_t dot_type; u_int8_t dot_namlen; char dot_name[4]; /* must be multiple of 4 */ - u_int32_t dotdot_ino; + uint32_t dotdot_ino; int16_t dotdot_reclen; u_int8_t dotdot_type; u_int8_t dotdot_namlen; @@ -143,11 +143,11 @@ * This is the old format of directories, sanz type element. */ struct odirtemplate { - u_int32_t dot_ino; + uint32_t dot_ino; int16_t dot_reclen; u_int16_t dot_namlen; char dot_name[4]; /* must be multiple of 4 */ - u_int32_t dotdot_ino; + uint32_t dotdot_ino; int16_t dotdot_reclen; u_int16_t dotdot_namlen; char dotdot_name[4]; /* ditto */ diff --git a/src/include.new/ufs/ufs/extattr.h b/src/include.new/ufs/ufs/extattr.h index 15df944..358e17a 100644 --- a/src/include.new/ufs/ufs/extattr.h +++ b/src/include.new/ufs/ufs/extattr.h @@ -65,7 +65,7 @@ struct ufs_extattr_header { u_int ueh_flags; /* flags for attribute */ u_int ueh_len; /* local defined length; <= uef_size */ - u_int32_t ueh_i_gen; /* generation number for sanity */ + uint32_t ueh_i_gen; /* generation number for sanity */ /* data follows the header */ }; diff --git a/src/include.new/ufs/ufs/inode.h b/src/include.new/ufs/ufs/inode.h index 10afb10..a21f317 100644 --- a/src/include.new/ufs/ufs/inode.h +++ b/src/include.new/ufs/ufs/inode.h @@ -67,7 +67,7 @@ TAILQ_ENTRY(inode) i_nextsnap; /* snapshot file list. */ struct vnode *i_vnode;/* Vnode associated with this inode. */ struct ufsmount *i_ump;/* Ufsmount point associated with this inode. */ - u_int32_t i_flag; /* flags, see below */ + uint32_t i_flag; /* flags, see below */ struct cdev *i_dev; /* Device associated with the inode. */ ino_t i_number; /* The identity of the inode. */ int i_effnlink; /* i_nlink when I/O completes */ @@ -103,10 +103,10 @@ u_int16_t i_mode; /* IFMT, permissions; see below. */ int16_t i_nlink; /* File link count. */ u_int64_t i_size; /* File byte count. */ - u_int32_t i_flags; /* Status flags (chflags). */ + uint32_t i_flags; /* Status flags (chflags). */ u_int64_t i_gen; /* Generation number. */ - u_int32_t i_uid; /* File owner. */ - u_int32_t i_gid; /* File group. */ + uint32_t i_uid; /* File owner. */ + uint32_t i_gid; /* File group. */ /* * The real copy of the on-disk inode. */ diff --git a/src/include.new/ufs/ufs/quota.h b/src/include.new/ufs/ufs/quota.h index 3ff7e20..0f207d5 100644 --- a/src/include.new/ufs/ufs/quota.h +++ b/src/include.new/ufs/ufs/quota.h @@ -98,12 +98,12 @@ * structure). */ struct dqblk32 { - u_int32_t dqb_bhardlimit; /* absolute limit on disk blks alloc */ - u_int32_t dqb_bsoftlimit; /* preferred limit on disk blks */ - u_int32_t dqb_curblocks; /* current block count */ - u_int32_t dqb_ihardlimit; /* maximum # allocated inodes + 1 */ - u_int32_t dqb_isoftlimit; /* preferred inode limit */ - u_int32_t dqb_curinodes; /* current # allocated inodes */ + uint32_t dqb_bhardlimit; /* absolute limit on disk blks alloc */ + uint32_t dqb_bsoftlimit; /* preferred limit on disk blks */ + uint32_t dqb_curblocks; /* current block count */ + uint32_t dqb_ihardlimit; /* maximum # allocated inodes + 1 */ + uint32_t dqb_isoftlimit; /* preferred inode limit */ + uint32_t dqb_curinodes; /* current # allocated inodes */ int32_t dqb_btime; /* time limit for excessive disk use */ int32_t dqb_itime; /* time limit for excessive files */ }; @@ -149,8 +149,8 @@ struct mtx dq_lock; /* lock for concurrency */ u_int16_t dq_flags; /* flags, see below */ u_int16_t dq_type; /* quota type of this dquot */ - u_int32_t dq_cnt; /* (h) count of active references */ - u_int32_t dq_id; /* identifier this applies to */ + uint32_t dq_cnt; /* (h) count of active references */ + uint32_t dq_id; /* identifier this applies to */ struct ufsmount *dq_ump; /* (h) filesystem that this is taken from */ struct dqblk64 dq_dqb; /* actual usage & quotas */ diff --git a/src/include.new/x86/apicreg.h b/src/include.new/x86/apicreg.h index 91508cb..282aeb6 100644 --- a/src/include.new/x86/apicreg.h +++ b/src/include.new/x86/apicreg.h @@ -127,67 +127,67 @@ struct LAPIC { /* reserved */ PAD4; /* reserved */ PAD4; - u_int32_t id; PAD3; - u_int32_t version; PAD3; + uint32_t id; PAD3; + uint32_t version; PAD3; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; - u_int32_t tpr; PAD3; - u_int32_t apr; PAD3; - u_int32_t ppr; PAD3; - u_int32_t eoi; PAD3; + uint32_t tpr; PAD3; + uint32_t apr; PAD3; + uint32_t ppr; PAD3; + uint32_t eoi; PAD3; /* reserved */ PAD4; - u_int32_t ldr; PAD3; - u_int32_t dfr; PAD3; - u_int32_t svr; PAD3; - u_int32_t isr0; PAD3; - u_int32_t isr1; PAD3; - u_int32_t isr2; PAD3; - u_int32_t isr3; PAD3; - u_int32_t isr4; PAD3; - u_int32_t isr5; PAD3; - u_int32_t isr6; PAD3; - u_int32_t isr7; PAD3; - u_int32_t tmr0; PAD3; - u_int32_t tmr1; PAD3; - u_int32_t tmr2; PAD3; - u_int32_t tmr3; PAD3; - u_int32_t tmr4; PAD3; - u_int32_t tmr5; PAD3; - u_int32_t tmr6; PAD3; - u_int32_t tmr7; PAD3; - u_int32_t irr0; PAD3; - u_int32_t irr1; PAD3; - u_int32_t irr2; PAD3; - u_int32_t irr3; PAD3; - u_int32_t irr4; PAD3; - u_int32_t irr5; PAD3; - u_int32_t irr6; PAD3; - u_int32_t irr7; PAD3; - u_int32_t esr; PAD3; + uint32_t ldr; PAD3; + uint32_t dfr; PAD3; + uint32_t svr; PAD3; + uint32_t isr0; PAD3; + uint32_t isr1; PAD3; + uint32_t isr2; PAD3; + uint32_t isr3; PAD3; + uint32_t isr4; PAD3; + uint32_t isr5; PAD3; + uint32_t isr6; PAD3; + uint32_t isr7; PAD3; + uint32_t tmr0; PAD3; + uint32_t tmr1; PAD3; + uint32_t tmr2; PAD3; + uint32_t tmr3; PAD3; + uint32_t tmr4; PAD3; + uint32_t tmr5; PAD3; + uint32_t tmr6; PAD3; + uint32_t tmr7; PAD3; + uint32_t irr0; PAD3; + uint32_t irr1; PAD3; + uint32_t irr2; PAD3; + uint32_t irr3; PAD3; + uint32_t irr4; PAD3; + uint32_t irr5; PAD3; + uint32_t irr6; PAD3; + uint32_t irr7; PAD3; + uint32_t esr; PAD3; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; - u_int32_t lvt_cmci; PAD3; - u_int32_t icr_lo; PAD3; - u_int32_t icr_hi; PAD3; - u_int32_t lvt_timer; PAD3; - u_int32_t lvt_thermal; PAD3; - u_int32_t lvt_pcint; PAD3; - u_int32_t lvt_lint0; PAD3; - u_int32_t lvt_lint1; PAD3; - u_int32_t lvt_error; PAD3; - u_int32_t icr_timer; PAD3; - u_int32_t ccr_timer; PAD3; + uint32_t lvt_cmci; PAD3; + uint32_t icr_lo; PAD3; + uint32_t icr_hi; PAD3; + uint32_t lvt_timer; PAD3; + uint32_t lvt_thermal; PAD3; + uint32_t lvt_pcint; PAD3; + uint32_t lvt_lint0; PAD3; + uint32_t lvt_lint1; PAD3; + uint32_t lvt_error; PAD3; + uint32_t icr_timer; PAD3; + uint32_t ccr_timer; PAD3; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; /* reserved */ PAD4; - u_int32_t dcr_timer; PAD3; + uint32_t dcr_timer; PAD3; /* reserved */ PAD4; }; @@ -198,8 +198,8 @@ */ struct IOAPIC { - u_int32_t ioregsel; PAD3; - u_int32_t iowin; PAD3; + uint32_t ioregsel; PAD3; + uint32_t iowin; PAD3; }; typedef struct IOAPIC ioapic_t; diff --git a/src/include.new/x86/bus.h b/src/include.new/x86/bus.h index 3c86048..84b3550 100644 --- a/src/include.new/x86/bus.h +++ b/src/include.new/x86/bus.h @@ -211,7 +211,7 @@ bus_space_handle_t handle, bus_size_t offset); -static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag, +static __inline uint32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset); @@ -241,14 +241,14 @@ return (*(volatile u_int16_t *)(handle + offset)); } -static __inline u_int32_t +static __inline uint32_t bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle, bus_size_t offset) { if (tag == X86_BUS_SPACE_IO) return (inl(handle + offset)); - return (*(volatile u_int32_t *)(handle + offset)); + return (*(volatile uint32_t *)(handle + offset)); } #ifdef __amd64__ @@ -279,7 +279,7 @@ static __inline void bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, + bus_size_t offset, uint32_t *addr, size_t count); static __inline void @@ -326,7 +326,7 @@ static __inline void bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) + bus_size_t offset, uint32_t *addr, size_t count) { if (tag == X86_BUS_SPACE_IO) @@ -366,7 +366,7 @@ static __inline void bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, + bus_size_t offset, uint32_t *addr, size_t count); @@ -436,7 +436,7 @@ static __inline void bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t *addr, size_t count) + bus_size_t offset, uint32_t *addr, size_t count) { if (tag == X86_BUS_SPACE_IO) { @@ -485,7 +485,7 @@ static __inline void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value); + bus_size_t offset, uint32_t value); #ifdef __amd64__ static __inline void bus_space_write_8(bus_space_tag_t tag, @@ -517,13 +517,13 @@ static __inline void bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value) + bus_size_t offset, uint32_t value) { if (tag == X86_BUS_SPACE_IO) outl(bsh + offset, value); else - *(volatile u_int32_t *)(bsh + offset) = value; + *(volatile uint32_t *)(bsh + offset) = value; } #ifdef __amd64__ @@ -558,7 +558,7 @@ static __inline void bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, - const u_int32_t *addr, + const uint32_t *addr, size_t count); static __inline void @@ -605,7 +605,7 @@ static __inline void bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int32_t *addr, size_t count) + bus_size_t offset, const uint32_t *addr, size_t count) { if (tag == X86_BUS_SPACE_IO) @@ -647,7 +647,7 @@ static __inline void bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, - const u_int32_t *addr, + const uint32_t *addr, size_t count); static __inline void @@ -716,7 +716,7 @@ static __inline void bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, const u_int32_t *addr, size_t count) + bus_size_t offset, const uint32_t *addr, size_t count) { if (tag == X86_BUS_SPACE_IO) { @@ -767,7 +767,7 @@ static __inline void bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, bus_size_t offset, - u_int32_t value, size_t count); + uint32_t value, size_t count); static __inline void bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh, @@ -799,7 +799,7 @@ static __inline void bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, size_t count) + bus_size_t offset, uint32_t value, size_t count) { bus_space_handle_t addr = bsh + offset; @@ -808,7 +808,7 @@ outl(addr, value); else while (count--) - *(volatile u_int32_t *)(addr) = value; + *(volatile uint32_t *)(addr) = value; } #if 0 /* Cause a link error for bus_space_set_multi_8 */ @@ -830,7 +830,7 @@ size_t count); static __inline void bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, + bus_size_t offset, uint32_t value, size_t count); static __inline void @@ -863,7 +863,7 @@ static __inline void bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh, - bus_size_t offset, u_int32_t value, size_t count) + bus_size_t offset, uint32_t value, size_t count) { bus_space_handle_t addr = bsh + offset; @@ -872,7 +872,7 @@ outl(addr, value); else for (; count != 0; count--, addr += 4) - *(volatile u_int32_t *)(addr) = value; + *(volatile uint32_t *)(addr) = value; } #if 0 /* Cause a link error for bus_space_set_region_8 */ @@ -995,14 +995,14 @@ if (addr1 >= addr2) { /* src after dest: copy forward */ for (; count != 0; count--, addr1 += 4, addr2 += 4) - *(volatile u_int32_t *)(addr2) = - *(volatile u_int32_t *)(addr1); + *(volatile uint32_t *)(addr2) = + *(volatile uint32_t *)(addr1); } else { /* dest after src: copy backwards */ for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1); count != 0; count--, addr1 -= 4, addr2 -= 4) - *(volatile u_int32_t *)(addr2) = - *(volatile u_int32_t *)(addr1); + *(volatile uint32_t *)(addr2) = + *(volatile uint32_t *)(addr1); } } } diff --git a/src/include.new/x86/mptable.h b/src/include.new/x86/mptable.h index a453615..9b77776 100644 --- a/src/include.new/x86/mptable.h +++ b/src/include.new/x86/mptable.h @@ -41,7 +41,7 @@ /* MP Floating Pointer Structure */ typedef struct MPFPS { char signature[4]; - u_int32_t pap; + uint32_t pap; u_char length; u_char spec_rev; u_char checksum; @@ -63,10 +63,10 @@ u_char checksum; u_char oem_id[8]; u_char product_id[12]; - u_int32_t oem_table_pointer; + uint32_t oem_table_pointer; u_short oem_table_size; u_short entry_count; - u_int32_t apic_address; + uint32_t apic_address; u_short extended_table_length; u_char extended_table_checksum; u_char reserved; @@ -85,10 +85,10 @@ u_char apic_id; u_char apic_version; u_char cpu_flags; - u_int32_t cpu_signature; - u_int32_t feature_flags; - u_int32_t reserved1; - u_int32_t reserved2; + uint32_t cpu_signature; + uint32_t feature_flags; + uint32_t reserved1; + uint32_t reserved2; } *proc_entry_ptr; #define PROCENTRY_FLAG_EN 0x01 @@ -105,7 +105,7 @@ u_char apic_id; u_char apic_version; u_char apic_flags; - u_int32_t apic_address; + uint32_t apic_address; } *io_apic_entry_ptr; #define IOAPICENTRY_FLAG_EN 0x01 diff --git a/src/include.new/x86/pci_cfgreg.h b/src/include.new/x86/pci_cfgreg.h index 64384ea..06c8e52 100644 --- a/src/include.new/x86/pci_cfgreg.h +++ b/src/include.new/x86/pci_cfgreg.h @@ -49,8 +49,8 @@ u_long hostb_alloc_start(int type, u_long start, u_long end, u_long count); int pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus); int pci_cfgregopen(void); -u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); -void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); +uint32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); +void pci_cfgregwrite(int bus, int slot, int func, int reg, uint32_t data, int bytes); #ifdef __HAVE_PIR void pci_pir_open(void); int pci_pir_probe(int bus, int require_parse); diff --git a/src/lib/libc/db/btree/bt_conv.c b/src/lib/libc/db/btree/bt_conv.c index 7496a3c..86d6b2c 100644 --- a/src/lib/libc/db/btree/bt_conv.c +++ b/src/lib/libc/db/btree/bt_conv.c @@ -91,7 +91,7 @@ M_16_SWAP(h->linp[i]); p = (char *)GETBINTERNAL(h, i); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); p += sizeof(pgno_t); if (*(u_char *)p & P_BIGKEY) { @@ -106,9 +106,9 @@ M_16_SWAP(h->linp[i]); p = (char *)GETBLEAF(h, i); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); flags = *(u_char *)p; if (flags & (P_BIGKEY | P_BIGDATA)) { p += sizeof(u_char); @@ -118,7 +118,7 @@ P_32_SWAP(p); } if (flags & P_BIGDATA) { - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); p += sizeof(pgno_t); P_32_SWAP(p); @@ -151,7 +151,7 @@ for (i = 0; i < top; i++) { p = (char *)GETBINTERNAL(h, i); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); p += sizeof(pgno_t); if (*(u_char *)p & P_BIGKEY) { @@ -166,9 +166,9 @@ for (i = 0; i < top; i++) { p = (char *)GETBLEAF(h, i); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); flags = *(u_char *)p; if (flags & (P_BIGKEY | P_BIGDATA)) { p += sizeof(u_char); @@ -178,7 +178,7 @@ P_32_SWAP(p); } if (flags & P_BIGDATA) { - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); p += sizeof(pgno_t); P_32_SWAP(p); @@ -209,15 +209,15 @@ p = (char *)pg; P_32_SWAP(p); /* magic */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* version */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* psize */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* free */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* nrecs */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* flags */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); } diff --git a/src/lib/libc/db/btree/bt_debug.c b/src/lib/libc/db/btree/bt_debug.c index bd95774..ffda6d9 100644 --- a/src/lib/libc/db/btree/bt_debug.c +++ b/src/lib/libc/db/btree/bt_debug.c @@ -214,7 +214,7 @@ (void)fprintf(stderr, "big key page %u size %u/", *(pgno_t *)bl->bytes, - *(u_int32_t *)(bl->bytes + sizeof(pgno_t))); + *(uint32_t *)(bl->bytes + sizeof(pgno_t))); else if (bl->ksize) (void)fprintf(stderr, "%.*s/", bl->ksize, bl->bytes); @@ -222,7 +222,7 @@ (void)fprintf(stderr, "big data page %u size %u", *(pgno_t *)(bl->bytes + bl->ksize), - *(u_int32_t *)(bl->bytes + bl->ksize + + *(uint32_t *)(bl->bytes + bl->ksize + sizeof(pgno_t))); else if (bl->dsize) (void)fprintf(stderr, "%.*s", @@ -234,7 +234,7 @@ (void)fprintf(stderr, "big data page %u size %u", *(pgno_t *)rl->bytes, - *(u_int32_t *)(rl->bytes + sizeof(pgno_t))); + *(uint32_t *)(rl->bytes + sizeof(pgno_t))); else if (rl->dsize) (void)fprintf(stderr, "%.*s", (int)rl->dsize, rl->bytes); diff --git a/src/lib/libc/db/btree/bt_delete.c b/src/lib/libc/db/btree/bt_delete.c index 6204464..08d0d86 100644 --- a/src/lib/libc/db/btree/bt_delete.c +++ b/src/lib/libc/db/btree/bt_delete.c @@ -385,7 +385,7 @@ PAGE *pg; EPGNO *parent; indx_t cnt, index, *ip, offset; - u_int32_t nksize; + uint32_t nksize; char *from; /* @@ -481,7 +481,7 @@ { BLEAF *bl; indx_t cnt, *ip, offset; - u_int32_t nbytes; + uint32_t nbytes; void *to; char *from; diff --git a/src/lib/libc/db/btree/bt_open.c b/src/lib/libc/db/btree/bt_open.c index c8a103a..385be9e 100644 --- a/src/lib/libc/db/btree/bt_open.c +++ b/src/lib/libc/db/btree/bt_open.c @@ -411,7 +411,7 @@ static int byteorder() { - u_int32_t x; + uint32_t x; u_char *p; x = 0x01020304; diff --git a/src/lib/libc/db/btree/bt_overflow.c b/src/lib/libc/db/btree/bt_overflow.c index 5e0f1ae..71abaa2 100644 --- a/src/lib/libc/db/btree/bt_overflow.c +++ b/src/lib/libc/db/btree/bt_overflow.c @@ -71,7 +71,7 @@ * * Parameters: * t: tree - * p: pointer to { pgno_t, u_int32_t } + * p: pointer to { pgno_t, uint32_t } * buf: storage address * bufsz: storage size * @@ -89,10 +89,10 @@ PAGE *h; pgno_t pg; size_t nb, plen; - u_int32_t sz; + uint32_t sz; memmove(&pg, p, sizeof(pgno_t)); - memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(u_int32_t)); + memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t)); *ssz = sz; #ifdef DEBUG @@ -147,7 +147,7 @@ void *p; pgno_t npg; size_t nb, plen; - u_int32_t sz; + uint32_t sz; /* * Allocate pages and copy the key/data record into them. Store the @@ -186,7 +186,7 @@ * * Parameters: * t: tree - * p: pointer to { pgno_t, u_int32_t } + * p: pointer to { pgno_t, uint32_t } * * Returns: * RET_ERROR, RET_SUCCESS @@ -199,10 +199,10 @@ PAGE *h; pgno_t pg; size_t plen; - u_int32_t sz; + uint32_t sz; memmove(&pg, p, sizeof(pgno_t)); - memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(u_int32_t)); + memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t)); #ifdef DEBUG if (pg == P_INVALID || sz == 0) diff --git a/src/lib/libc/db/btree/bt_put.c b/src/lib/libc/db/btree/bt_put.c index 0dca165..a2b0b16 100644 --- a/src/lib/libc/db/btree/bt_put.c +++ b/src/lib/libc/db/btree/bt_put.c @@ -78,7 +78,7 @@ PAGE *h; indx_t index, nxtindex; pgno_t pg; - u_int32_t nbytes, tmp; + uint32_t nbytes, tmp; int dflags, exact, status; char *dest, db[NOVFLSIZE], kb[NOVFLSIZE]; @@ -133,7 +133,7 @@ memmove(kb, &pg, sizeof(pgno_t)); tmp = key->size; memmove(kb + sizeof(pgno_t), - &tmp, sizeof(u_int32_t)); + &tmp, sizeof(uint32_t)); dflags |= P_BIGKEY; key = &tkey; } @@ -145,7 +145,7 @@ memmove(db, &pg, sizeof(pgno_t)); tmp = data->size; memmove(db + sizeof(pgno_t), - &tmp, sizeof(u_int32_t)); + &tmp, sizeof(uint32_t)); dflags |= P_BIGDATA; data = &tdata; } @@ -274,7 +274,7 @@ int *exactp; { PAGE *h; - u_int32_t nbytes; + uint32_t nbytes; int cmp; if ((h = mpool_get(t->bt_mp, t->bt_last.pgno, 0)) == NULL) { diff --git a/src/lib/libc/db/btree/bt_split.c b/src/lib/libc/db/btree/bt_split.c index 07373de..6c767ee 100644 --- a/src/lib/libc/db/btree/bt_split.c +++ b/src/lib/libc/db/btree/bt_split.c @@ -84,7 +84,7 @@ const DBT *key, *data; int flags; size_t ilen; - u_int32_t argskip; + uint32_t argskip; { BINTERNAL *bi; BLEAF *bl, *tbl; @@ -93,7 +93,7 @@ PAGE *h, *l, *r, *lchild, *rchild; indx_t nxtindex; u_int16_t skip; - u_int32_t n, nbytes, nksize; + uint32_t n, nbytes, nksize; int parentsplit; char *dest; @@ -538,7 +538,7 @@ { BINTERNAL *bi; BLEAF *bl; - u_int32_t nbytes; + uint32_t nbytes; char *dest; /* @@ -622,7 +622,7 @@ PAGE *rval; void *src; indx_t full, half, nxt, off, skip, top, used; - u_int32_t nbytes; + uint32_t nbytes; int bigkeycnt, isbigkey; /* diff --git a/src/lib/libc/db/btree/btree.h b/src/lib/libc/db/btree/btree.h index d5adeb7..1891842 100644 --- a/src/lib/libc/db/btree/btree.h +++ b/src/lib/libc/db/btree/btree.h @@ -77,7 +77,7 @@ #define P_RLEAF 0x10 /* leaf page */ #define P_TYPE 0x1f /* type mask */ #define P_PRESERVE 0x20 /* never delete this chain of pages */ - u_int32_t flags; + uint32_t flags; indx_t lower; /* lower bound of free space on page */ indx_t upper; /* upper bound of free space on page */ @@ -87,7 +87,7 @@ /* First and next index. */ #define BTDATAOFF \ (sizeof(pgno_t) + sizeof(pgno_t) + sizeof(pgno_t) + \ - sizeof(u_int32_t) + sizeof(indx_t) + sizeof(indx_t)) + sizeof(uint32_t) + sizeof(indx_t) + sizeof(indx_t)) #define NEXTINDEX(p) (((p)->lower - BTDATAOFF) / sizeof(indx_t)) /* @@ -107,7 +107,7 @@ * manipulated on this system.) */ #define LALIGN(n) (((n) + sizeof(pgno_t) - 1) & ~(sizeof(pgno_t) - 1)) -#define NOVFLSIZE (sizeof(pgno_t) + sizeof(u_int32_t)) +#define NOVFLSIZE (sizeof(pgno_t) + sizeof(uint32_t)) /* * For the btree internal pages, the item is a key. BINTERNALs are {key, pgno} @@ -119,7 +119,7 @@ * some minor modifications of the above rule. */ typedef struct _binternal { - u_int32_t ksize; /* key size */ + uint32_t ksize; /* key size */ pgno_t pgno; /* page number stored on */ #define P_BIGDATA 0x01 /* overflow data */ #define P_BIGKEY 0x02 /* overflow key */ @@ -133,12 +133,12 @@ /* Get the number of bytes in the entry. */ #define NBINTERNAL(len) \ - LALIGN(sizeof(u_int32_t) + sizeof(pgno_t) + sizeof(u_char) + (len)) + LALIGN(sizeof(uint32_t) + sizeof(pgno_t) + sizeof(u_char) + (len)) /* Copy a BINTERNAL entry to the page. */ #define WR_BINTERNAL(p, size, pgno, flags) { \ - *(u_int32_t *)p = size; \ - p += sizeof(u_int32_t); \ + *(uint32_t *)p = size; \ + p += sizeof(uint32_t); \ *(pgno_t *)p = pgno; \ p += sizeof(pgno_t); \ *(u_char *)p = flags; \ @@ -171,8 +171,8 @@ /* For the btree leaf pages, the item is a key and data pair. */ typedef struct _bleaf { - u_int32_t ksize; /* size of key */ - u_int32_t dsize; /* size of data */ + uint32_t ksize; /* size of key */ + uint32_t dsize; /* size of data */ u_char flags; /* P_BIGDATA, P_BIGKEY */ char bytes[1]; /* data */ } BLEAF; @@ -186,15 +186,15 @@ /* Get the number of bytes in the user's key/data pair. */ #define NBLEAFDBT(ksize, dsize) \ - LALIGN(sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(u_char) + \ + LALIGN(sizeof(uint32_t) + sizeof(uint32_t) + sizeof(u_char) + \ (ksize) + (dsize)) /* Copy a BLEAF entry to the page. */ #define WR_BLEAF(p, key, data, flags) { \ - *(u_int32_t *)p = key->size; \ - p += sizeof(u_int32_t); \ - *(u_int32_t *)p = data->size; \ - p += sizeof(u_int32_t); \ + *(uint32_t *)p = key->size; \ + p += sizeof(uint32_t); \ + *(uint32_t *)p = data->size; \ + p += sizeof(uint32_t); \ *(u_char *)p = flags; \ p += sizeof(u_char); \ memmove(p, key->data, key->size); \ @@ -204,7 +204,7 @@ /* For the recno leaf pages, the item is a data entry. */ typedef struct _rleaf { - u_int32_t dsize; /* size of data */ + uint32_t dsize; /* size of data */ u_char flags; /* P_BIGDATA */ char bytes[1]; } RLEAF; @@ -218,12 +218,12 @@ /* Get the number of bytes from the user's data. */ #define NRLEAFDBT(dsize) \ - LALIGN(sizeof(u_int32_t) + sizeof(u_char) + (dsize)) + LALIGN(sizeof(uint32_t) + sizeof(u_char) + (dsize)) /* Copy a RLEAF entry to the page. */ #define WR_RLEAF(p, data, flags) { \ - *(u_int32_t *)p = data->size; \ - p += sizeof(u_int32_t); \ + *(uint32_t *)p = data->size; \ + p += sizeof(uint32_t); \ *(u_char *)p = flags; \ p += sizeof(u_char); \ memmove(p, data->data, data->size); \ @@ -291,14 +291,14 @@ * put or delete call modify the metadata. */ typedef struct _btmeta { - u_int32_t magic; /* magic number */ - u_int32_t version; /* version */ - u_int32_t psize; /* page size */ - u_int32_t free; /* page number of first free page */ - u_int32_t nrecs; /* R: number of records */ + uint32_t magic; /* magic number */ + uint32_t version; /* version */ + uint32_t psize; /* page size */ + uint32_t free; /* page number of first free page */ + uint32_t nrecs; /* R: number of records */ #define SAVEMETA (B_NODUPS | R_RECNO) - u_int32_t flags; /* bt_flags & SAVEMETA */ + uint32_t flags; /* bt_flags & SAVEMETA */ } BTMETA; /* The in-memory btree/recno data structure. */ @@ -328,7 +328,7 @@ int bt_fd; /* tree file descriptor */ pgno_t bt_free; /* next free page */ - u_int32_t bt_psize; /* page size */ + uint32_t bt_psize; /* page size */ indx_t bt_ovflsize; /* cut-off for key/data overflow */ int bt_lorder; /* byte order */ /* sorted order */ @@ -378,7 +378,7 @@ #define B_DB_LOCK 0x04000 /* DB_LOCK specified. */ #define B_DB_SHMEM 0x08000 /* DB_SHMEM specified. */ #define B_DB_TXN 0x10000 /* DB_TXN specified. */ - u_int32_t flags; + uint32_t flags; } BTREE; #include "extern.h" diff --git a/src/lib/libc/db/btree/extern.h b/src/lib/libc/db/btree/extern.h index 478f6af..e356440 100644 --- a/src/lib/libc/db/btree/extern.h +++ b/src/lib/libc/db/btree/extern.h @@ -54,7 +54,7 @@ int __bt_seq(const DB *, DBT *, DBT *, u_int); void __bt_setcur(BTREE *, pgno_t, u_int); int __bt_split(BTREE *, PAGE *, - const DBT *, const DBT *, int, size_t, u_int32_t); + const DBT *, const DBT *, int, size_t, uint32_t); int __bt_sync(const DB *, u_int); int __ovfl_delete(BTREE *, void *); diff --git a/src/lib/libc/db/hash/extern.h b/src/lib/libc/db/hash/extern.h index 2259ac0..2c23e09 100644 --- a/src/lib/libc/db/hash/extern.h +++ b/src/lib/libc/db/hash/extern.h @@ -41,25 +41,25 @@ int __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int); int __big_return(HTAB *, BUFHEAD *, int, DBT *, int); int __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, - int, u_int32_t, SPLIT_RETURN *); + int, uint32_t, SPLIT_RETURN *); int __buf_free(HTAB *, int, int); void __buf_init(HTAB *, int); -u_int32_t __call_hash(HTAB *, char *, int); +uint32_t __call_hash(HTAB *, char *, int); int __delpair(HTAB *, BUFHEAD *, int); int __expand_table(HTAB *); int __find_bigpair(HTAB *, BUFHEAD *, int, char *, int); u_int16_t __find_last_page(HTAB *, BUFHEAD **); void __free_ovflpage(HTAB *, BUFHEAD *); -BUFHEAD *__get_buf(HTAB *, u_int32_t, BUFHEAD *, int); -int __get_page(HTAB *, char *, u_int32_t, int, int, int); +BUFHEAD *__get_buf(HTAB *, uint32_t, BUFHEAD *, int); +int __get_page(HTAB *, char *, uint32_t, int, int, int); int __ibitmap(HTAB *, int, int, int); -u_int32_t __log2(u_int32_t); -int __put_page(HTAB *, char *, u_int32_t, int, int); +uint32_t __log2(uint32_t); +int __put_page(HTAB *, char *, uint32_t, int, int); void __reclaim_buf(HTAB *, BUFHEAD *); -int __split_page(HTAB *, u_int32_t, u_int32_t); +int __split_page(HTAB *, uint32_t, uint32_t); /* Default hash routine. */ -extern u_int32_t (*__default_hash)(const void *, size_t); +extern uint32_t (*__default_hash)(const void *, size_t); #ifdef HASH_STATISTICS extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows; diff --git a/src/lib/libc/db/hash/hash.c b/src/lib/libc/db/hash/hash.c index e4d40f9..fd00d4f 100644 --- a/src/lib/libc/db/hash/hash.c +++ b/src/lib/libc/db/hash/hash.c @@ -64,13 +64,13 @@ static int flush_meta(HTAB *); static int hash_access(HTAB *, ACTION, DBT *, DBT *); static int hash_close(DB *); -static int hash_delete(const DB *, const DBT *, u_int32_t); +static int hash_delete(const DB *, const DBT *, uint32_t); static int hash_fd(const DB *); -static int hash_get(const DB *, const DBT *, DBT *, u_int32_t); -static int hash_put(const DB *, DBT *, const DBT *, u_int32_t); +static int hash_get(const DB *, const DBT *, DBT *, uint32_t); +static int hash_put(const DB *, DBT *, const DBT *, uint32_t); static void *hash_realloc(SEGMENT **, int, int); -static int hash_seq(const DB *, DBT *, DBT *, u_int32_t); -static int hash_sync(const DB *, u_int32_t); +static int hash_seq(const DB *, DBT *, DBT *, uint32_t); +static int hash_sync(const DB *, uint32_t); static int hdestroy(HTAB *); static HTAB *init_hash(HTAB *, const char *, HASHINFO *); static int init_htab(HTAB *, int); @@ -190,7 +190,7 @@ (hashp->BSHIFT + BYTE_SHIFT); hashp->nmaps = bpages; - (void)memset(&hashp->mapp[0], 0, bpages * sizeof(u_int32_t *)); + (void)memset(&hashp->mapp[0], 0, bpages * sizeof(uint32_t *)); } /* Initialize Buffer Manager */ @@ -462,7 +462,7 @@ static int hash_sync(dbp, flags) const DB *dbp; - u_int32_t flags; + uint32_t flags; { HTAB *hashp; @@ -541,7 +541,7 @@ const DB *dbp; const DBT *key; DBT *data; - u_int32_t flag; + uint32_t flag; { HTAB *hashp; @@ -558,7 +558,7 @@ const DB *dbp; DBT *key; const DBT *data; - u_int32_t flag; + uint32_t flag; { HTAB *hashp; @@ -580,7 +580,7 @@ hash_delete(dbp, key, flag) const DB *dbp; const DBT *key; - u_int32_t flag; /* Ignored */ + uint32_t flag; /* Ignored */ { HTAB *hashp; @@ -732,9 +732,9 @@ hash_seq(dbp, key, data, flag) const DB *dbp; DBT *key, *data; - u_int32_t flag; + uint32_t flag; { - u_int32_t bucket; + uint32_t bucket; BUFHEAD *bufp; HTAB *hashp; u_int16_t *bp, ndx; @@ -822,7 +822,7 @@ __expand_table(hashp) HTAB *hashp; { - u_int32_t old_bucket, new_bucket; + uint32_t old_bucket, new_bucket; int dirsize, new_segnum, spare_ndx; #ifdef HASH_STATISTICS @@ -889,7 +889,7 @@ return (p); } -extern u_int32_t +extern uint32_t __call_hash(hashp, k, len) HTAB *hashp; char *k; diff --git a/src/lib/libc/db/hash/hash.h b/src/lib/libc/db/hash/hash.h index 33fefa7..76237f3 100644 --- a/src/lib/libc/db/hash/hash.h +++ b/src/lib/libc/db/hash/hash.h @@ -49,7 +49,7 @@ BUFHEAD *prev; /* LRU links */ BUFHEAD *next; /* LRU links */ BUFHEAD *ovfl; /* Overflow page buffer header */ - u_int32_t addr; /* Address of this page */ + uint32_t addr; /* Address of this page */ char *page; /* Actual page data */ char flags; #define BUF_MOD 0x0001 @@ -66,7 +66,7 @@ typedef struct hashhdr { /* Disk resident portion */ int magic; /* Magic NO for hash tables */ int version; /* Version ID */ - u_int32_t lorder; /* Byte Order */ + uint32_t lorder; /* Byte Order */ int bsize; /* Bucket/Page Size */ int bshift; /* Bucket shift */ int dsize; /* Directory Size */ @@ -95,7 +95,7 @@ int nsegs; /* Number of allocated segments */ int exsegs; /* Number of extra allocated * segments */ - u_int32_t /* Hash function */ + uint32_t /* Hash function */ (*hash)(const void *, size_t); int flags; /* Flag values */ int fp; /* File pointer */ @@ -111,7 +111,7 @@ int save_file; /* Indicates whether we need to flush * file at * exit */ - u_int32_t *mapp[NCACHED]; /* Pointers to page maps */ + uint32_t *mapp[NCACHED]; /* Pointers to page maps */ int nmaps; /* Initial number of bitmaps */ int nbufs; /* Number of buffers left to * allocate */ @@ -139,13 +139,13 @@ #define BYTE_SHIFT 3 #define INT_TO_BYTE 2 #define INT_BYTE_SHIFT 5 -#define ALL_SET ((u_int32_t)0xFFFFFFFF) +#define ALL_SET ((uint32_t)0xFFFFFFFF) #define ALL_CLEAR 0 #define PTROF(X) ((BUFHEAD *)((ptrdiff_t)(X)&~0x3)) -#define ISMOD(X) ((u_int32_t)(ptrdiff_t)(X)&0x1) +#define ISMOD(X) ((uint32_t)(ptrdiff_t)(X)&0x1) #define DOMOD(X) ((X) = (char *)((ptrdiff_t)(X)|0x1)) -#define ISDISK(X) ((u_int32_t)(ptrdiff_t)(X)&0x2) +#define ISDISK(X) ((uint32_t)(ptrdiff_t)(X)&0x2) #define DODISK(X) ((X) = (char *)((ptrdiff_t)(X)|0x2)) #define BITS_PER_MAP 32 @@ -166,9 +166,9 @@ #define SPLITSHIFT 11 #define SPLITMASK 0x7FF -#define SPLITNUM(N) (((u_int32_t)(N)) >> SPLITSHIFT) +#define SPLITNUM(N) (((uint32_t)(N)) >> SPLITSHIFT) #define OPAGENUM(N) ((N) & SPLITMASK) -#define OADDR_OF(S,O) ((u_int32_t)((u_int32_t)(S) << SPLITSHIFT) + (O)) +#define OADDR_OF(S,O) ((uint32_t)((uint32_t)(S) << SPLITSHIFT) + (O)) #define BUCKET_TO_PAGE(B) \ (B) + hashp->HDRPAGES + ((B) ? hashp->SPARES[__log2((B)+1)-1] : 0) diff --git a/src/lib/libc/db/hash/hash_bigkey.c b/src/lib/libc/db/hash/hash_bigkey.c index 487df5b..64b3e33 100644 --- a/src/lib/libc/db/hash/hash_bigkey.c +++ b/src/lib/libc/db/hash/hash_bigkey.c @@ -576,14 +576,14 @@ /* Pointer to first page containing the big key/data */ BUFHEAD *big_keyp; int addr; /* Address of big_keyp */ - u_int32_t obucket;/* Old Bucket */ + uint32_t obucket;/* Old Bucket */ SPLIT_RETURN *ret; { BUFHEAD *tmpp; u_int16_t *tp; BUFHEAD *bp; DBT key, val; - u_int32_t change; + uint32_t change; u_int16_t free_space, n, off; bp = big_keyp; diff --git a/src/lib/libc/db/hash/hash_buf.c b/src/lib/libc/db/hash/hash_buf.c index 2a81cb6..5908723 100644 --- a/src/lib/libc/db/hash/hash_buf.c +++ b/src/lib/libc/db/hash/hash_buf.c @@ -71,7 +71,7 @@ #include "page.h" #include "extern.h" -static BUFHEAD *newbuf(HTAB *, u_int32_t, BUFHEAD *); +static BUFHEAD *newbuf(HTAB *, uint32_t, BUFHEAD *); /* Unlink B from its place in the lru */ #define BUF_REMOVE(B) { \ @@ -105,12 +105,12 @@ extern BUFHEAD * __get_buf(hashp, addr, prev_bp, newpage) HTAB *hashp; - u_int32_t addr; + uint32_t addr; BUFHEAD *prev_bp; int newpage; /* If prev_bp set, indicates a new overflow page. */ { BUFHEAD *bp; - u_int32_t is_disk_mask; + uint32_t is_disk_mask; int is_disk, segment_ndx; SEGMENT segp; @@ -160,7 +160,7 @@ static BUFHEAD * newbuf(hashp, addr, prev_bp) HTAB *hashp; - u_int32_t addr; + uint32_t addr; BUFHEAD *prev_bp; { BUFHEAD *bp; /* The buffer we're going to use */ diff --git a/src/lib/libc/db/hash/hash_func.c b/src/lib/libc/db/hash/hash_func.c index d46d620..afa66a0 100644 --- a/src/lib/libc/db/hash/hash_func.c +++ b/src/lib/libc/db/hash/hash_func.c @@ -47,13 +47,13 @@ #include "page.h" #include "extern.h" -static u_int32_t hash1(const void *, size_t) __unused; -static u_int32_t hash2(const void *, size_t) __unused; -static u_int32_t hash3(const void *, size_t) __unused; -static u_int32_t hash4(const void *, size_t); +static uint32_t hash1(const void *, size_t) __unused; +static uint32_t hash2(const void *, size_t) __unused; +static uint32_t hash3(const void *, size_t) __unused; +static uint32_t hash4(const void *, size_t); /* Global default hash function */ -u_int32_t (*__default_hash)(const void *, size_t) = hash4; +uint32_t (*__default_hash)(const void *, size_t) = hash4; /* * HASH FUNCTIONS @@ -67,13 +67,13 @@ #define PRIME1 37 #define PRIME2 1048583 -static u_int32_t +static uint32_t hash1(keyarg, len) const void *keyarg; size_t len; { const u_char *key; - u_int32_t h; + uint32_t h; /* Convert string to integer */ for (key = keyarg, h = 0; len--;) @@ -87,13 +87,13 @@ */ #define dcharhash(h, c) ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c)) -static u_int32_t +static uint32_t hash2(keyarg, len) const void *keyarg; size_t len; { const u_char *e, *key; - u_int32_t h; + uint32_t h; u_char c; key = keyarg; @@ -116,14 +116,14 @@ * * OZ's original sdbm hash */ -static u_int32_t +static uint32_t hash3(keyarg, len) const void *keyarg; size_t len; { const u_char *key; size_t loop; - u_int32_t h; + uint32_t h; #define HASHC h = *key++ + 65599 * h @@ -164,14 +164,14 @@ } /* Hash function from Chris Torek. */ -static u_int32_t +static uint32_t hash4(keyarg, len) const void *keyarg; size_t len; { const u_char *key; size_t loop; - u_int32_t h; + uint32_t h; #define HASH4a h = (h << 5) - h + *key++; #define HASH4b h = (h << 5) + h + *key++; diff --git a/src/lib/libc/db/hash/hash_log2.c b/src/lib/libc/db/hash/hash_log2.c index 827dbef..88f307e 100644 --- a/src/lib/libc/db/hash/hash_log2.c +++ b/src/lib/libc/db/hash/hash_log2.c @@ -44,11 +44,11 @@ #include -u_int32_t +uint32_t __log2(num) - u_int32_t num; + uint32_t num; { - u_int32_t i, limit; + uint32_t i, limit; limit = 1; for (i = 0; limit < num; limit = limit << 1, i++); diff --git a/src/lib/libc/db/hash/hash_page.c b/src/lib/libc/db/hash/hash_page.c index 8c4b0b5..c98d82a 100644 --- a/src/lib/libc/db/hash/hash_page.c +++ b/src/lib/libc/db/hash/hash_page.c @@ -76,14 +76,14 @@ #include "page.h" #include "extern.h" -static u_int32_t *fetch_bitmap(HTAB *, int); -static u_int32_t first_free(u_int32_t); +static uint32_t *fetch_bitmap(HTAB *, int); +static uint32_t first_free(uint32_t); static int open_temp(HTAB *); static u_int16_t overflow_page(HTAB *); static void putpair(char *, const DBT *, const DBT *); static void squeeze_key(u_int16_t *, const DBT *, const DBT *); static int ugly_split -(HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int); +(HTAB *, uint32_t, BUFHEAD *, BUFHEAD *, int, int); #define PAGE_INIT(P) { \ ((u_int16_t *)(P))[0] = 0; \ @@ -184,7 +184,7 @@ extern int __split_page(hashp, obucket, nbucket) HTAB *hashp; - u_int32_t obucket, nbucket; + uint32_t obucket, nbucket; { BUFHEAD *new_bufp, *old_bufp; u_int16_t *ino; @@ -280,7 +280,7 @@ static int ugly_split(hashp, obucket, old_bufp, new_bufp, copyto, moved) HTAB *hashp; - u_int32_t obucket; /* Same as __split_page. */ + uint32_t obucket; /* Same as __split_page. */ BUFHEAD *old_bufp, *new_bufp; int copyto; /* First byte on page which contains key/data values. */ int moved; /* Number of pairs moved to new page. */ @@ -522,7 +522,7 @@ __get_page(hashp, p, bucket, is_bucket, is_disk, is_bitmap) HTAB *hashp; char *p; - u_int32_t bucket; + uint32_t bucket; int is_bucket, is_disk, is_bitmap; { int fd, page, size; @@ -582,7 +582,7 @@ __put_page(hashp, p, bucket, is_bucket, is_bitmap) HTAB *hashp; char *p; - u_int32_t bucket; + uint32_t bucket; int is_bucket, is_bitmap; { int fd, page, size; @@ -632,10 +632,10 @@ HTAB *hashp; int pnum, nbits, ndx; { - u_int32_t *ip; + uint32_t *ip; int clearbytes, clearints; - if ((ip = (u_int32_t *)malloc(hashp->BSIZE)) == NULL) + if ((ip = (uint32_t *)malloc(hashp->BSIZE)) == NULL) return (1); hashp->nmaps++; clearints = ((nbits - 1) >> INT_BYTE_SHIFT) + 1; @@ -650,11 +650,11 @@ return (0); } -static u_int32_t +static uint32_t first_free(map) - u_int32_t map; + uint32_t map; { - u_int32_t i, mask; + uint32_t i, mask; mask = 0x1; for (i = 0; i < BITS_PER_MAP; i++) { @@ -669,7 +669,7 @@ overflow_page(hashp) HTAB *hashp; { - u_int32_t *freep; + uint32_t *freep; int max_free, offset, splitnum; u_int16_t addr; int bit, first_page, free_bit, free_page, i, in_use_bits, j; @@ -685,7 +685,7 @@ /* Look through all the free maps to find the first free block */ first_page = hashp->LAST_FREED >>(hashp->BSHIFT + BYTE_SHIFT); for ( i = first_page; i <= free_page; i++ ) { - if (!(freep = (u_int32_t *)hashp->mapp[i]) && + if (!(freep = (uint32_t *)hashp->mapp[i]) && !(freep = fetch_bitmap(hashp, i))) return (0); if (i == free_page) @@ -819,7 +819,7 @@ BUFHEAD *obufp; { u_int16_t addr; - u_int32_t *freep; + uint32_t *freep; int bit_address, free_page, free_bit; u_int16_t ndx; @@ -908,14 +908,14 @@ OFFSET(sp) = off; } -static u_int32_t * +static uint32_t * fetch_bitmap(hashp, ndx) HTAB *hashp; int ndx; { if (ndx >= hashp->nmaps) return (NULL); - if ((hashp->mapp[ndx] = (u_int32_t *)malloc(hashp->BSIZE)) == NULL) + if ((hashp->mapp[ndx] = (uint32_t *)malloc(hashp->BSIZE)) == NULL) return (NULL); if (__get_page(hashp, (char *)hashp->mapp[ndx], hashp->BITMAPS[ndx], 0, 1, 1)) { diff --git a/src/lib/libc/db/recno/extern.h b/src/lib/libc/db/recno/extern.h index 8c59f47..7cacd95 100644 --- a/src/lib/libc/db/recno/extern.h +++ b/src/lib/libc/db/recno/extern.h @@ -38,7 +38,7 @@ int __rec_close(DB *); int __rec_delete(const DB *, const DBT *, u_int); -int __rec_dleaf(BTREE *, PAGE *, u_int32_t); +int __rec_dleaf(BTREE *, PAGE *, uint32_t); int __rec_fd(const DB *); int __rec_fmap(BTREE *, recno_t); int __rec_fout(BTREE *); diff --git a/src/lib/libc/db/recno/rec_delete.c b/src/lib/libc/db/recno/rec_delete.c index 1205594..82c436b 100644 --- a/src/lib/libc/db/recno/rec_delete.c +++ b/src/lib/libc/db/recno/rec_delete.c @@ -156,11 +156,11 @@ __rec_dleaf(t, h, index) BTREE *t; PAGE *h; - u_int32_t index; + uint32_t index; { RLEAF *rl; indx_t *ip, cnt, offset; - u_int32_t nbytes; + uint32_t nbytes; char *from; void *to; diff --git a/src/lib/libc/db/recno/rec_put.c b/src/lib/libc/db/recno/rec_put.c index 14cc811..064aaa6 100644 --- a/src/lib/libc/db/recno/rec_put.c +++ b/src/lib/libc/db/recno/rec_put.c @@ -205,7 +205,7 @@ PAGE *h; indx_t index, nxtindex; pgno_t pg; - u_int32_t nbytes; + uint32_t nbytes; int dflags, status; char *dest, db[NOVFLSIZE]; @@ -221,7 +221,7 @@ tdata.data = db; tdata.size = NOVFLSIZE; *(pgno_t *)db = pg; - *(u_int32_t *)(db + sizeof(pgno_t)) = data->size; + *(uint32_t *)(db + sizeof(pgno_t)) = data->size; dflags = P_BIGDATA; data = &tdata; } else diff --git a/src/lib/libc/gen/arc4random.c b/src/lib/libc/gen/arc4random.c index 7d882b8..9e79fba 100644 --- a/src/lib/libc/gen/arc4random.c +++ b/src/lib/libc/gen/arc4random.c @@ -146,11 +146,11 @@ return (as->s[(si + sj) & 0xff]); } -static inline u_int32_t +static inline uint32_t arc4_getword(as) struct arc4_stream *as; { - u_int32_t val; + uint32_t val; val = arc4_getbyte(as) << 24; val |= arc4_getbyte(as) << 16; @@ -199,10 +199,10 @@ THREAD_UNLOCK(); } -u_int32_t +uint32_t arc4random() { - u_int32_t rnd; + uint32_t rnd; THREAD_LOCK(); arc4_check_init(); diff --git a/src/lib/libc/gen/disklabel.c b/src/lib/libc/gen/disklabel.c index 82ef800..e7e87cd 100644 --- a/src/lib/libc/gen/disklabel.c +++ b/src/lib/libc/gen/disklabel.c @@ -73,7 +73,7 @@ char *cp, *cq; /* can't be register */ char p, max, psize[3], pbsize[3], pfsize[3], poffset[3], ptype[3]; - u_int32_t *dx; + uint32_t *dx; if (cgetent(&buf, db_array, (char *) name) < 0) return NULL; diff --git a/src/lib/libc/gen/ldexp.c b/src/lib/libc/gen/ldexp.c index 3d59050..ce9e999 100644 --- a/src/lib/libc/gen/ldexp.c +++ b/src/lib/libc/gen/ldexp.c @@ -27,8 +27,8 @@ double value; struct { - u_int32_t msw; - u_int32_t lsw; + uint32_t msw; + uint32_t lsw; } parts; } ieee_double_shape_type; @@ -41,8 +41,8 @@ double value; struct { - u_int32_t lsw; - u_int32_t msw; + uint32_t lsw; + uint32_t msw; } parts; } ieee_double_shape_type; @@ -87,7 +87,7 @@ static double _copysign(double x, double y) { - u_int32_t hx,hy; + uint32_t hx,hy; GET_HIGH_WORD(hx,x); GET_HIGH_WORD(hy,y); SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000)); diff --git a/src/lib/libc/gen/sem.c b/src/lib/libc/gen/sem.c index 4054e3a..b7d3739 100644 --- a/src/lib/libc/gen/sem.c +++ b/src/lib/libc/gen/sem.c @@ -125,7 +125,7 @@ return (NULL); } - sem->count = (u_int32_t)value; + sem->count = (uint32_t)value; sem->nwaiters = 0; sem->magic = SEM_MAGIC; sem->semid = semid; diff --git a/src/lib/libc/net/getaddrinfo.c b/src/lib/libc/net/getaddrinfo.c index 2df61cc..26e59ca 100644 --- a/src/lib/libc/net/getaddrinfo.c +++ b/src/lib/libc/net/getaddrinfo.c @@ -191,7 +191,7 @@ struct sockaddr aiou_sa; } aio_src_un; #define aio_srcsa aio_src_un.aiou_sa - u_int32_t aio_srcflag; + uint32_t aio_srcflag; int aio_srcscope; int aio_dstscope; struct policyqueue *aio_srcpolicy; @@ -240,7 +240,7 @@ static void set_source(struct ai_order *, struct policyhead *); static int comp_dst(const void *, const void *); #ifdef INET6 -static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *); +static int ip6_str2scopeid(char *, struct sockaddr_in6 *, uint32_t *); #endif static int gai_addr2scopetype(struct sockaddr *); @@ -803,7 +803,7 @@ #ifdef INET6 if (ai.ai_family == AF_INET6) { struct in6_ifreq ifr6; - u_int32_t flags6; + uint32_t flags6; /* XXX: interface name should not be hardcoded */ strncpy(ifr6.ifr_name, "lo0", sizeof(ifr6.ifr_name)); @@ -1206,7 +1206,7 @@ error = explore_numeric(pai, addr, servname, res, hostname); if (error == 0) { - u_int32_t scopeid; + uint32_t scopeid; for (cur = *res; cur; cur = cur->ai_next) { if (cur->ai_family != AF_INET6) @@ -1269,7 +1269,7 @@ fp_str = getenv("GAI"); if (fp_str && inet_pton(AF_INET6, fp_str, &faith_prefix) == 1 && afd->a_af == AF_INET && pai->ai_socktype == SOCK_STREAM) { - u_int32_t v4a; + uint32_t v4a; u_int8_t v4a_top; memcpy(&v4a, addr, sizeof v4a); @@ -1452,7 +1452,7 @@ #ifdef INET6 /* convert a string to a scope identifier. XXX: IPv6 specific */ static int -ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid) +ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, uint32_t *scopeid) { u_long lscopeid; struct in6_addr *a6; @@ -1488,7 +1488,7 @@ trynumeric: errno = 0; lscopeid = strtoul(scope, &ep, 10); - *scopeid = (u_int32_t)(lscopeid & 0xffffffffUL); + *scopeid = (uint32_t)(lscopeid & 0xffffffffUL); if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid) return 0; else diff --git a/src/lib/libc/net/getnameinfo.c b/src/lib/libc/net/getnameinfo.c index 5daf61a..8e25489 100644 --- a/src/lib/libc/net/getnameinfo.c +++ b/src/lib/libc/net/getnameinfo.c @@ -95,7 +95,7 @@ u_short port; int family, i; const char *addr; - u_int32_t v4a; + uint32_t v4a; int h_error; char numserv[512]; char numaddr[512]; @@ -147,7 +147,7 @@ switch (sa->sa_family) { case AF_INET: - v4a = (u_int32_t) + v4a = (uint32_t) ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr); if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a)) flags |= NI_NUMERICHOST; diff --git a/src/lib/libc/net/name6.c b/src/lib/libc/net/name6.c index 0e91325..f40a30b 100644 --- a/src/lib/libc/net/name6.c +++ b/src/lib/libc/net/name6.c @@ -182,7 +182,7 @@ struct sockaddr aiou_sa; } aio_src_un; #define aio_srcsa aio_src_un.aiou_sa - u_int32_t aio_srcflag; + uint32_t aio_srcflag; int aio_srcscope; int aio_dstscope; struct policyqueue *aio_srcpolicy; @@ -986,7 +986,7 @@ #ifdef INET6 if (ss.ss_family == AF_INET6) { struct in6_ifreq ifr6; - u_int32_t flags6; + uint32_t flags6; /* XXX: interface name should not be hardcoded */ strncpy(ifr6.ifr_name, "lo0", sizeof(ifr6.ifr_name)); @@ -2001,7 +2001,7 @@ struct timeval tout; int len; static int pid; - u_int32_t r1, r2; + uint32_t r1, r2; if (pid == 0) pid = getpid(); diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c index b2d431c..bacbc31 100644 --- a/src/lib/libc/net/rcmd.c +++ b/src/lib/libc/net/rcmd.c @@ -66,7 +66,7 @@ #define max(a, b) ((a > b) ? a : b) -int __ivaliduser(FILE *, u_int32_t, const char *, const char *); +int __ivaliduser(FILE *, uint32_t, const char *, const char *); int __ivaliduser_af(FILE *,const void *, const char *, const char *, int, int); int __ivaliduser_sa(FILE *, const struct sockaddr *, socklen_t, const char *, const char *); @@ -524,7 +524,7 @@ int __ivaliduser(hostf, raddr, luser, ruser) FILE *hostf; - u_int32_t raddr; + uint32_t raddr; const char *luser, *ruser; { struct sockaddr_in sin; diff --git a/src/lib/libc/net/res_mkupdate.c b/src/lib/libc/net/res_mkupdate.c index fb6fca9..64f0bd4 100644 --- a/src/lib/libc/net/res_mkupdate.c +++ b/src/lib/libc/net/res_mkupdate.c @@ -69,7 +69,7 @@ char buf2[MAXDNAME]; int section, numrrs = 0, counts[ns_s_max]; u_int16_t rtype, rclass; - u_int32_t n1, rttl; + uint32_t n1, rttl; u_char *dnptrs[20], **dpp, **lastdnptr; /* diff --git a/src/lib/libc/net/res_update.c b/src/lib/libc/net/res_update.c index 92dc870..c246600 100644 --- a/src/lib/libc/net/res_update.c +++ b/src/lib/libc/net/res_update.c @@ -82,7 +82,7 @@ int i, j, k = 0, n, ancount, nscount, arcount, rcode, rdatasize, newgroup, done, myzone, seen_before, numzones = 0; u_int16_t dlen, class, qclass, type, qtype; - u_int32_t ttl; + uint32_t ttl; if (key != NULL) { /* TSIG is not supported. */ diff --git a/src/lib/libc/nls/msgcat.c b/src/lib/libc/nls/msgcat.c index afcbdda..c3c0dde 100644 --- a/src/lib/libc/nls/msgcat.c +++ b/src/lib/libc/nls/msgcat.c @@ -199,29 +199,29 @@ /* binary search, see knuth algorithm b */ l = 0; - u = ntohl((u_int32_t)cat_hdr->__nsets) - 1; + u = ntohl((uint32_t)cat_hdr->__nsets) - 1; while (l <= u) { i = (l + u) / 2; - r = set_id - ntohl((u_int32_t)set_hdr[i].__setno); + r = set_id - ntohl((uint32_t)set_hdr[i].__setno); if (r == 0) { msg_hdr = (struct _nls_msg_hdr *) (void *)((char *)catd->__data + sizeof(struct _nls_cat_hdr) + - ntohl((u_int32_t)cat_hdr->__msg_hdr_offset)); + ntohl((uint32_t)cat_hdr->__msg_hdr_offset)); - l = ntohl((u_int32_t)set_hdr[i].__index); - u = l + ntohl((u_int32_t)set_hdr[i].__nmsgs) - 1; + l = ntohl((uint32_t)set_hdr[i].__index); + u = l + ntohl((uint32_t)set_hdr[i].__nmsgs) - 1; while (l <= u) { i = (l + u) / 2; r = msg_id - - ntohl((u_int32_t)msg_hdr[i].__msgno); + ntohl((uint32_t)msg_hdr[i].__msgno); if (r == 0) { return ((char *) catd->__data + sizeof(struct _nls_cat_hdr) + - ntohl((u_int32_t) + ntohl((uint32_t) cat_hdr->__msg_txt_offset) + - ntohl((u_int32_t) + ntohl((uint32_t) msg_hdr[i].__offset)); } else if (r < 0) { u = i - 1; @@ -289,7 +289,7 @@ if (data == MAP_FAILED) return (NLERR); - if (ntohl((u_int32_t)((struct _nls_cat_hdr *)data)->__magic) != + if (ntohl((uint32_t)((struct _nls_cat_hdr *)data)->__magic) != _NLS_MAGIC) { munmap(data, (size_t)st.st_size); NLRETERR(EINVAL); diff --git a/src/lib/libc/resolv/res_comp.c b/src/lib/libc/resolv/res_comp.c index 09a08b5..509adcd 100644 --- a/src/lib/libc/resolv/res_comp.c +++ b/src/lib/libc/resolv/res_comp.c @@ -256,10 +256,10 @@ #pragma weak putshort = __putshort #endif /* SOLARIS2 */ -void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); } +void __putlong(uint32_t src, u_char *dst) { ns_put32(src, dst); } void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); } #ifndef __ultrix__ -u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); } +uint32_t _getlong(const u_char *src) { return (ns_get32(src)); } u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); } #endif /*__ultrix__*/ #endif /*BIND_4_COMPAT*/ diff --git a/src/lib/libc/resolv/res_debug.c b/src/lib/libc/resolv/res_debug.c index 7b89d4e..aeca8cb 100644 --- a/src/lib/libc/resolv/res_debug.c +++ b/src/lib/libc/resolv/res_debug.c @@ -188,7 +188,7 @@ p_class(ns_rr_class(rr))); else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) { u_int16_t optcode, optlen, rdatalen = ns_rr_rdlen(rr); - u_int32_t ttl = ns_rr_ttl(rr); + uint32_t ttl = ns_rr_ttl(rr); fprintf(file, "; EDNS: version: %u, udp=%u, flags=%04x\n", @@ -704,7 +704,7 @@ * Return a mnemonic for a time to live. */ const char * -p_time(u_int32_t value) { +p_time(uint32_t value) { char *nbuf = p_time_nbuf; if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0) @@ -815,10 +815,10 @@ } /*% converts ascii lat/lon to unsigned encoded 32-bit number. moves pointer. */ -static u_int32_t +static uint32_t latlon2ul(const char **latlonstrptr, int *which) { const char *cp; - u_int32_t retval; + uint32_t retval; int deg = 0, min = 0, secs = 0, secsfrac = 0; cp = *latlonstrptr; @@ -919,8 +919,8 @@ const char *cp, *maxcp; u_char *bcp; - u_int32_t latit = 0, longit = 0, alt = 0; - u_int32_t lltemp1 = 0, lltemp2 = 0; + uint32_t latit = 0, longit = 0, alt = 0; + uint32_t lltemp1 = 0, lltemp2 = 0; int altmeters = 0, altfrac = 0, altsign = 1; u_int8_t hp = 0x16; /*%< default = 1e6 cm = 10000.00m = 10km */ u_int8_t vp = 0x13; /*%< default = 1e3 cm = 10.00m */ @@ -1038,10 +1038,10 @@ const char *altsign; int altmeters, altfrac; - const u_int32_t referencealt = 100000 * 100; + const uint32_t referencealt = 100000 * 100; int32_t latval, longval, altval; - u_int32_t templ; + uint32_t templ; u_int8_t sizeval, hpval, vpval, versionval; char *sizestr, *hpstr, *vpstr; diff --git a/src/lib/libc/resolv/res_init.c b/src/lib/libc/resolv/res_init.c index 46c19a8..33cf65e 100644 --- a/src/lib/libc/resolv/res_init.c +++ b/src/lib/libc/resolv/res_init.c @@ -117,7 +117,7 @@ #ifdef RESOLVSORT static const char sort_mask[] = "/&"; #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL) -static u_int32_t net_mask(struct in_addr); +static uint32_t net_mask(struct in_addr); #endif #if !defined(isascii) /* XXX - could be a function */ @@ -482,9 +482,9 @@ } } statp->sort_list[nsort].addr.s_addr = - (u_int32_t)0xffffffff; + (uint32_t)0xffffffff; statp->sort_list[nsort].mask = - (u_int32_t)0xffffffff; + (uint32_t)0xffffffff; nsort++; } *cp = n; @@ -705,11 +705,11 @@ #ifdef RESOLVSORT /* XXX - should really support CIDR which means explicit masks always. */ -static u_int32_t +static uint32_t net_mask(in) /* XXX - should really use system's version of this */ struct in_addr in; { - u_int32_t i = ntohl(in.s_addr); + uint32_t i = ntohl(in.s_addr); if (IN_CLASSA(i)) return (htonl(IN_CLASSA_NET)); diff --git a/src/lib/libc/rpc/clnt_bcast.c b/src/lib/libc/rpc/clnt_bcast.c index 8fcb0aa..6f6f8fb 100644 --- a/src/lib/libc/rpc/clnt_bcast.c +++ b/src/lib/libc/rpc/clnt_bcast.c @@ -549,15 +549,15 @@ stat = RPC_CANTRECV; continue; } - if (inlen < sizeof (u_int32_t)) + if (inlen < sizeof (uint32_t)) continue; /* Drop that and go ahead */ /* * see if reply transaction id matches sent id. * If so, decode the results. If return id is xid + 1 * it was a PORTMAP reply */ - if (*((u_int32_t *)(void *)(inbuf)) == - *((u_int32_t *)(void *)(outbuf))) { + if (*((uint32_t *)(void *)(inbuf)) == + *((uint32_t *)(void *)(outbuf))) { pmap_reply_flag = 0; msg.acpted_rply.ar_verf = _null_auth; msg.acpted_rply.ar_results.where = @@ -566,8 +566,8 @@ (xdrproc_t)xdr_rpcb_rmtcallres; #ifdef PORTMAP } else if (pmap_flag && - *((u_int32_t *)(void *)(inbuf)) == - *((u_int32_t *)(void *)(outbuf_pmap))) { + *((uint32_t *)(void *)(inbuf)) == + *((uint32_t *)(void *)(outbuf_pmap))) { pmap_reply_flag = 1; msg.acpted_rply.ar_verf = _null_auth; msg.acpted_rply.ar_results.where = diff --git a/src/lib/libc/rpc/clnt_dg.c b/src/lib/libc/rpc/clnt_dg.c index 7c92fda..1294d12 100644 --- a/src/lib/libc/rpc/clnt_dg.c +++ b/src/lib/libc/rpc/clnt_dg.c @@ -316,7 +316,7 @@ socklen_t inlen, salen; ssize_t recvlen = 0; int kin_len, n, rpc_lock_value; - u_int32_t xid; + uint32_t xid; outlen = 0; sigfillset(&newmask); @@ -378,9 +378,9 @@ * XXX Yes, and it's in network byte order, so we should to * be careful when we increment it, shouldn't we. */ - xid = ntohl(*(u_int32_t *)(void *)(cu->cu_outbuf)); + xid = ntohl(*(uint32_t *)(void *)(cu->cu_outbuf)); xid++; - *(u_int32_t *)(void *)(cu->cu_outbuf) = htonl(xid); + *(uint32_t *)(void *)(cu->cu_outbuf) = htonl(xid); if ((! XDR_PUTINT32(xdrs, &proc)) || (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || @@ -446,10 +446,10 @@ cu->cu_error.re_status = RPC_CANTRECV; goto out; } - if (recvlen >= sizeof(u_int32_t) && + if (recvlen >= sizeof(uint32_t) && (cu->cu_async == TRUE || - *((u_int32_t *)(void *)(cu->cu_inbuf)) == - *((u_int32_t *)(void *)(cu->cu_outbuf)))) { + *((uint32_t *)(void *)(cu->cu_inbuf)) == + *((uint32_t *)(void *)(cu->cu_outbuf)))) { /* We now assume we have the proper reply. */ break; } @@ -662,14 +662,14 @@ * first element in the call structure *. * This will get the xid of the PREVIOUS call */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)cu->cu_outbuf); + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)cu->cu_outbuf); break; case CLSET_XID: /* This will set the xid of the NEXT call */ - *(u_int32_t *)(void *)cu->cu_outbuf = - htonl(*(u_int32_t *)info - 1); + *(uint32_t *)(void *)cu->cu_outbuf = + htonl(*(uint32_t *)info - 1); /* decrement by 1 as clnt_dg_call() increments once */ break; @@ -680,14 +680,14 @@ * begining of the RPC header. MUST be changed if the * call_struct is changed */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)(cu->cu_outbuf + + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)(cu->cu_outbuf + 4 * BYTES_PER_XDR_UNIT)); break; case CLSET_VERS: - *(u_int32_t *)(void *)(cu->cu_outbuf + 4 * BYTES_PER_XDR_UNIT) - = htonl(*(u_int32_t *)info); + *(uint32_t *)(void *)(cu->cu_outbuf + 4 * BYTES_PER_XDR_UNIT) + = htonl(*(uint32_t *)info); break; case CLGET_PROG: @@ -697,14 +697,14 @@ * begining of the RPC header. MUST be changed if the * call_struct is changed */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)(cu->cu_outbuf + + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)(cu->cu_outbuf + 3 * BYTES_PER_XDR_UNIT)); break; case CLSET_PROG: - *(u_int32_t *)(void *)(cu->cu_outbuf + 3 * BYTES_PER_XDR_UNIT) - = htonl(*(u_int32_t *)info); + *(uint32_t *)(void *)(cu->cu_outbuf + 3 * BYTES_PER_XDR_UNIT) + = htonl(*(uint32_t *)info); break; case CLSET_ASYNC: cu->cu_async = *(int *)info; diff --git a/src/lib/libc/rpc/clnt_raw.c b/src/lib/libc/rpc/clnt_raw.c index 77b38ad..0fdb798 100644 --- a/src/lib/libc/rpc/clnt_raw.c +++ b/src/lib/libc/rpc/clnt_raw.c @@ -117,8 +117,8 @@ call_msg.rm_direction = CALL; call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION; /* XXX: prog and vers have been long historically :-( */ - call_msg.rm_call.cb_prog = (u_int32_t)prog; - call_msg.rm_call.cb_vers = (u_int32_t)vers; + call_msg.rm_call.cb_prog = (uint32_t)prog; + call_msg.rm_call.cb_vers = (uint32_t)vers; xdrmem_create(xdrs, clp->u.mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE); if (! xdr_callhdr(xdrs, &call_msg)) warnx("clntraw_create - Fatal header serialization error."); diff --git a/src/lib/libc/rpc/clnt_vc.c b/src/lib/libc/rpc/clnt_vc.c index 96b5c2d..aed8d10 100644 --- a/src/lib/libc/rpc/clnt_vc.c +++ b/src/lib/libc/rpc/clnt_vc.c @@ -110,7 +110,7 @@ struct rpc_err ct_error; union { char ct_mcallc[MCALL_MSG_SIZE]; /* marshalled callmsg */ - u_int32_t ct_mcalli; + uint32_t ct_mcalli; } ct_u; u_int ct_mpos; /* pos after marshal */ XDR ct_xdrs; /* XDR stream */ @@ -168,7 +168,7 @@ struct ct_data *ct = NULL; /* client handle */ struct timeval now; struct rpc_msg call_msg; - static u_int32_t disrupt; + static uint32_t disrupt; sigset_t mask; sigset_t newmask; struct sockaddr_storage ss; @@ -176,7 +176,7 @@ struct __rpc_sockinfo si; if (disrupt == 0) - disrupt = (u_int32_t)(long)raddr; + disrupt = (uint32_t)(long)raddr; cl = (CLIENT *)mem_alloc(sizeof (*cl)); ct = (struct ct_data *)mem_alloc(sizeof (*ct)); @@ -266,11 +266,11 @@ * Initialize call message */ (void)gettimeofday(&now, NULL); - call_msg.rm_xid = ((u_int32_t)++disrupt) ^ __RPC_GETXID(&now); + call_msg.rm_xid = ((uint32_t)++disrupt) ^ __RPC_GETXID(&now); call_msg.rm_direction = CALL; call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION; - call_msg.rm_call.cb_prog = (u_int32_t)prog; - call_msg.rm_call.cb_vers = (u_int32_t)vers; + call_msg.rm_call.cb_prog = (uint32_t)prog; + call_msg.rm_call.cb_vers = (uint32_t)vers; /* * pre-serialize the static part of the call msg and stash it away @@ -325,8 +325,8 @@ struct ct_data *ct = (struct ct_data *) cl->cl_private; XDR *xdrs = &(ct->ct_xdrs); struct rpc_msg reply_msg; - u_int32_t x_id; - u_int32_t *msg_x_id = &ct->ct_u.ct_mcalli; /* yuk */ + uint32_t x_id; + uint32_t *msg_x_id = &ct->ct_u.ct_mcalli; /* yuk */ bool_t shipnow; int refreshes = 2; sigset_t mask, newmask; @@ -568,13 +568,13 @@ * first element in the call structure * This will get the xid of the PREVIOUS call */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)&ct->ct_u.ct_mcalli); + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)&ct->ct_u.ct_mcalli); break; case CLSET_XID: /* This will set the xid of the NEXT call */ - *(u_int32_t *)(void *)&ct->ct_u.ct_mcalli = - htonl(*((u_int32_t *)info) + 1); + *(uint32_t *)(void *)&ct->ct_u.ct_mcalli = + htonl(*((uint32_t *)info) + 1); /* increment by 1 as clnt_vc_call() decrements once */ break; case CLGET_VERS: @@ -584,15 +584,15 @@ * begining of the RPC header. MUST be changed if the * call_struct is changed */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc + + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)(ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT)); break; case CLSET_VERS: - *(u_int32_t *)(void *)(ct->ct_u.ct_mcallc + + *(uint32_t *)(void *)(ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT) = - htonl(*(u_int32_t *)info); + htonl(*(uint32_t *)info); break; case CLGET_PROG: @@ -602,15 +602,15 @@ * begining of the RPC header. MUST be changed if the * call_struct is changed */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc + + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)(ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT)); break; case CLSET_PROG: - *(u_int32_t *)(void *)(ct->ct_u.ct_mcallc + + *(uint32_t *)(void *)(ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT) = - htonl(*(u_int32_t *)info); + htonl(*(uint32_t *)info); break; default: diff --git a/src/lib/libc/rpc/pmap_clnt.c b/src/lib/libc/rpc/pmap_clnt.c index 81caea7..117eff9 100644 --- a/src/lib/libc/rpc/pmap_clnt.c +++ b/src/lib/libc/rpc/pmap_clnt.c @@ -76,7 +76,7 @@ return (FALSE); } snprintf(buf, sizeof buf, "0.0.0.0.%d.%d", - (((u_int32_t)port) >> 8) & 0xff, port & 0xff); + (((uint32_t)port) >> 8) & 0xff, port & 0xff); na = uaddr2taddr(nconf, buf); if (na == NULL) { freenetconfigent(nconf); diff --git a/src/lib/libc/rpc/rpc_callmsg.c b/src/lib/libc/rpc/rpc_callmsg.c index 05595cc..dc706be 100644 --- a/src/lib/libc/rpc/rpc_callmsg.c +++ b/src/lib/libc/rpc/rpc_callmsg.c @@ -191,14 +191,14 @@ } } if ( - xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) && + xdr_uint32_t(xdrs, &(cmsg->rm_xid)) && xdr_enum(xdrs, (enum_t *)&(cmsg->rm_direction)) && (cmsg->rm_direction == CALL) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && (cmsg->rm_call.cb_rpcvers == RPC_MSG_VERSION) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_prog)) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_vers)) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_proc)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_prog)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_vers)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_proc)) && xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_cred)) ) return (xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_verf))); return (FALSE); diff --git a/src/lib/libc/rpc/rpc_com.h b/src/lib/libc/rpc/rpc_com.h index 0c6a068..232b9ad 100644 --- a/src/lib/libc/rpc/rpc_com.h +++ b/src/lib/libc/rpc/rpc_com.h @@ -56,8 +56,8 @@ #define RPC_MAXDATASIZE 9000 #define RPC_MAXADDRSIZE 1024 -#define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \ - (u_int32_t)(now)->tv_usec) +#define __RPC_GETXID(now) ((uint32_t)getpid() ^ (uint32_t)(now)->tv_sec ^ \ + (uint32_t)(now)->tv_usec) __BEGIN_DECLS extern u_int __rpc_get_a_size(int); diff --git a/src/lib/libc/rpc/rpc_generic.c b/src/lib/libc/rpc/rpc_generic.c index e6d78ea..dd987ac 100644 --- a/src/lib/libc/rpc/rpc_generic.c +++ b/src/lib/libc/rpc/rpc_generic.c @@ -620,7 +620,7 @@ == NULL) return NULL; port = ntohs(sin->sin_port); - if (asprintf(&ret, "%s.%u.%u", namebuf, ((u_int32_t)port) >> 8, + if (asprintf(&ret, "%s.%u.%u", namebuf, ((uint32_t)port) >> 8, port & 0xff) < 0) return NULL; break; @@ -631,7 +631,7 @@ == NULL) return NULL; port = ntohs(sin6->sin6_port); - if (asprintf(&ret, "%s.%u.%u", namebuf6, ((u_int32_t)port) >> 8, + if (asprintf(&ret, "%s.%u.%u", namebuf6, ((uint32_t)port) >> 8, port & 0xff) < 0) return NULL; break; diff --git a/src/lib/libc/rpc/rpc_prot.c b/src/lib/libc/rpc/rpc_prot.c index 203e3fa..7054e26 100644 --- a/src/lib/libc/rpc/rpc_prot.c +++ b/src/lib/libc/rpc/rpc_prot.c @@ -123,9 +123,9 @@ return ((*(ar->ar_results.proc))(xdrs, ar->ar_results.where)); case PROG_MISMATCH: - if (! xdr_u_int32_t(xdrs, &(ar->ar_vers.low))) + if (! xdr_uint32_t(xdrs, &(ar->ar_vers.low))) return (FALSE); - return (xdr_u_int32_t(xdrs, &(ar->ar_vers.high))); + return (xdr_uint32_t(xdrs, &(ar->ar_vers.high))); case GARBAGE_ARGS: case SYSTEM_ERR: @@ -154,9 +154,9 @@ switch (rr->rj_stat) { case RPC_MISMATCH: - if (! xdr_u_int32_t(xdrs, &(rr->rj_vers.low))) + if (! xdr_uint32_t(xdrs, &(rr->rj_vers.low))) return (FALSE); - return (xdr_u_int32_t(xdrs, &(rr->rj_vers.high))); + return (xdr_uint32_t(xdrs, &(rr->rj_vers.high))); case AUTH_ERROR: return (xdr_enum(xdrs, (enum_t *)&(rr->rj_why))); @@ -183,7 +183,7 @@ assert(rmsg != NULL); if ( - xdr_u_int32_t(xdrs, &(rmsg->rm_xid)) && + xdr_uint32_t(xdrs, &(rmsg->rm_xid)) && xdr_enum(xdrs, (enum_t *)&(rmsg->rm_direction)) && (rmsg->rm_direction == REPLY) ) return (xdr_union(xdrs, (enum_t *)&(rmsg->rm_reply.rp_stat), @@ -211,11 +211,11 @@ cmsg->rm_call.cb_rpcvers = RPC_MSG_VERSION; if ( (xdrs->x_op == XDR_ENCODE) && - xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) && + xdr_uint32_t(xdrs, &(cmsg->rm_xid)) && xdr_enum(xdrs, (enum_t *)&(cmsg->rm_direction)) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_prog)) ) - return (xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_vers))); + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_prog)) ) + return (xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_vers))); return (FALSE); } diff --git a/src/lib/libc/rpc/rpcb_prot.c b/src/lib/libc/rpc/rpcb_prot.c index 7d00193..eaea1ca 100644 --- a/src/lib/libc/rpc/rpcb_prot.c +++ b/src/lib/libc/rpc/rpcb_prot.c @@ -59,10 +59,10 @@ XDR *xdrs; RPCB *objp; { - if (!xdr_u_int32_t(xdrs, &objp->r_prog)) { + if (!xdr_uint32_t(xdrs, &objp->r_prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->r_vers)) { + if (!xdr_uint32_t(xdrs, &objp->r_vers)) { return (FALSE); } if (!xdr_string(xdrs, &objp->r_netid, (u_int)~0)) { @@ -177,7 +177,7 @@ if (!xdr_string(xdrs, &objp->r_nc_netid, (u_int)~0)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->r_nc_semantics)) { + if (!xdr_uint32_t(xdrs, &objp->r_nc_semantics)) { return (FALSE); } if (!xdr_string(xdrs, &objp->r_nc_protofmly, (u_int)~0)) { @@ -256,13 +256,13 @@ buf = XDR_INLINE(xdrs, 3 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->proc)) { + if (!xdr_uint32_t(xdrs, &objp->proc)) { return (FALSE); } } else { @@ -321,7 +321,7 @@ { bool_t dummy; - if (!xdr_u_int32_t(xdrs, (u_int32_t *) &objp->maxlen)) { + if (!xdr_uint32_t(xdrs, (uint32_t *) &objp->maxlen)) { return (FALSE); } dummy = xdr_bytes(xdrs, (char **)&(objp->buf), diff --git a/src/lib/libc/rpc/rpcb_st_xdr.c b/src/lib/libc/rpc/rpcb_st_xdr.c index 92f3912..26b0295 100644 --- a/src/lib/libc/rpc/rpcb_st_xdr.c +++ b/src/lib/libc/rpc/rpcb_st_xdr.c @@ -53,10 +53,10 @@ rpcbs_addrlist *objp; { - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } if (!xdr_int(xdrs, &objp->success)) { @@ -90,13 +90,13 @@ if (xdrs->x_op == XDR_ENCODE) { buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->proc)) { + if (!xdr_uint32_t(xdrs, &objp->proc)) { return (FALSE); } if (!xdr_int(xdrs, &objp->success)) { @@ -128,13 +128,13 @@ } else if (xdrs->x_op == XDR_DECODE) { buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->proc)) { + if (!xdr_uint32_t(xdrs, &objp->proc)) { return (FALSE); } if (!xdr_int(xdrs, &objp->success)) { @@ -164,13 +164,13 @@ } return (TRUE); } - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->proc)) { + if (!xdr_uint32_t(xdrs, &objp->proc)) { return (FALSE); } if (!xdr_int(xdrs, &objp->success)) { diff --git a/src/lib/libc/rpc/svc.c b/src/lib/libc/rpc/svc.c index 38bd668..4d18b89 100644 --- a/src/lib/libc/rpc/svc.c +++ b/src/lib/libc/rpc/svc.c @@ -552,8 +552,8 @@ rply.rm_reply.rp_stat = MSG_ACCEPTED; rply.acpted_rply.ar_verf = xprt->xp_verf; rply.acpted_rply.ar_stat = PROG_MISMATCH; - rply.acpted_rply.ar_vers.low = (u_int32_t)low_vers; - rply.acpted_rply.ar_vers.high = (u_int32_t)high_vers; + rply.acpted_rply.ar_vers.low = (uint32_t)low_vers; + rply.acpted_rply.ar_vers.high = (uint32_t)high_vers; SVC_REPLY(xprt, &rply); } diff --git a/src/lib/libc/rpc/svc_dg.c b/src/lib/libc/rpc/svc_dg.c index 53598de..26dca6d 100644 --- a/src/lib/libc/rpc/svc_dg.c +++ b/src/lib/libc/rpc/svc_dg.c @@ -191,7 +191,7 @@ (struct sockaddr *)(void *)&ss, &alen); if (rlen == -1 && errno == EINTR) goto again; - if (rlen == -1 || (rlen < (ssize_t)(4 * sizeof (u_int32_t)))) + if (rlen == -1 || (rlen < (ssize_t)(4 * sizeof (uint32_t)))) return (FALSE); if (xprt->xp_rtaddr.len < alen) { if (xprt->xp_rtaddr.len != 0) @@ -355,7 +355,7 @@ /* * Index into cache is xid, proc, vers, prog and address */ - u_int32_t cache_xid; + uint32_t cache_xid; rpcproc_t cache_proc; rpcvers_t cache_vers; rpcprog_t cache_prog; diff --git a/src/lib/libc/rpc/svc_vc.c b/src/lib/libc/rpc/svc_vc.c index ab5bf0e..5738804 100644 --- a/src/lib/libc/rpc/svc_vc.c +++ b/src/lib/libc/rpc/svc_vc.c @@ -98,7 +98,7 @@ struct cf_conn { /* kept in xprt->xp_p1 for actual connection */ enum xprt_stat strm_stat; - u_int32_t x_id; + uint32_t x_id; XDR xdrs; char verf_body[MAX_AUTH_BYTES]; u_int sendsize; diff --git a/src/lib/libc/stdlib/hcreate.c b/src/lib/libc/stdlib/hcreate.c index 6ab33e5..32531df 100644 --- a/src/lib/libc/stdlib/hcreate.c +++ b/src/lib/libc/stdlib/hcreate.c @@ -82,7 +82,7 @@ #define MAX_BUCKETS ((size_t)1 << MAX_BUCKETS_LG2) /* Default hash function, from db/hash/hash_func.c */ -extern u_int32_t (*__default_hash)(const void *, size_t); +extern uint32_t (*__default_hash)(const void *, size_t); static struct internal_head *htable; static size_t htablesize; diff --git a/src/lib/libc/uthread/pthread_private.h b/src/lib/libc/uthread/pthread_private.h index b87702a..5ea9c61 100644 --- a/src/lib/libc/uthread/pthread_private.h +++ b/src/lib/libc/uthread/pthread_private.h @@ -434,12 +434,12 @@ * Semaphore definitions. */ struct sem { -#define SEM_MAGIC ((u_int32_t) 0x09fa4012) - u_int32_t magic; +#define SEM_MAGIC ((uint32_t) 0x09fa4012) + uint32_t magic; pthread_mutex_t lock; pthread_cond_t gtzero; - u_int32_t count; - u_int32_t nwaiters; + uint32_t count; + uint32_t nwaiters; }; /* @@ -711,8 +711,8 @@ * Magic value to help recognize a valid thread structure * from an invalid one: */ -#define PTHREAD_MAGIC ((u_int32_t) 0xd09ba115) - u_int32_t magic; +#define PTHREAD_MAGIC ((uint32_t) 0xd09ba115) + uint32_t magic; char *name; u_int64_t uniqueid; /* for gdb */ diff --git a/src/lib/libc/uthread/uthread_sem.c b/src/lib/libc/uthread/uthread_sem.c index 6216855..f374e54 100644 --- a/src/lib/libc/uthread/uthread_sem.c +++ b/src/lib/libc/uthread/uthread_sem.c @@ -105,7 +105,7 @@ goto RETURN; } - (*sem)->count = (u_int32_t)value; + (*sem)->count = (uint32_t)value; (*sem)->nwaiters = 0; (*sem)->magic = SEM_MAGIC; diff --git a/src/lib/libc/xdr/xdr.c b/src/lib/libc/xdr/xdr.c index c52486a..204e292 100644 --- a/src/lib/libc/xdr/xdr.c +++ b/src/lib/libc/xdr/xdr.c @@ -200,7 +200,7 @@ /* * XDR 32-bit integers - * same as xdr_u_int32_t - open coded to save a proc call! + * same as xdr_uint32_t - open coded to save a proc call! */ bool_t xdr_int32_t(xdrs, int32_p) @@ -234,9 +234,9 @@ * same as xdr_int32_t - open coded to save a proc call! */ bool_t -xdr_u_int32_t(xdrs, u_int32_p) +xdr_uint32_t(xdrs, u_int32_p) XDR *xdrs; - u_int32_t *u_int32_p; + uint32_t *u_int32_p; { u_long l; @@ -250,7 +250,7 @@ if (!XDR_GETLONG(xdrs, (long *)&l)) { return (FALSE); } - *u_int32_p = (u_int32_t) l; + *u_int32_p = (uint32_t) l; return (TRUE); case XDR_FREE: diff --git a/src/lib/libc/xdr/xdr_mem.c b/src/lib/libc/xdr/xdr_mem.c index e2ac0a6..453562e 100644 --- a/src/lib/libc/xdr/xdr_mem.c +++ b/src/lib/libc/xdr/xdr_mem.c @@ -126,7 +126,7 @@ if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - *lp = ntohl(*(u_int32_t *)xdrs->x_private); + *lp = ntohl(*(uint32_t *)xdrs->x_private); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE); } @@ -140,7 +140,7 @@ if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - *(u_int32_t *)xdrs->x_private = htonl((u_int32_t)*lp); + *(uint32_t *)xdrs->x_private = htonl((uint32_t)*lp); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE); } @@ -150,7 +150,7 @@ XDR *xdrs; long *lp; { - u_int32_t l; + uint32_t l; if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); @@ -166,12 +166,12 @@ XDR *xdrs; const long *lp; { - u_int32_t l; + uint32_t l; if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - l = htonl((u_int32_t)*lp); + l = htonl((uint32_t)*lp); memmove(xdrs->x_private, &l, sizeof(int32_t)); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE); diff --git a/src/lib/libc/xdr/xdr_rec.c b/src/lib/libc/xdr/xdr_rec.c index a311913..8ec1d08 100644 --- a/src/lib/libc/xdr/xdr_rec.c +++ b/src/lib/libc/xdr/xdr_rec.c @@ -103,7 +103,7 @@ * meet the needs of xdr and rpc based on tcp. */ -#define LAST_FRAG ((u_int32_t)(1 << 31)) +#define LAST_FRAG ((uint32_t)(1 << 31)) typedef struct rec_strm { char *tcp_handle; @@ -114,7 +114,7 @@ char *out_base; /* output buffer (points to frag header) */ char *out_finger; /* next output position */ char *out_boundry; /* data cannot up to this address */ - u_int32_t *frag_header; /* beginning of curren fragment */ + uint32_t *frag_header; /* beginning of curren fragment */ bool_t frag_sent; /* true if buffer sent in middle of record */ /* * in-coming bits @@ -131,7 +131,7 @@ bool_t nonblock; bool_t in_haveheader; - u_int32_t in_header; + uint32_t in_header; char *in_hdrp; int in_hdrlen; int in_reclen; @@ -202,8 +202,8 @@ rstrm->readit = readit; rstrm->writeit = writeit; rstrm->out_finger = rstrm->out_boundry = rstrm->out_base; - rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_base; - rstrm->out_finger += sizeof(u_int32_t); + rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base; + rstrm->out_finger += sizeof(uint32_t); rstrm->out_boundry += sendsize; rstrm->frag_sent = FALSE; rstrm->in_size = recvsize; @@ -237,14 +237,14 @@ /* first try the inline, fast case */ if ((rstrm->fbtbc >= sizeof(int32_t)) && (((long)rstrm->in_boundry - (long)buflp) >= sizeof(int32_t))) { - *lp = (long)ntohl((u_int32_t)(*buflp)); + *lp = (long)ntohl((uint32_t)(*buflp)); rstrm->fbtbc -= sizeof(int32_t); rstrm->in_finger += sizeof(int32_t); } else { if (! xdrrec_getbytes(xdrs, (char *)(void *)&mylong, sizeof(int32_t))) return (FALSE); - *lp = (long)ntohl((u_int32_t)mylong); + *lp = (long)ntohl((uint32_t)mylong); } return (TRUE); } @@ -269,7 +269,7 @@ dest_lp = ((int32_t *)(void *)(rstrm->out_finger)); rstrm->out_finger += sizeof(int32_t); } - *dest_lp = (int32_t)htonl((u_int32_t)(*lp)); + *dest_lp = (int32_t)htonl((uint32_t)(*lp)); return (TRUE); } @@ -513,16 +513,16 @@ u_long len; /* fragment length */ if (sendnow || rstrm->frag_sent || - ((u_long)rstrm->out_finger + sizeof(u_int32_t) >= + ((u_long)rstrm->out_finger + sizeof(uint32_t) >= (u_long)rstrm->out_boundry)) { rstrm->frag_sent = FALSE; return (flush_out(rstrm, TRUE)); } len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->frag_header) - - sizeof(u_int32_t); - *(rstrm->frag_header) = htonl((u_int32_t)len | LAST_FRAG); - rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_finger; - rstrm->out_finger += sizeof(u_int32_t); + sizeof(uint32_t); + *(rstrm->frag_header) = htonl((uint32_t)len | LAST_FRAG); + rstrm->frag_header = (uint32_t *)(void *)rstrm->out_finger; + rstrm->out_finger += sizeof(uint32_t); return (TRUE); } @@ -629,18 +629,18 @@ RECSTREAM *rstrm; bool_t eor; { - u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0; - u_int32_t len = (u_int32_t)((u_long)(rstrm->out_finger) - - (u_long)(rstrm->frag_header) - sizeof(u_int32_t)); + uint32_t eormask = (eor == TRUE) ? LAST_FRAG : 0; + uint32_t len = (uint32_t)((u_long)(rstrm->out_finger) - + (u_long)(rstrm->frag_header) - sizeof(uint32_t)); *(rstrm->frag_header) = htonl(len | eormask); - len = (u_int32_t)((u_long)(rstrm->out_finger) - + len = (uint32_t)((u_long)(rstrm->out_finger) - (u_long)(rstrm->out_base)); if ((*(rstrm->writeit))(rstrm->tcp_handle, rstrm->out_base, (int)len) != (int)len) return (FALSE); - rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_base; - rstrm->out_finger = (char *)rstrm->out_base + sizeof(u_int32_t); + rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base; + rstrm->out_finger = (char *)rstrm->out_base + sizeof(uint32_t); return (TRUE); } @@ -649,16 +649,16 @@ RECSTREAM *rstrm; { char *where; - u_int32_t i; + uint32_t i; int len; if (rstrm->nonblock) return FALSE; where = rstrm->in_base; - i = (u_int32_t)((u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT); + i = (uint32_t)((u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT); where += i; - len = (u_int32_t)(rstrm->in_size - i); + len = (uint32_t)(rstrm->in_size - i); if ((len = (*(rstrm->readit))(rstrm->tcp_handle, where, len)) == -1) return (FALSE); rstrm->in_finger = where; @@ -704,7 +704,7 @@ set_input_fragment(rstrm) RECSTREAM *rstrm; { - u_int32_t header; + uint32_t header; if (rstrm->nonblock) return FALSE; @@ -731,7 +731,7 @@ RECSTREAM *rstrm; long cnt; { - u_int32_t current; + uint32_t current; while (cnt > 0) { current = (size_t)((long)rstrm->in_boundry - @@ -741,7 +741,7 @@ return (FALSE); continue; } - current = (u_int32_t)((cnt < current) ? cnt : current); + current = (uint32_t)((cnt < current) ? cnt : current); rstrm->in_finger += current; cnt -= current; } diff --git a/src/lib/libc/xdr/xdr_stdio.c b/src/lib/libc/xdr/xdr_stdio.c index f31a82e..55ab0fd 100644 --- a/src/lib/libc/xdr/xdr_stdio.c +++ b/src/lib/libc/xdr/xdr_stdio.c @@ -110,7 +110,7 @@ XDR *xdrs; long *lp; { - u_int32_t temp; + uint32_t temp; if (fread(&temp, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1) return (FALSE); @@ -123,7 +123,7 @@ XDR *xdrs; const long *lp; { - int32_t mycopy = htonl((u_int32_t)*lp); + int32_t mycopy = htonl((uint32_t)*lp); if (fwrite(&mycopy, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1) return (FALSE); diff --git a/src/lib/libc_bsd/db/btree/bt_conv.c b/src/lib/libc_bsd/db/btree/bt_conv.c index 5b6bf4b..2aca98f 100644 --- a/src/lib/libc_bsd/db/btree/bt_conv.c +++ b/src/lib/libc_bsd/db/btree/bt_conv.c @@ -84,7 +84,7 @@ M_16_SWAP(h->linp[i]); p = (char *)GETBINTERNAL(h, i); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); p += sizeof(pgno_t); if (*(u_char *)p & P_BIGKEY) { @@ -99,9 +99,9 @@ M_16_SWAP(h->linp[i]); p = (char *)GETBLEAF(h, i); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); flags = *(u_char *)p; if (flags & (P_BIGKEY | P_BIGDATA)) { p += sizeof(u_char); @@ -111,7 +111,7 @@ P_32_SWAP(p); } if (flags & P_BIGDATA) { - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); p += sizeof(pgno_t); P_32_SWAP(p); @@ -141,7 +141,7 @@ for (i = 0; i < top; i++) { p = (char *)GETBINTERNAL(h, i); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); p += sizeof(pgno_t); if (*(u_char *)p & P_BIGKEY) { @@ -156,9 +156,9 @@ for (i = 0; i < top; i++) { p = (char *)GETBLEAF(h, i); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); - p += sizeof(u_int32_t); + p += sizeof(uint32_t); flags = *(u_char *)p; if (flags & (P_BIGKEY | P_BIGDATA)) { p += sizeof(u_char); @@ -168,7 +168,7 @@ P_32_SWAP(p); } if (flags & P_BIGDATA) { - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); p += sizeof(pgno_t); P_32_SWAP(p); @@ -198,15 +198,15 @@ p = (char *)pg; P_32_SWAP(p); /* magic */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* version */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* psize */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* free */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* nrecs */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); P_32_SWAP(p); /* flags */ - p += sizeof(u_int32_t); + p += sizeof(uint32_t); } diff --git a/src/lib/libc_bsd/db/btree/bt_debug.c b/src/lib/libc_bsd/db/btree/bt_debug.c index 366d1e7..9b7ce1e 100644 --- a/src/lib/libc_bsd/db/btree/bt_debug.c +++ b/src/lib/libc_bsd/db/btree/bt_debug.c @@ -202,7 +202,7 @@ (void)fprintf(stderr, "big key page %u size %u/", *(pgno_t *)bl->bytes, - *(u_int32_t *)(bl->bytes + sizeof(pgno_t))); + *(uint32_t *)(bl->bytes + sizeof(pgno_t))); else if (bl->ksize) (void)fprintf(stderr, "%.*s/", bl->ksize, bl->bytes); @@ -210,7 +210,7 @@ (void)fprintf(stderr, "big data page %u size %u", *(pgno_t *)(bl->bytes + bl->ksize), - *(u_int32_t *)(bl->bytes + bl->ksize + + *(uint32_t *)(bl->bytes + bl->ksize + sizeof(pgno_t))); else if (bl->dsize) (void)fprintf(stderr, "%.*s", @@ -222,7 +222,7 @@ (void)fprintf(stderr, "big data page %u size %u", *(pgno_t *)rl->bytes, - *(u_int32_t *)(rl->bytes + sizeof(pgno_t))); + *(uint32_t *)(rl->bytes + sizeof(pgno_t))); else if (rl->dsize) (void)fprintf(stderr, "%.*s", (int)rl->dsize, rl->bytes); diff --git a/src/lib/libc_bsd/db/btree/bt_delete.c b/src/lib/libc_bsd/db/btree/bt_delete.c index 90d5f7c..589473b 100644 --- a/src/lib/libc_bsd/db/btree/bt_delete.c +++ b/src/lib/libc_bsd/db/btree/bt_delete.c @@ -371,7 +371,7 @@ PAGE *pg; EPGNO *parent; indx_t cnt, idx, *ip, offset; - u_int32_t nksize; + uint32_t nksize; char *from; /* @@ -463,7 +463,7 @@ { BLEAF *bl; indx_t cnt, *ip, offset; - u_int32_t nbytes; + uint32_t nbytes; void *to; char *from; diff --git a/src/lib/libc_bsd/db/btree/bt_open.c b/src/lib/libc_bsd/db/btree/bt_open.c index 76e31ce..46c6182 100644 --- a/src/lib/libc_bsd/db/btree/bt_open.c +++ b/src/lib/libc_bsd/db/btree/bt_open.c @@ -412,7 +412,7 @@ static int byteorder(void) { - u_int32_t x; + uint32_t x; u_char *p; x = 0x01020304; diff --git a/src/lib/libc_bsd/db/btree/bt_overflow.c b/src/lib/libc_bsd/db/btree/bt_overflow.c index e61fb57..8e365b0 100644 --- a/src/lib/libc_bsd/db/btree/bt_overflow.c +++ b/src/lib/libc_bsd/db/btree/bt_overflow.c @@ -67,7 +67,7 @@ * * Parameters: * t: tree - * p: pointer to { pgno_t, u_int32_t } + * p: pointer to { pgno_t, uint32_t } * buf: storage address * bufsz: storage size * @@ -80,10 +80,10 @@ PAGE *h; pgno_t pg; size_t nb, plen; - u_int32_t sz; + uint32_t sz; memmove(&pg, p, sizeof(pgno_t)); - memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(u_int32_t)); + memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t)); *ssz = sz; #ifdef DEBUG @@ -135,7 +135,7 @@ void *p; pgno_t npg; size_t nb, plen; - u_int32_t sz; + uint32_t sz; /* * Allocate pages and copy the key/data record into them. Store the @@ -174,7 +174,7 @@ * * Parameters: * t: tree - * p: pointer to { pgno_t, u_int32_t } + * p: pointer to { pgno_t, uint32_t } * * Returns: * RET_ERROR, RET_SUCCESS @@ -185,10 +185,10 @@ PAGE *h; pgno_t pg; size_t plen; - u_int32_t sz; + uint32_t sz; memmove(&pg, p, sizeof(pgno_t)); - memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(u_int32_t)); + memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t)); #ifdef DEBUG if (pg == P_INVALID || sz == 0) diff --git a/src/lib/libc_bsd/db/btree/bt_put.c b/src/lib/libc_bsd/db/btree/bt_put.c index e391b2e..e68a3b3 100644 --- a/src/lib/libc_bsd/db/btree/bt_put.c +++ b/src/lib/libc_bsd/db/btree/bt_put.c @@ -70,7 +70,7 @@ PAGE *h; indx_t idx, nxtindex; pgno_t pg; - u_int32_t nbytes, tmp; + uint32_t nbytes, tmp; int dflags, exact, status; char *dest, db[NOVFLSIZE], kb[NOVFLSIZE]; @@ -125,7 +125,7 @@ memmove(kb, &pg, sizeof(pgno_t)); tmp = key->size; memmove(kb + sizeof(pgno_t), - &tmp, sizeof(u_int32_t)); + &tmp, sizeof(uint32_t)); dflags |= P_BIGKEY; key = &tkey; } @@ -137,7 +137,7 @@ memmove(db, &pg, sizeof(pgno_t)); tmp = data->size; memmove(db + sizeof(pgno_t), - &tmp, sizeof(u_int32_t)); + &tmp, sizeof(uint32_t)); dflags |= P_BIGDATA; data = &tdata; } @@ -197,7 +197,7 @@ * into the offset array, shift the pointers up. */ nbytes = NBLEAFDBT(key->size, data->size); - if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) { + if ((uint32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) { if ((status = __bt_split(t, h, key, data, dflags, nbytes, idx)) != RET_SUCCESS) return (status); @@ -263,7 +263,7 @@ bt_fast(BTREE *t, const DBT *key, const DBT *data, int *exactp) { PAGE *h; - u_int32_t nbytes; + uint32_t nbytes; int cmp; if ((h = mpool_get(t->bt_mp, t->bt_last.pgno, 0)) == NULL) { @@ -278,7 +278,7 @@ * have to search to get split stack. */ nbytes = NBLEAFDBT(key->size, data->size); - if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) + if ((uint32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) goto miss; if (t->bt_order == FORWARD) { diff --git a/src/lib/libc_bsd/db/btree/bt_split.c b/src/lib/libc_bsd/db/btree/bt_split.c index 57abe58..0cadb76 100644 --- a/src/lib/libc_bsd/db/btree/bt_split.c +++ b/src/lib/libc_bsd/db/btree/bt_split.c @@ -76,7 +76,7 @@ */ int __bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags, - size_t ilen, u_int32_t argskip) + size_t ilen, uint32_t argskip) { BINTERNAL *bi; BLEAF *bl, *tbl; @@ -85,7 +85,7 @@ PAGE *h, *l, *r, *lchild, *rchild; indx_t nxtindex; u_int16_t skip; - u_int32_t n, nbytes, nksize; + uint32_t n, nbytes, nksize; int parentsplit; char *dest; @@ -206,7 +206,7 @@ } /* Split the parent page if necessary or shift the indices. */ - if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) { + if ((uint32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) { sp = h; h = h->pgno == P_ROOT ? bt_root(t, h, &l, &r, &skip, nbytes) : @@ -515,7 +515,7 @@ { BINTERNAL *bi; BLEAF *bl; - u_int32_t nbytes; + uint32_t nbytes; char *dest; /* @@ -595,7 +595,7 @@ PAGE *rval; void *src; indx_t full, half, nxt, off, skip, top, used; - u_int32_t nbytes; + uint32_t nbytes; int bigkeycnt, isbigkey; /* diff --git a/src/lib/libc_bsd/db/btree/btree.h b/src/lib/libc_bsd/db/btree/btree.h index 93b00cc..a8224fe 100644 --- a/src/lib/libc_bsd/db/btree/btree.h +++ b/src/lib/libc_bsd/db/btree/btree.h @@ -73,7 +73,7 @@ #define P_RLEAF 0x10 /* leaf page */ #define P_TYPE 0x1f /* type mask */ #define P_PRESERVE 0x20 /* never delete this chain of pages */ - u_int32_t flags; + uint32_t flags; indx_t lower; /* lower bound of free space on page */ indx_t upper; /* upper bound of free space on page */ @@ -83,7 +83,7 @@ /* First and next index. */ #define BTDATAOFF \ (sizeof(pgno_t) + sizeof(pgno_t) + sizeof(pgno_t) + \ - sizeof(u_int32_t) + sizeof(indx_t) + sizeof(indx_t)) + sizeof(uint32_t) + sizeof(indx_t) + sizeof(indx_t)) #define NEXTINDEX(p) (((p)->lower - BTDATAOFF) / sizeof(indx_t)) /* @@ -103,7 +103,7 @@ * manipulated on this system.) */ #define LALIGN(n) (((n) + sizeof(pgno_t) - 1) & ~(sizeof(pgno_t) - 1)) -#define NOVFLSIZE (sizeof(pgno_t) + sizeof(u_int32_t)) +#define NOVFLSIZE (sizeof(pgno_t) + sizeof(uint32_t)) /* * For the btree internal pages, the item is a key. BINTERNALs are {key, pgno} @@ -115,7 +115,7 @@ * some minor modifications of the above rule. */ typedef struct _binternal { - u_int32_t ksize; /* key size */ + uint32_t ksize; /* key size */ pgno_t pgno; /* page number stored on */ #define P_BIGDATA 0x01 /* overflow data */ #define P_BIGKEY 0x02 /* overflow key */ @@ -129,12 +129,12 @@ /* Get the number of bytes in the entry. */ #define NBINTERNAL(len) \ - LALIGN(sizeof(u_int32_t) + sizeof(pgno_t) + sizeof(u_char) + (len)) + LALIGN(sizeof(uint32_t) + sizeof(pgno_t) + sizeof(u_char) + (len)) /* Copy a BINTERNAL entry to the page. */ #define WR_BINTERNAL(p, size, pgno, flags) { \ - *(u_int32_t *)p = size; \ - p += sizeof(u_int32_t); \ + *(uint32_t *)p = size; \ + p += sizeof(uint32_t); \ *(pgno_t *)p = pgno; \ p += sizeof(pgno_t); \ *(u_char *)p = flags; \ @@ -167,8 +167,8 @@ /* For the btree leaf pages, the item is a key and data pair. */ typedef struct _bleaf { - u_int32_t ksize; /* size of key */ - u_int32_t dsize; /* size of data */ + uint32_t ksize; /* size of key */ + uint32_t dsize; /* size of data */ u_char flags; /* P_BIGDATA, P_BIGKEY */ char bytes[1]; /* data */ } BLEAF; @@ -182,15 +182,15 @@ /* Get the number of bytes in the user's key/data pair. */ #define NBLEAFDBT(ksize, dsize) \ - LALIGN(sizeof(u_int32_t) + sizeof(u_int32_t) + sizeof(u_char) + \ + LALIGN(sizeof(uint32_t) + sizeof(uint32_t) + sizeof(u_char) + \ (ksize) + (dsize)) /* Copy a BLEAF entry to the page. */ #define WR_BLEAF(p, key, data, flags) { \ - *(u_int32_t *)p = key->size; \ - p += sizeof(u_int32_t); \ - *(u_int32_t *)p = data->size; \ - p += sizeof(u_int32_t); \ + *(uint32_t *)p = key->size; \ + p += sizeof(uint32_t); \ + *(uint32_t *)p = data->size; \ + p += sizeof(uint32_t); \ *(u_char *)p = flags; \ p += sizeof(u_char); \ memmove(p, key->data, key->size); \ @@ -200,7 +200,7 @@ /* For the recno leaf pages, the item is a data entry. */ typedef struct _rleaf { - u_int32_t dsize; /* size of data */ + uint32_t dsize; /* size of data */ u_char flags; /* P_BIGDATA */ char bytes[1]; } RLEAF; @@ -214,12 +214,12 @@ /* Get the number of bytes from the user's data. */ #define NRLEAFDBT(dsize) \ - LALIGN(sizeof(u_int32_t) + sizeof(u_char) + (dsize)) + LALIGN(sizeof(uint32_t) + sizeof(u_char) + (dsize)) /* Copy a RLEAF entry to the page. */ #define WR_RLEAF(p, data, flags) { \ - *(u_int32_t *)p = data->size; \ - p += sizeof(u_int32_t); \ + *(uint32_t *)p = data->size; \ + p += sizeof(uint32_t); \ *(u_char *)p = flags; \ p += sizeof(u_char); \ memmove(p, data->data, data->size); \ @@ -287,14 +287,14 @@ * put or delete call modify the metadata. */ typedef struct _btmeta { - u_int32_t magic; /* magic number */ - u_int32_t version; /* version */ - u_int32_t psize; /* page size */ - u_int32_t free; /* page number of first free page */ - u_int32_t nrecs; /* R: number of records */ + uint32_t magic; /* magic number */ + uint32_t version; /* version */ + uint32_t psize; /* page size */ + uint32_t free; /* page number of first free page */ + uint32_t nrecs; /* R: number of records */ #define SAVEMETA (B_NODUPS | R_RECNO) - u_int32_t flags; /* bt_flags & SAVEMETA */ + uint32_t flags; /* bt_flags & SAVEMETA */ } BTMETA; /* The in-memory btree/recno data structure. */ @@ -324,7 +324,7 @@ int bt_fd; /* tree file descriptor */ pgno_t bt_free; /* next free page */ - u_int32_t bt_psize; /* page size */ + uint32_t bt_psize; /* page size */ indx_t bt_ovflsize; /* cut-off for key/data overflow */ int bt_lorder; /* byte order */ /* sorted order */ @@ -374,7 +374,7 @@ #define B_DB_LOCK 0x04000 /* DB_LOCK specified. */ #define B_DB_SHMEM 0x08000 /* DB_SHMEM specified. */ #define B_DB_TXN 0x10000 /* DB_TXN specified. */ - u_int32_t flags; + uint32_t flags; } BTREE; #include "extern.h" diff --git a/src/lib/libc_bsd/db/btree/extern.h b/src/lib/libc_bsd/db/btree/extern.h index e33922d..dbabc2b 100644 --- a/src/lib/libc_bsd/db/btree/extern.h +++ b/src/lib/libc_bsd/db/btree/extern.h @@ -50,7 +50,7 @@ int __bt_seq(const DB *, DBT *, DBT *, u_int); void __bt_setcur(BTREE *, pgno_t, u_int); int __bt_split(BTREE *, PAGE *, - const DBT *, const DBT *, int, size_t, u_int32_t); + const DBT *, const DBT *, int, size_t, uint32_t); int __bt_sync(const DB *, u_int); int __ovfl_delete(BTREE *, void *); diff --git a/src/lib/libc_bsd/db/hash/extern.h b/src/lib/libc_bsd/db/hash/extern.h index 46a6f65..33bd882 100644 --- a/src/lib/libc_bsd/db/hash/extern.h +++ b/src/lib/libc_bsd/db/hash/extern.h @@ -37,25 +37,25 @@ int __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int); int __big_return(HTAB *, BUFHEAD *, int, DBT *, int); int __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *, - int, u_int32_t, SPLIT_RETURN *); + int, uint32_t, SPLIT_RETURN *); int __buf_free(HTAB *, int, int); void __buf_init(HTAB *, int); -u_int32_t __call_hash(HTAB *, char *, int); +uint32_t __call_hash(HTAB *, char *, int); int __delpair(HTAB *, BUFHEAD *, int); int __expand_table(HTAB *); int __find_bigpair(HTAB *, BUFHEAD *, int, char *, int); u_int16_t __find_last_page(HTAB *, BUFHEAD **); void __free_ovflpage(HTAB *, BUFHEAD *); -BUFHEAD *__get_buf(HTAB *, u_int32_t, BUFHEAD *, int); -int __get_page(HTAB *, char *, u_int32_t, int, int, int); +BUFHEAD *__get_buf(HTAB *, uint32_t, BUFHEAD *, int); +int __get_page(HTAB *, char *, uint32_t, int, int, int); int __ibitmap(HTAB *, int, int, int); -u_int32_t __log2(u_int32_t); -int __put_page(HTAB *, char *, u_int32_t, int, int); +uint32_t __log2(uint32_t); +int __put_page(HTAB *, char *, uint32_t, int, int); void __reclaim_buf(HTAB *, BUFHEAD *); -int __split_page(HTAB *, u_int32_t, u_int32_t); +int __split_page(HTAB *, uint32_t, uint32_t); /* Default hash routine. */ -extern u_int32_t (*__default_hash)(const void *, size_t); +extern uint32_t (*__default_hash)(const void *, size_t); #ifdef HASH_STATISTICS extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows; diff --git a/src/lib/libc_bsd/db/hash/hash.c b/src/lib/libc_bsd/db/hash/hash.c index c368bb4..8de411a 100644 --- a/src/lib/libc_bsd/db/hash/hash.c +++ b/src/lib/libc_bsd/db/hash/hash.c @@ -60,13 +60,13 @@ static int flush_meta(HTAB *); static int hash_access(HTAB *, ACTION, DBT *, DBT *); static int hash_close(DB *); -static int hash_delete(const DB *, const DBT *, u_int32_t); +static int hash_delete(const DB *, const DBT *, uint32_t); static int hash_fd(const DB *); -static int hash_get(const DB *, const DBT *, DBT *, u_int32_t); -static int hash_put(const DB *, DBT *, const DBT *, u_int32_t); +static int hash_get(const DB *, const DBT *, DBT *, uint32_t); +static int hash_put(const DB *, DBT *, const DBT *, uint32_t); static void *hash_realloc(SEGMENT **, int, int); -static int hash_seq(const DB *, DBT *, DBT *, u_int32_t); -static int hash_sync(const DB *, u_int32_t); +static int hash_seq(const DB *, DBT *, DBT *, uint32_t); +static int hash_sync(const DB *, uint32_t); static int hdestroy(HTAB *); static HTAB *init_hash(HTAB *, const char *, const HASHINFO *); static int init_htab(HTAB *, int); @@ -174,7 +174,7 @@ (hashp->BSHIFT + BYTE_SHIFT); hashp->nmaps = bpages; - (void)memset(&hashp->mapp[0], 0, bpages * sizeof(u_int32_t *)); + (void)memset(&hashp->mapp[0], 0, bpages * sizeof(uint32_t *)); } /* Initialize Buffer Manager */ @@ -441,7 +441,7 @@ * -1 ERROR */ static int -hash_sync(const DB *dbp, u_int32_t flags) +hash_sync(const DB *dbp, uint32_t flags) { HTAB *hashp; @@ -514,7 +514,7 @@ * -1 to indicate an internal ERROR (i.e. out of memory, etc) */ static int -hash_get(const DB *dbp, const DBT *key, DBT *data, u_int32_t flag) +hash_get(const DB *dbp, const DBT *key, DBT *data, uint32_t flag) { HTAB *hashp; @@ -527,7 +527,7 @@ } static int -hash_put(const DB *dbp, DBT *key, const DBT *data, u_int32_t flag) +hash_put(const DB *dbp, DBT *key, const DBT *data, uint32_t flag) { HTAB *hashp; @@ -546,7 +546,7 @@ static int hash_delete(const DB *dbp, const DBT *key, - u_int32_t flag) /* Ignored */ + uint32_t flag) /* Ignored */ { HTAB *hashp; @@ -692,9 +692,9 @@ } static int -hash_seq(const DB *dbp, DBT *key, DBT *data, u_int32_t flag) +hash_seq(const DB *dbp, DBT *key, DBT *data, uint32_t flag) { - u_int32_t bucket; + uint32_t bucket; BUFHEAD *bufp; HTAB *hashp; u_int16_t *bp, ndx; @@ -727,7 +727,7 @@ break; } hashp->cbucket = bucket; - if ((u_int32_t)hashp->cbucket > hashp->MAX_BUCKET) { + if ((uint32_t)hashp->cbucket > hashp->MAX_BUCKET) { hashp->cbucket = -1; return (ABNORMAL); } @@ -786,7 +786,7 @@ int __expand_table(HTAB *hashp) { - u_int32_t old_bucket, new_bucket; + uint32_t old_bucket, new_bucket; int dirsize, new_segnum, spare_ndx; #ifdef HASH_STATISTICS @@ -851,7 +851,7 @@ return (p); } -u_int32_t +uint32_t __call_hash(HTAB *hashp, char *k, int len) { unsigned int n, bucket; diff --git a/src/lib/libc_bsd/db/hash/hash.h b/src/lib/libc_bsd/db/hash/hash.h index a6a0802..ea5336e 100644 --- a/src/lib/libc_bsd/db/hash/hash.h +++ b/src/lib/libc_bsd/db/hash/hash.h @@ -45,7 +45,7 @@ BUFHEAD *prev; /* LRU links */ BUFHEAD *next; /* LRU links */ BUFHEAD *ovfl; /* Overflow page buffer header */ - u_int32_t addr; /* Address of this page */ + uint32_t addr; /* Address of this page */ char *page; /* Actual page data */ char flags; #define BUF_MOD 0x0001 @@ -62,7 +62,7 @@ typedef struct hashhdr { /* Disk resident portion */ int32_t magic; /* Magic NO for hash tables */ int32_t version; /* Version ID */ - u_int32_t lorder; /* Byte Order */ + uint32_t lorder; /* Byte Order */ int32_t bsize; /* Bucket/Page Size */ int32_t bshift; /* Bucket shift */ int32_t dsize; /* Directory Size */ @@ -71,11 +71,11 @@ int32_t ovfl_point; /* Where overflow pages are being * allocated */ int32_t last_freed; /* Last overflow page freed */ - u_int32_t max_bucket; /* ID of Maximum bucket in use */ - u_int32_t high_mask; /* Mask to modulo into entire table */ - u_int32_t low_mask; /* Mask to modulo into lower half of + uint32_t max_bucket; /* ID of Maximum bucket in use */ + uint32_t high_mask; /* Mask to modulo into entire table */ + uint32_t low_mask; /* Mask to modulo into lower half of * table */ - u_int32_t ffactor; /* Fill factor */ + uint32_t ffactor; /* Fill factor */ int32_t nkeys; /* Number of keys in hash table */ int32_t hdrpages; /* Size of table header */ int32_t h_charkey; /* value of hash(CHARKEY) */ @@ -91,7 +91,7 @@ int nsegs; /* Number of allocated segments */ int exsegs; /* Number of extra allocated * segments */ - u_int32_t /* Hash function */ + uint32_t /* Hash function */ (*hash)(const void *, size_t); int flags; /* Flag values */ int fp; /* File pointer */ @@ -107,7 +107,7 @@ int save_file; /* Indicates whether we need to flush * file at * exit */ - u_int32_t *mapp[NCACHED]; /* Pointers to page maps */ + uint32_t *mapp[NCACHED]; /* Pointers to page maps */ int nmaps; /* Initial number of bitmaps */ int nbufs; /* Number of buffers left to * allocate */ @@ -135,13 +135,13 @@ #define BYTE_SHIFT 3 #define INT_TO_BYTE 2 #define INT_BYTE_SHIFT 5 -#define ALL_SET ((u_int32_t)0xFFFFFFFF) +#define ALL_SET ((uint32_t)0xFFFFFFFF) #define ALL_CLEAR 0 #define PTROF(X) ((BUFHEAD *)((ptrdiff_t)(X)&~0x3)) -#define ISMOD(X) ((u_int32_t)(ptrdiff_t)(X)&0x1) +#define ISMOD(X) ((uint32_t)(ptrdiff_t)(X)&0x1) #define DOMOD(X) ((X) = (char *)((ptrdiff_t)(X)|0x1)) -#define ISDISK(X) ((u_int32_t)(ptrdiff_t)(X)&0x2) +#define ISDISK(X) ((uint32_t)(ptrdiff_t)(X)&0x2) #define DODISK(X) ((X) = (char *)((ptrdiff_t)(X)|0x2)) #define BITS_PER_MAP 32 @@ -162,9 +162,9 @@ #define SPLITSHIFT 11 #define SPLITMASK 0x7FF -#define SPLITNUM(N) (((u_int32_t)(N)) >> SPLITSHIFT) +#define SPLITNUM(N) (((uint32_t)(N)) >> SPLITSHIFT) #define OPAGENUM(N) ((N) & SPLITMASK) -#define OADDR_OF(S,O) ((u_int32_t)((u_int32_t)(S) << SPLITSHIFT) + (O)) +#define OADDR_OF(S,O) ((uint32_t)((uint32_t)(S) << SPLITSHIFT) + (O)) #define BUCKET_TO_PAGE(B) \ (B) + hashp->HDRPAGES + ((B) ? hashp->SPARES[__log2((B)+1)-1] : 0) diff --git a/src/lib/libc_bsd/db/hash/hash_bigkey.c b/src/lib/libc_bsd/db/hash/hash_bigkey.c index 6f5de0a..8a58c8b 100644 --- a/src/lib/libc_bsd/db/hash/hash_bigkey.c +++ b/src/lib/libc_bsd/db/hash/hash_bigkey.c @@ -554,12 +554,12 @@ BUFHEAD *np, /* Pointer to new bucket page */ BUFHEAD *big_keyp, /* Pointer to first page containing the big key/data */ int addr, /* Address of big_keyp */ - u_int32_t obucket, /* Old Bucket */ + uint32_t obucket, /* Old Bucket */ SPLIT_RETURN *ret) { BUFHEAD *bp, *tmpp; DBT key, val; - u_int32_t change; + uint32_t change; u_int16_t free_space, n, off, *tp; bp = big_keyp; diff --git a/src/lib/libc_bsd/db/hash/hash_buf.c b/src/lib/libc_bsd/db/hash/hash_buf.c index 7b54275..350962b 100644 --- a/src/lib/libc_bsd/db/hash/hash_buf.c +++ b/src/lib/libc_bsd/db/hash/hash_buf.c @@ -68,7 +68,7 @@ #include "page.h" #include "extern.h" -static BUFHEAD *newbuf(HTAB *, u_int32_t, BUFHEAD *); +static BUFHEAD *newbuf(HTAB *, uint32_t, BUFHEAD *); /* Unlink B from its place in the lru */ #define BUF_REMOVE(B) { \ @@ -100,12 +100,12 @@ * address you are seeking. */ BUFHEAD * -__get_buf(HTAB *hashp, u_int32_t addr, +__get_buf(HTAB *hashp, uint32_t addr, BUFHEAD *prev_bp, /* If prev_bp set, indicates a new overflow page. */ int newpage) { BUFHEAD *bp; - u_int32_t is_disk_mask; + uint32_t is_disk_mask; int is_disk, segment_ndx; SEGMENT segp; @@ -153,7 +153,7 @@ * If newbuf finds an error (returning NULL), it also sets errno. */ static BUFHEAD * -newbuf(HTAB *hashp, u_int32_t addr, BUFHEAD *prev_bp) +newbuf(HTAB *hashp, uint32_t addr, BUFHEAD *prev_bp) { BUFHEAD *bp; /* The buffer we're going to use */ BUFHEAD *xbp; /* Temp pointer */ diff --git a/src/lib/libc_bsd/db/hash/hash_func.c b/src/lib/libc_bsd/db/hash/hash_func.c index e8f79a2..3fee52c 100644 --- a/src/lib/libc_bsd/db/hash/hash_func.c +++ b/src/lib/libc_bsd/db/hash/hash_func.c @@ -44,14 +44,14 @@ #include "extern.h" #ifdef notdef -static u_int32_t hash1(const void *, size_t) __unused; -static u_int32_t hash2(const void *, size_t) __unused; -static u_int32_t hash3(const void *, size_t) __unused; +static uint32_t hash1(const void *, size_t) __unused; +static uint32_t hash2(const void *, size_t) __unused; +static uint32_t hash3(const void *, size_t) __unused; #endif -static u_int32_t hash4(const void *, size_t); +static uint32_t hash4(const void *, size_t); /* Default hash function. */ -u_int32_t (*__default_hash)(const void *, size_t) = hash4; +uint32_t (*__default_hash)(const void *, size_t) = hash4; #ifdef notdef /* @@ -63,10 +63,10 @@ #define PRIME1 37 #define PRIME2 1048583 -u_int32_t +uint32_t hash1(const void *key, size_t len) { - u_int32_t h; + uint32_t h; u_int8_t *k; h = 0; @@ -83,10 +83,10 @@ */ #define dcharhash(h, c) ((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c)) -u_int32_t +uint32_t hash2(const void *key, size_t len) { - u_int32_t h; + uint32_t h; u_int8_t *e, c, *k; k = (u_int8_t *)key; @@ -109,10 +109,10 @@ * * Ozan Yigit's original sdbm hash. */ -u_int32_t +uint32_t hash3(const void *key, size_t len) { - u_int32_t n, loop; + uint32_t n, loop; u_int8_t *k; #define HASHC n = *k++ + 65599 * n @@ -149,10 +149,10 @@ #endif /* notdef */ /* Chris Torek's hash function. */ -u_int32_t +uint32_t hash4(const void *key, size_t len) { - u_int32_t h, loop; + uint32_t h, loop; const u_int8_t *k; #define HASH4a h = (h << 5) - h + *k++; diff --git a/src/lib/libc_bsd/db/hash/hash_log2.c b/src/lib/libc_bsd/db/hash/hash_log2.c index b24b3cb..d53a2cb 100644 --- a/src/lib/libc_bsd/db/hash/hash_log2.c +++ b/src/lib/libc_bsd/db/hash/hash_log2.c @@ -41,10 +41,10 @@ #include "page.h" #include "extern.h" -u_int32_t -__log2(u_int32_t num) +uint32_t +__log2(uint32_t num) { - u_int32_t i, limit; + uint32_t i, limit; limit = 1; for (i = 0; limit < num; limit = limit << 1, i++); diff --git a/src/lib/libc_bsd/db/hash/hash_page.c b/src/lib/libc_bsd/db/hash/hash_page.c index 4d0adbd..ecdac2c 100644 --- a/src/lib/libc_bsd/db/hash/hash_page.c +++ b/src/lib/libc_bsd/db/hash/hash_page.c @@ -73,13 +73,13 @@ #include "page.h" #include "extern.h" -static u_int32_t *fetch_bitmap(HTAB *, int); -static u_int32_t first_free(u_int32_t); +static uint32_t *fetch_bitmap(HTAB *, int); +static uint32_t first_free(uint32_t); static int open_temp(HTAB *); static u_int16_t overflow_page(HTAB *); static void putpair(char *, const DBT *, const DBT *); static void squeeze_key(u_int16_t *, const DBT *, const DBT *); -static int ugly_split(HTAB *, u_int32_t, BUFHEAD *, BUFHEAD *, int, int); +static int ugly_split(HTAB *, uint32_t, BUFHEAD *, BUFHEAD *, int, int); #define PAGE_INIT(P) { \ ((u_int16_t *)(P))[0] = 0; \ @@ -180,7 +180,7 @@ * -1 ==> Error */ int -__split_page(HTAB *hashp, u_int32_t obucket, u_int32_t nbucket) +__split_page(HTAB *hashp, uint32_t obucket, uint32_t nbucket) { BUFHEAD *new_bufp, *old_bufp; u_int16_t *ino; @@ -275,7 +275,7 @@ */ static int ugly_split(HTAB *hashp, - u_int32_t obucket, /* Same as __split_page. */ + uint32_t obucket, /* Same as __split_page. */ BUFHEAD *old_bufp, BUFHEAD *new_bufp, int copyto, /* First byte on page which contains key/data values. */ @@ -515,7 +515,7 @@ * -1 indicates FAILURE */ int -__get_page(HTAB *hashp, char *p, u_int32_t bucket, int is_bucket, int is_disk, +__get_page(HTAB *hashp, char *p, uint32_t bucket, int is_bucket, int is_disk, int is_bitmap) { int fd, page, size, rsize; @@ -570,7 +570,7 @@ * -1 ==>failure */ int -__put_page(HTAB *hashp, char *p, u_int32_t bucket, int is_bucket, int is_bitmap) +__put_page(HTAB *hashp, char *p, uint32_t bucket, int is_bucket, int is_bitmap) { int fd, page, size, wsize; @@ -614,10 +614,10 @@ int __ibitmap(HTAB *hashp, int pnum, int nbits, int ndx) { - u_int32_t *ip; + uint32_t *ip; int clearbytes, clearints; - if ((ip = (u_int32_t *)malloc(hashp->BSIZE)) == NULL) + if ((ip = (uint32_t *)malloc(hashp->BSIZE)) == NULL) return (1); hashp->nmaps++; clearints = ((nbits - 1) >> INT_BYTE_SHIFT) + 1; @@ -632,10 +632,10 @@ return (0); } -static u_int32_t -first_free(u_int32_t map) +static uint32_t +first_free(uint32_t map) { - u_int32_t i, mask; + uint32_t i, mask; mask = 0x1; for (i = 0; i < BITS_PER_MAP; i++) { @@ -649,7 +649,7 @@ static u_int16_t overflow_page(HTAB *hashp) { - u_int32_t *freep; + uint32_t *freep; int max_free, offset, splitnum; u_int16_t addr; int bit, first_page, free_bit, free_page, i, in_use_bits, j; @@ -665,7 +665,7 @@ /* Look through all the free maps to find the first free block */ first_page = hashp->LAST_FREED >>(hashp->BSHIFT + BYTE_SHIFT); for ( i = first_page; i <= free_page; i++ ) { - if (!(freep = (u_int32_t *)hashp->mapp[i]) && + if (!(freep = (uint32_t *)hashp->mapp[i]) && !(freep = fetch_bitmap(hashp, i))) return (0); if (i == free_page) @@ -803,7 +803,7 @@ __free_ovflpage(HTAB *hashp, BUFHEAD *obufp) { u_int16_t addr; - u_int32_t *freep; + uint32_t *freep; int bit_address, free_page, free_bit; u_int16_t ndx; @@ -898,12 +898,12 @@ OFFSET(sp) = off; } -static u_int32_t * +static uint32_t * fetch_bitmap(HTAB *hashp, int ndx) { if (ndx >= hashp->nmaps) return (NULL); - if ((hashp->mapp[ndx] = (u_int32_t *)malloc(hashp->BSIZE)) == NULL) + if ((hashp->mapp[ndx] = (uint32_t *)malloc(hashp->BSIZE)) == NULL) return (NULL); if (__get_page(hashp, (char *)hashp->mapp[ndx], hashp->BITMAPS[ndx], 0, 1, 1)) { diff --git a/src/lib/libc_bsd/db/recno/extern.h b/src/lib/libc_bsd/db/recno/extern.h index 6b8949c..6313247 100644 --- a/src/lib/libc_bsd/db/recno/extern.h +++ b/src/lib/libc_bsd/db/recno/extern.h @@ -34,7 +34,7 @@ int __rec_close(DB *); int __rec_delete(const DB *, const DBT *, u_int); -int __rec_dleaf(BTREE *, PAGE *, u_int32_t); +int __rec_dleaf(BTREE *, PAGE *, uint32_t); int __rec_fd(const DB *); int __rec_fmap(BTREE *, recno_t); int __rec_fout(BTREE *); diff --git a/src/lib/libc_bsd/db/recno/rec_delete.c b/src/lib/libc_bsd/db/recno/rec_delete.c index 5bf6d13..04903cb 100644 --- a/src/lib/libc_bsd/db/recno/rec_delete.c +++ b/src/lib/libc_bsd/db/recno/rec_delete.c @@ -144,11 +144,11 @@ * RET_SUCCESS, RET_ERROR. */ int -__rec_dleaf(BTREE *t, PAGE *h, u_int32_t idx) +__rec_dleaf(BTREE *t, PAGE *h, uint32_t idx) { RLEAF *rl; indx_t *ip, cnt, offset; - u_int32_t nbytes; + uint32_t nbytes; char *from; void *to; diff --git a/src/lib/libc_bsd/db/recno/rec_put.c b/src/lib/libc_bsd/db/recno/rec_put.c index 4d940fc..0e3a15c 100644 --- a/src/lib/libc_bsd/db/recno/rec_put.c +++ b/src/lib/libc_bsd/db/recno/rec_put.c @@ -193,7 +193,7 @@ PAGE *h; indx_t idx, nxtindex; pgno_t pg; - u_int32_t nbytes; + uint32_t nbytes; int dflags, status; char *dest, db[NOVFLSIZE]; @@ -209,7 +209,7 @@ tdata.data = db; tdata.size = NOVFLSIZE; *(pgno_t *)db = pg; - *(u_int32_t *)(db + sizeof(pgno_t)) = data->size; + *(uint32_t *)(db + sizeof(pgno_t)) = data->size; dflags = P_BIGDATA; data = &tdata; } else @@ -251,7 +251,7 @@ * the offset array, shift the pointers up. */ nbytes = NRLEAFDBT(data->size); - if ((u_int32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) { + if ((uint32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) { status = __bt_split(t, h, NULL, data, dflags, nbytes, idx); if (status == RET_SUCCESS) ++t->bt_nrecs; diff --git a/src/lib/libc_bsd/gen/arc4random.c b/src/lib/libc_bsd/gen/arc4random.c index fee62a6..a1acf85 100644 --- a/src/lib/libc_bsd/gen/arc4random.c +++ b/src/lib/libc_bsd/gen/arc4random.c @@ -202,10 +202,10 @@ return (rs.s[(si + sj) & 0xff]); } -static inline u_int32_t +static inline uint32_t arc4_getword(void) { - u_int32_t val; + uint32_t val; val = arc4_getbyte() << 24; val |= arc4_getbyte() << 16; val |= arc4_getbyte() << 8; @@ -231,10 +231,10 @@ _ARC4_UNLOCK(); } -u_int32_t +uint32_t arc4random(void) { - u_int32_t val; + uint32_t val; _ARC4_LOCK(); arc4_count -= 4; arc4_stir_if_needed(); @@ -267,10 +267,10 @@ * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound) * after reduction modulo upper_bound. */ -u_int32_t -arc4random_uniform(u_int32_t upper_bound) +uint32_t +arc4random_uniform(uint32_t upper_bound) { - u_int32_t r, min; + uint32_t r, min; if (upper_bound < 2) return 0; diff --git a/src/lib/libc_bsd/gen/disklabel.c b/src/lib/libc_bsd/gen/disklabel.c index 0dfa131..0a47ed9 100644 --- a/src/lib/libc_bsd/gen/disklabel.c +++ b/src/lib/libc_bsd/gen/disklabel.c @@ -69,7 +69,7 @@ char *cp, *cq; /* can't be register */ char p, max, psize[3], pbsize[3], pfsize[3], poffset[3], ptype[3]; - u_int32_t *dx; + uint32_t *dx; if (cgetent(&buf, db_array, (char *) name) < 0) return NULL; diff --git a/src/lib/libc_bsd/gen/ldexp.c b/src/lib/libc_bsd/gen/ldexp.c index e103988..e6da2e3 100644 --- a/src/lib/libc_bsd/gen/ldexp.c +++ b/src/lib/libc_bsd/gen/ldexp.c @@ -27,8 +27,8 @@ double value; struct { - u_int32_t msw; - u_int32_t lsw; + uint32_t msw; + uint32_t lsw; } parts; } ieee_double_shape_type; @@ -41,8 +41,8 @@ double value; struct { - u_int32_t lsw; - u_int32_t msw; + uint32_t lsw; + uint32_t msw; } parts; } ieee_double_shape_type; @@ -87,7 +87,7 @@ static double _copysign(double x, double y) { - u_int32_t hx,hy; + uint32_t hx,hy; GET_HIGH_WORD(hx,x); GET_HIGH_WORD(hy,y); SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000)); diff --git a/src/lib/libc_bsd/gen/modf.c b/src/lib/libc_bsd/gen/modf.c index eaa251f..a6d6db8 100644 --- a/src/lib/libc_bsd/gen/modf.c +++ b/src/lib/libc_bsd/gen/modf.c @@ -36,8 +36,8 @@ double value; struct { - u_int32_t msw; - u_int32_t lsw; + uint32_t msw; + uint32_t lsw; } parts; } ieee_double_shape_type; @@ -50,8 +50,8 @@ double value; struct { - u_int32_t lsw; - u_int32_t msw; + uint32_t lsw; + uint32_t msw; } parts; } ieee_double_shape_type; @@ -92,7 +92,7 @@ modf(double x, double *iptr) { int32_t i0,i1,j0; - u_int32_t i; + uint32_t i; EXTRACT_WORDS(i0,i1,x); j0 = ((i0>>20)&0x7ff)-0x3ff; /* exponent of x */ if(j0<20) { /* integer part in high x */ @@ -102,7 +102,7 @@ } else { i = (0x000fffff)>>j0; if(((i0&i)|i1)==0) { /* x is integral */ - u_int32_t high; + uint32_t high; *iptr = x; GET_HIGH_WORD(high,x); INSERT_WORDS(x,high&0x80000000,0); /* return +-0 */ @@ -113,7 +113,7 @@ } } } else if (j0>51) { /* no fraction part */ - u_int32_t high; + uint32_t high; if (j0 == 0x400) { /* inf/NaN */ *iptr = x; return 0.0 / x; @@ -123,9 +123,9 @@ INSERT_WORDS(x,high&0x80000000,0); /* return +-0 */ return x; } else { /* fraction part in low x */ - i = ((u_int32_t)(0xffffffff))>>(j0-20); + i = ((uint32_t)(0xffffffff))>>(j0-20); if((i1&i)==0) { /* x is integral */ - u_int32_t high; + uint32_t high; *iptr = x; GET_HIGH_WORD(high,x); INSERT_WORDS(x,high&0x80000000,0); /* return +-0 */ diff --git a/src/lib/libc_bsd/gen/sem.c b/src/lib/libc_bsd/gen/sem.c index b9fb94f..bf2472a 100644 --- a/src/lib/libc_bsd/gen/sem.c +++ b/src/lib/libc_bsd/gen/sem.c @@ -77,12 +77,12 @@ * Old semaphore definitions. */ struct sem { -#define SEM_MAGIC ((u_int32_t) 0x09fa4012) - u_int32_t magic; +#define SEM_MAGIC ((uint32_t) 0x09fa4012) + uint32_t magic; pthread_mutex_t lock; pthread_cond_t gtzero; - u_int32_t count; - u_int32_t nwaiters; + uint32_t count; + uint32_t nwaiters; #define SEM_USER (NULL) semid_t semid; /* semaphore id if kernel (shared) semaphore */ int syssem; /* 1 if kernel (shared) semaphore */ @@ -156,7 +156,7 @@ return (NULL); } - sem->count = (u_int32_t)value; + sem->count = (uint32_t)value; sem->nwaiters = 0; sem->magic = SEM_MAGIC; sem->semid = semid; diff --git a/src/lib/libc_bsd/gen/sem_new.c b/src/lib/libc_bsd/gen/sem_new.c index ddf14f7..e6789a2 100644 --- a/src/lib/libc_bsd/gen/sem_new.c +++ b/src/lib/libc_bsd/gen/sem_new.c @@ -61,7 +61,7 @@ __weak_reference(_sem_wait, sem_wait); #define SEM_PREFIX "/tmp/SEMD" -#define SEM_MAGIC ((u_int32_t)0x73656d31) +#define SEM_MAGIC ((uint32_t)0x73656d31) struct sem_nameinfo { int open_count; @@ -130,7 +130,7 @@ bzero(sem, sizeof(sem_t)); sem->_magic = SEM_MAGIC; - sem->_kern._count = (u_int32_t)value; + sem->_kern._count = (uint32_t)value; sem->_kern._has_waiters = 0; sem->_kern._flags = pshared ? USYNC_PROCESS_SHARED : 0; return (0); diff --git a/src/lib/libc_bsd/net/getaddrinfo.c b/src/lib/libc_bsd/net/getaddrinfo.c index 0b3bc43..c966f40 100644 --- a/src/lib/libc_bsd/net/getaddrinfo.c +++ b/src/lib/libc_bsd/net/getaddrinfo.c @@ -199,7 +199,7 @@ struct sockaddr aiou_sa; } aio_src_un; #define aio_srcsa aio_src_un.aiou_sa - u_int32_t aio_srcflag; + uint32_t aio_srcflag; int aio_srcscope; int aio_dstscope; struct policyqueue *aio_srcpolicy; @@ -254,7 +254,7 @@ static void set_source(struct ai_order *, struct policyhead *); static int comp_dst(const void *, const void *); #ifdef INET6 -static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *); +static int ip6_str2scopeid(char *, struct sockaddr_in6 *, uint32_t *); #endif static int gai_addr2scopetype(struct sockaddr *); @@ -855,7 +855,7 @@ #ifdef INET6 if (ai.ai_family == AF_INET6) { struct in6_ifreq ifr6; - u_int32_t flags6; + uint32_t flags6; memset(&ifr6, 0, sizeof(ifr6)); memcpy(&ifr6.ifr_addr, ai.ai_addr, ai.ai_addrlen); @@ -1274,7 +1274,7 @@ error = explore_numeric(pai, addr, servname, res, hostname); if (error == 0) { - u_int32_t scopeid; + uint32_t scopeid; for (cur = *res; cur; cur = cur->ai_next) { if (cur->ai_family != AF_INET6) @@ -1343,7 +1343,7 @@ fp_str = getenv("GAI"); if (fp_str && inet_pton(AF_INET6, fp_str, &faith_prefix) == 1 && afd->a_af == AF_INET && pai->ai_socktype == SOCK_STREAM) { - u_int32_t v4a; + uint32_t v4a; u_int8_t v4a_top; memcpy(&v4a, addr, sizeof v4a); @@ -1620,7 +1620,7 @@ /* convert a string to a scope identifier. XXX: IPv6 specific */ static int -ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, u_int32_t *scopeid) +ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, uint32_t *scopeid) { u_long lscopeid; struct in6_addr *a6; @@ -1657,7 +1657,7 @@ trynumeric: errno = 0; lscopeid = strtoul(scope, &ep, 10); - *scopeid = (u_int32_t)(lscopeid & 0xffffffffUL); + *scopeid = (uint32_t)(lscopeid & 0xffffffffUL); if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid) return 0; else diff --git a/src/lib/libc_bsd/net/getnameinfo.c b/src/lib/libc_bsd/net/getnameinfo.c index 53a25da..7ba4971 100644 --- a/src/lib/libc_bsd/net/getnameinfo.c +++ b/src/lib/libc_bsd/net/getnameinfo.c @@ -126,7 +126,7 @@ u_short port; int family, i; const char *addr; - u_int32_t v4a; + uint32_t v4a; int h_error; char numserv[512]; char numaddr[512]; @@ -178,7 +178,7 @@ switch (sa->sa_family) { case AF_INET: - v4a = (u_int32_t) + v4a = (uint32_t) ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr); if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a)) flags |= NI_NUMERICHOST; diff --git a/src/lib/libc_bsd/net/name6.c b/src/lib/libc_bsd/net/name6.c index fe5ffd2..7849c3b 100644 --- a/src/lib/libc_bsd/net/name6.c +++ b/src/lib/libc_bsd/net/name6.c @@ -174,7 +174,7 @@ struct sockaddr aiou_sa; } aio_src_un; #define aio_srcsa aio_src_un.aiou_sa - u_int32_t aio_srcflag; + uint32_t aio_srcflag; int aio_srcscope; int aio_dstscope; struct policyqueue *aio_srcpolicy; @@ -884,7 +884,7 @@ #ifdef INET6 if (ss.ss_family == AF_INET6) { struct in6_ifreq ifr6; - u_int32_t flags6; + uint32_t flags6; memset(&ifr6, 0, sizeof(ifr6)); memcpy(&ifr6.ifr_addr, &ss, ss.ss_len); diff --git a/src/lib/libc_bsd/net/rcmd.c b/src/lib/libc_bsd/net/rcmd.c index cc28e00..cf6efac 100644 --- a/src/lib/libc_bsd/net/rcmd.c +++ b/src/lib/libc_bsd/net/rcmd.c @@ -64,7 +64,7 @@ #define max(a, b) ((a > b) ? a : b) -int __ivaliduser(FILE *, u_int32_t, const char *, const char *); +int __ivaliduser(FILE *, uint32_t, const char *, const char *); int __ivaliduser_af(FILE *,const void *, const char *, const char *, int, int); int __ivaliduser_sa(FILE *, const struct sockaddr *, socklen_t, const char *, const char *); @@ -522,7 +522,7 @@ int __ivaliduser(hostf, raddr, luser, ruser) FILE *hostf; - u_int32_t raddr; + uint32_t raddr; const char *luser, *ruser; { struct sockaddr_in sin; diff --git a/src/lib/libc_bsd/nls/msgcat.c b/src/lib/libc_bsd/nls/msgcat.c index 102c874..c730aba 100644 --- a/src/lib/libc_bsd/nls/msgcat.c +++ b/src/lib/libc_bsd/nls/msgcat.c @@ -277,29 +277,29 @@ /* binary search, see knuth algorithm b */ l = 0; - u = ntohl((u_int32_t)cat_hdr->__nsets) - 1; + u = ntohl((uint32_t)cat_hdr->__nsets) - 1; while (l <= u) { i = (l + u) / 2; - r = set_id - ntohl((u_int32_t)set_hdr[i].__setno); + r = set_id - ntohl((uint32_t)set_hdr[i].__setno); if (r == 0) { msg_hdr = (struct _nls_msg_hdr *) (void *)((char *)catd->__data + sizeof(struct _nls_cat_hdr) + - ntohl((u_int32_t)cat_hdr->__msg_hdr_offset)); + ntohl((uint32_t)cat_hdr->__msg_hdr_offset)); - l = ntohl((u_int32_t)set_hdr[i].__index); - u = l + ntohl((u_int32_t)set_hdr[i].__nmsgs) - 1; + l = ntohl((uint32_t)set_hdr[i].__index); + u = l + ntohl((uint32_t)set_hdr[i].__nmsgs) - 1; while (l <= u) { i = (l + u) / 2; r = msg_id - - ntohl((u_int32_t)msg_hdr[i].__msgno); + ntohl((uint32_t)msg_hdr[i].__msgno); if (r == 0) { return ((char *) catd->__data + sizeof(struct _nls_cat_hdr) + - ntohl((u_int32_t) + ntohl((uint32_t) cat_hdr->__msg_txt_offset) + - ntohl((u_int32_t) + ntohl((uint32_t) msg_hdr[i].__offset)); } else if (r < 0) { u = i - 1; @@ -417,7 +417,7 @@ } _close(fd); - if (ntohl((u_int32_t)((struct _nls_cat_hdr *)data)->__magic) != + if (ntohl((uint32_t)((struct _nls_cat_hdr *)data)->__magic) != _NLS_MAGIC) { munmap(data, (size_t)st.st_size); SAVEFAIL(name, lang, EFTYPE); diff --git a/src/lib/libc_bsd/resolv/res_comp.c b/src/lib/libc_bsd/resolv/res_comp.c index 7f21dac..f29f70e 100644 --- a/src/lib/libc_bsd/resolv/res_comp.c +++ b/src/lib/libc_bsd/resolv/res_comp.c @@ -257,10 +257,10 @@ #pragma weak putshort = __putshort #endif /* SOLARIS2 */ -void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); } +void __putlong(uint32_t src, u_char *dst) { ns_put32(src, dst); } void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); } #ifndef __ultrix__ -u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); } +uint32_t _getlong(const u_char *src) { return (ns_get32(src)); } u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); } #endif /*__ultrix__*/ #endif /*BIND_4_COMPAT*/ diff --git a/src/lib/libc_bsd/resolv/res_debug.c b/src/lib/libc_bsd/resolv/res_debug.c index c088572..a32e354 100644 --- a/src/lib/libc_bsd/resolv/res_debug.c +++ b/src/lib/libc_bsd/resolv/res_debug.c @@ -188,7 +188,7 @@ p_class(ns_rr_class(rr))); else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) { u_int16_t optcode, optlen, rdatalen = ns_rr_rdlen(rr); - u_int32_t ttl = ns_rr_ttl(rr); + uint32_t ttl = ns_rr_ttl(rr); fprintf(file, "; EDNS: version: %u, udp=%u, flags=%04x\n", @@ -704,7 +704,7 @@ * Return a mnemonic for a time to live. */ const char * -p_time(u_int32_t value) { +p_time(uint32_t value) { char *nbuf = p_time_nbuf; if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0) @@ -815,10 +815,10 @@ } /*% converts ascii lat/lon to unsigned encoded 32-bit number. moves pointer. */ -static u_int32_t +static uint32_t latlon2ul(const char **latlonstrptr, int *which) { const char *cp; - u_int32_t retval; + uint32_t retval; int deg = 0, min = 0, secs = 0, secsfrac = 0; cp = *latlonstrptr; @@ -919,8 +919,8 @@ const char *cp, *maxcp; u_char *bcp; - u_int32_t latit = 0, longit = 0, alt = 0; - u_int32_t lltemp1 = 0, lltemp2 = 0; + uint32_t latit = 0, longit = 0, alt = 0; + uint32_t lltemp1 = 0, lltemp2 = 0; int altmeters = 0, altfrac = 0, altsign = 1; u_int8_t hp = 0x16; /*%< default = 1e6 cm = 10000.00m = 10km */ u_int8_t vp = 0x13; /*%< default = 1e3 cm = 10.00m */ @@ -1038,10 +1038,10 @@ const char *altsign; int altmeters, altfrac; - const u_int32_t referencealt = 100000 * 100; + const uint32_t referencealt = 100000 * 100; int32_t latval, longval, altval; - u_int32_t templ; + uint32_t templ; u_int8_t sizeval, hpval, vpval, versionval; char *sizestr, *hpstr, *vpstr; diff --git a/src/lib/libc_bsd/resolv/res_init.c b/src/lib/libc_bsd/resolv/res_init.c index cf95fd6..cce51e7 100644 --- a/src/lib/libc_bsd/resolv/res_init.c +++ b/src/lib/libc_bsd/resolv/res_init.c @@ -126,7 +126,7 @@ #ifdef RESOLVSORT static const char sort_mask[] = "/&"; #define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL) -static u_int32_t net_mask(struct in_addr); +static uint32_t net_mask(struct in_addr); #endif #if !defined(isascii) /*%< XXX - could be a function */ @@ -503,9 +503,9 @@ } } statp->sort_list[nsort].addr.s_addr = - (u_int32_t)0xffffffff; + (uint32_t)0xffffffff; statp->sort_list[nsort].mask = - (u_int32_t)0xffffffff; + (uint32_t)0xffffffff; nsort++; } *cp = n; @@ -717,11 +717,11 @@ #ifdef RESOLVSORT /* XXX - should really support CIDR which means explicit masks always. */ -static u_int32_t +static uint32_t net_mask(in) /*!< XXX - should really use system's version of this */ struct in_addr in; { - u_int32_t i = ntohl(in.s_addr); + uint32_t i = ntohl(in.s_addr); if (IN_CLASSA(i)) return (htonl(IN_CLASSA_NET)); @@ -737,7 +737,7 @@ res_rndinit(res_state statp) { struct timeval now; - u_int32_t u32; + uint32_t u32; u_int16_t u16; u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd; diff --git a/src/lib/libc_bsd/resolv/res_mkupdate.c b/src/lib/libc_bsd/resolv/res_mkupdate.c index 12896af..4b3a4bf 100644 --- a/src/lib/libc_bsd/resolv/res_mkupdate.c +++ b/src/lib/libc_bsd/resolv/res_mkupdate.c @@ -102,7 +102,7 @@ u_char buf3[MAXDNAME]; int section, numrrs = 0, counts[ns_s_max]; u_int16_t rtype, rclass; - u_int32_t n1, rttl; + uint32_t n1, rttl; u_char *dnptrs[20], **dpp, **lastdnptr; #ifndef _LIBC int siglen; @@ -469,7 +469,7 @@ #else { int sig_type, success, dateerror; - u_int32_t exptime, timesigned; + uint32_t exptime, timesigned; /* type */ if ((n = getword_str(buf2, sizeof buf2, @@ -502,7 +502,7 @@ } else { char *ulendp; - u_int32_t ottl; + uint32_t ottl; errno = 0; ottl = strtoul(buf2, &ulendp, 10); diff --git a/src/lib/libc_bsd/rpc/clnt_bcast.c b/src/lib/libc_bsd/rpc/clnt_bcast.c index 219ea3a..431748f 100644 --- a/src/lib/libc_bsd/rpc/clnt_bcast.c +++ b/src/lib/libc_bsd/rpc/clnt_bcast.c @@ -551,15 +551,15 @@ stat = RPC_CANTRECV; continue; } - if (inlen < sizeof (u_int32_t)) + if (inlen < sizeof (uint32_t)) continue; /* Drop that and go ahead */ /* * see if reply transaction id matches sent id. * If so, decode the results. If return id is xid + 1 * it was a PORTMAP reply */ - if (*((u_int32_t *)(void *)(inbuf)) == - *((u_int32_t *)(void *)(outbuf))) { + if (*((uint32_t *)(void *)(inbuf)) == + *((uint32_t *)(void *)(outbuf))) { pmap_reply_flag = 0; msg.acpted_rply.ar_verf = _null_auth; msg.acpted_rply.ar_results.where = @@ -568,8 +568,8 @@ (xdrproc_t)xdr_rpcb_rmtcallres; #ifdef PORTMAP } else if (pmap_flag && - *((u_int32_t *)(void *)(inbuf)) == - *((u_int32_t *)(void *)(outbuf_pmap))) { + *((uint32_t *)(void *)(inbuf)) == + *((uint32_t *)(void *)(outbuf_pmap))) { pmap_reply_flag = 1; msg.acpted_rply.ar_verf = _null_auth; msg.acpted_rply.ar_results.where = diff --git a/src/lib/libc_bsd/rpc/clnt_dg.c b/src/lib/libc_bsd/rpc/clnt_dg.c index b77f4f3..c71e03c 100644 --- a/src/lib/libc_bsd/rpc/clnt_dg.c +++ b/src/lib/libc_bsd/rpc/clnt_dg.c @@ -330,7 +330,7 @@ socklen_t inlen, salen; ssize_t recvlen = 0; int kin_len, n, rpc_lock_value; - u_int32_t xid; + uint32_t xid; outlen = 0; sigfillset(&newmask); @@ -389,9 +389,9 @@ * XXX Yes, and it's in network byte order, so we should to * be careful when we increment it, shouldn't we. */ - xid = ntohl(*(u_int32_t *)(void *)(cu->cu_outhdr)); + xid = ntohl(*(uint32_t *)(void *)(cu->cu_outhdr)); xid++; - *(u_int32_t *)(void *)(cu->cu_outhdr) = htonl(xid); + *(uint32_t *)(void *)(cu->cu_outhdr) = htonl(xid); call_again_same_xid: xdrs = &(cu->cu_outxdrs); xdrs->x_op = XDR_ENCODE; @@ -477,10 +477,10 @@ cu->cu_error.re_status = RPC_CANTRECV; goto out; } - if (recvlen >= sizeof(u_int32_t) && + if (recvlen >= sizeof(uint32_t) && (cu->cu_async == TRUE || - *((u_int32_t *)(void *)(cu->cu_inbuf)) == - *((u_int32_t *)(void *)(cu->cu_outbuf)))) { + *((uint32_t *)(void *)(cu->cu_inbuf)) == + *((uint32_t *)(void *)(cu->cu_outbuf)))) { /* We now assume we have the proper reply. */ break; } @@ -732,14 +732,14 @@ * first element in the call structure *. * This will get the xid of the PREVIOUS call */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)cu->cu_outhdr); + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)cu->cu_outhdr); break; case CLSET_XID: /* This will set the xid of the NEXT call */ - *(u_int32_t *)(void *)cu->cu_outhdr = - htonl(*(u_int32_t *)info - 1); + *(uint32_t *)(void *)cu->cu_outhdr = + htonl(*(uint32_t *)info - 1); /* decrement by 1 as clnt_dg_call() increments once */ break; @@ -750,14 +750,14 @@ * begining of the RPC header. MUST be changed if the * call_struct is changed */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)(cu->cu_outhdr + + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)(cu->cu_outhdr + 4 * BYTES_PER_XDR_UNIT)); break; case CLSET_VERS: - *(u_int32_t *)(void *)(cu->cu_outhdr + 4 * BYTES_PER_XDR_UNIT) - = htonl(*(u_int32_t *)info); + *(uint32_t *)(void *)(cu->cu_outhdr + 4 * BYTES_PER_XDR_UNIT) + = htonl(*(uint32_t *)info); break; case CLGET_PROG: @@ -767,14 +767,14 @@ * begining of the RPC header. MUST be changed if the * call_struct is changed */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)(cu->cu_outhdr + + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)(cu->cu_outhdr + 3 * BYTES_PER_XDR_UNIT)); break; case CLSET_PROG: - *(u_int32_t *)(void *)(cu->cu_outhdr + 3 * BYTES_PER_XDR_UNIT) - = htonl(*(u_int32_t *)info); + *(uint32_t *)(void *)(cu->cu_outhdr + 3 * BYTES_PER_XDR_UNIT) + = htonl(*(uint32_t *)info); break; case CLSET_ASYNC: cu->cu_async = *(int *)info; diff --git a/src/lib/libc_bsd/rpc/clnt_raw.c b/src/lib/libc_bsd/rpc/clnt_raw.c index fa19d11..5e9b8cd 100644 --- a/src/lib/libc_bsd/rpc/clnt_raw.c +++ b/src/lib/libc_bsd/rpc/clnt_raw.c @@ -118,8 +118,8 @@ call_msg.rm_direction = CALL; call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION; /* XXX: prog and vers have been long historically :-( */ - call_msg.rm_call.cb_prog = (u_int32_t)prog; - call_msg.rm_call.cb_vers = (u_int32_t)vers; + call_msg.rm_call.cb_prog = (uint32_t)prog; + call_msg.rm_call.cb_vers = (uint32_t)vers; xdrmem_create(xdrs, clp->u.mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE); if (! xdr_callhdr(xdrs, &call_msg)) warnx("clntraw_create - Fatal header serialization error."); diff --git a/src/lib/libc_bsd/rpc/clnt_vc.c b/src/lib/libc_bsd/rpc/clnt_vc.c index 775d1b0..9f3957c 100644 --- a/src/lib/libc_bsd/rpc/clnt_vc.c +++ b/src/lib/libc_bsd/rpc/clnt_vc.c @@ -111,7 +111,7 @@ struct rpc_err ct_error; union { char ct_mcallc[MCALL_MSG_SIZE]; /* marshalled callmsg */ - u_int32_t ct_mcalli; + uint32_t ct_mcalli; } ct_u; u_int ct_mpos; /* pos after marshal */ XDR ct_xdrs; /* XDR stream */ @@ -168,7 +168,7 @@ struct ct_data *ct = NULL; /* client handle */ struct timeval now; struct rpc_msg call_msg; - static u_int32_t disrupt; + static uint32_t disrupt; sigset_t mask; sigset_t newmask; struct sockaddr_storage ss; @@ -176,7 +176,7 @@ struct __rpc_sockinfo si; if (disrupt == 0) - disrupt = (u_int32_t)(long)raddr; + disrupt = (uint32_t)(long)raddr; cl = (CLIENT *)mem_alloc(sizeof (*cl)); ct = (struct ct_data *)mem_alloc(sizeof (*ct)); @@ -266,11 +266,11 @@ * Initialize call message */ (void)gettimeofday(&now, NULL); - call_msg.rm_xid = ((u_int32_t)++disrupt) ^ __RPC_GETXID(&now); + call_msg.rm_xid = ((uint32_t)++disrupt) ^ __RPC_GETXID(&now); call_msg.rm_direction = CALL; call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION; - call_msg.rm_call.cb_prog = (u_int32_t)prog; - call_msg.rm_call.cb_vers = (u_int32_t)vers; + call_msg.rm_call.cb_prog = (uint32_t)prog; + call_msg.rm_call.cb_vers = (uint32_t)vers; /* * pre-serialize the static part of the call msg and stash it away @@ -324,8 +324,8 @@ struct ct_data *ct = (struct ct_data *) cl->cl_private; XDR *xdrs = &(ct->ct_xdrs); struct rpc_msg reply_msg; - u_int32_t x_id; - u_int32_t *msg_x_id = &ct->ct_u.ct_mcalli; /* yuk */ + uint32_t x_id; + uint32_t *msg_x_id = &ct->ct_u.ct_mcalli; /* yuk */ bool_t shipnow; int refreshes = 2; sigset_t mask, newmask; @@ -590,13 +590,13 @@ * first element in the call structure * This will get the xid of the PREVIOUS call */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)&ct->ct_u.ct_mcalli); + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)&ct->ct_u.ct_mcalli); break; case CLSET_XID: /* This will set the xid of the NEXT call */ - *(u_int32_t *)(void *)&ct->ct_u.ct_mcalli = - htonl(*((u_int32_t *)info) + 1); + *(uint32_t *)(void *)&ct->ct_u.ct_mcalli = + htonl(*((uint32_t *)info) + 1); /* increment by 1 as clnt_vc_call() decrements once */ break; case CLGET_VERS: @@ -606,15 +606,15 @@ * begining of the RPC header. MUST be changed if the * call_struct is changed */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc + + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)(ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT)); break; case CLSET_VERS: - *(u_int32_t *)(void *)(ct->ct_u.ct_mcallc + + *(uint32_t *)(void *)(ct->ct_u.ct_mcallc + 4 * BYTES_PER_XDR_UNIT) = - htonl(*(u_int32_t *)info); + htonl(*(uint32_t *)info); break; case CLGET_PROG: @@ -624,15 +624,15 @@ * begining of the RPC header. MUST be changed if the * call_struct is changed */ - *(u_int32_t *)info = - ntohl(*(u_int32_t *)(void *)(ct->ct_u.ct_mcallc + + *(uint32_t *)info = + ntohl(*(uint32_t *)(void *)(ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT)); break; case CLSET_PROG: - *(u_int32_t *)(void *)(ct->ct_u.ct_mcallc + + *(uint32_t *)(void *)(ct->ct_u.ct_mcallc + 3 * BYTES_PER_XDR_UNIT) = - htonl(*(u_int32_t *)info); + htonl(*(uint32_t *)info); break; default: diff --git a/src/lib/libc_bsd/rpc/pmap_clnt.c b/src/lib/libc_bsd/rpc/pmap_clnt.c index 225d427..708f14d 100644 --- a/src/lib/libc_bsd/rpc/pmap_clnt.c +++ b/src/lib/libc_bsd/rpc/pmap_clnt.c @@ -75,7 +75,7 @@ return (FALSE); } snprintf(buf, sizeof buf, "0.0.0.0.%d.%d", - (((u_int32_t)port) >> 8) & 0xff, port & 0xff); + (((uint32_t)port) >> 8) & 0xff, port & 0xff); na = uaddr2taddr(nconf, buf); if (na == NULL) { freenetconfigent(nconf); diff --git a/src/lib/libc_bsd/rpc/rpc_callmsg.c b/src/lib/libc_bsd/rpc/rpc_callmsg.c index ba9f43b..95ce8d6 100644 --- a/src/lib/libc_bsd/rpc/rpc_callmsg.c +++ b/src/lib/libc_bsd/rpc/rpc_callmsg.c @@ -192,14 +192,14 @@ } prm_direction = &cmsg->rm_direction; if ( - xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) && + xdr_uint32_t(xdrs, &(cmsg->rm_xid)) && xdr_enum(xdrs, (enum_t *) prm_direction) && (cmsg->rm_direction == CALL) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && (cmsg->rm_call.cb_rpcvers == RPC_MSG_VERSION) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_prog)) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_vers)) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_proc)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_prog)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_vers)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_proc)) && xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_cred)) ) return (xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_verf))); return (FALSE); diff --git a/src/lib/libc_bsd/rpc/rpc_com.h b/src/lib/libc_bsd/rpc/rpc_com.h index e359c19..ca6e305 100644 --- a/src/lib/libc_bsd/rpc/rpc_com.h +++ b/src/lib/libc_bsd/rpc/rpc_com.h @@ -55,8 +55,8 @@ #define RPC_MAXDATASIZE 9000 #define RPC_MAXADDRSIZE 1024 -#define __RPC_GETXID(now) ((u_int32_t)getpid() ^ (u_int32_t)(now)->tv_sec ^ \ - (u_int32_t)(now)->tv_usec) +#define __RPC_GETXID(now) ((uint32_t)getpid() ^ (uint32_t)(now)->tv_sec ^ \ + (uint32_t)(now)->tv_usec) __BEGIN_DECLS extern u_int __rpc_get_a_size(int); diff --git a/src/lib/libc_bsd/rpc/rpc_generic.c b/src/lib/libc_bsd/rpc/rpc_generic.c index 0be024a..bfe8021 100644 --- a/src/lib/libc_bsd/rpc/rpc_generic.c +++ b/src/lib/libc_bsd/rpc/rpc_generic.c @@ -624,7 +624,7 @@ == NULL) return NULL; port = ntohs(sin->sin_port); - if (asprintf(&ret, "%s.%u.%u", namebuf, ((u_int32_t)port) >> 8, + if (asprintf(&ret, "%s.%u.%u", namebuf, ((uint32_t)port) >> 8, port & 0xff) < 0) return NULL; break; @@ -635,7 +635,7 @@ == NULL) return NULL; port = ntohs(sin6->sin6_port); - if (asprintf(&ret, "%s.%u.%u", namebuf6, ((u_int32_t)port) >> 8, + if (asprintf(&ret, "%s.%u.%u", namebuf6, ((uint32_t)port) >> 8, port & 0xff) < 0) return NULL; break; diff --git a/src/lib/libc_bsd/rpc/rpc_prot.c b/src/lib/libc_bsd/rpc/rpc_prot.c index bfb656c..5212cfd 100644 --- a/src/lib/libc_bsd/rpc/rpc_prot.c +++ b/src/lib/libc_bsd/rpc/rpc_prot.c @@ -125,9 +125,9 @@ return ((*(ar->ar_results.proc))(xdrs, ar->ar_results.where)); case PROG_MISMATCH: - if (! xdr_u_int32_t(xdrs, &(ar->ar_vers.low))) + if (! xdr_uint32_t(xdrs, &(ar->ar_vers.low))) return (FALSE); - return (xdr_u_int32_t(xdrs, &(ar->ar_vers.high))); + return (xdr_uint32_t(xdrs, &(ar->ar_vers.high))); case GARBAGE_ARGS: case SYSTEM_ERR: @@ -160,9 +160,9 @@ switch (rr->rj_stat) { case RPC_MISMATCH: - if (! xdr_u_int32_t(xdrs, &(rr->rj_vers.low))) + if (! xdr_uint32_t(xdrs, &(rr->rj_vers.low))) return (FALSE); - return (xdr_u_int32_t(xdrs, &(rr->rj_vers.high))); + return (xdr_uint32_t(xdrs, &(rr->rj_vers.high))); case AUTH_ERROR: prj_why = &rr->rj_why; @@ -196,7 +196,7 @@ prp_stat = &rmsg->rm_reply.rp_stat; if ( - xdr_u_int32_t(xdrs, &(rmsg->rm_xid)) && + xdr_uint32_t(xdrs, &(rmsg->rm_xid)) && xdr_enum(xdrs, (enum_t *) prm_direction) && (rmsg->rm_direction == REPLY) ) return (xdr_union(xdrs, (enum_t *) prp_stat, @@ -227,11 +227,11 @@ cmsg->rm_call.cb_rpcvers = RPC_MSG_VERSION; if ( (xdrs->x_op == XDR_ENCODE) && - xdr_u_int32_t(xdrs, &(cmsg->rm_xid)) && + xdr_uint32_t(xdrs, &(cmsg->rm_xid)) && xdr_enum(xdrs, (enum_t *) prm_direction) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && - xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_prog)) ) - return (xdr_u_int32_t(xdrs, &(cmsg->rm_call.cb_vers))); + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) && + xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_prog)) ) + return (xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_vers))); return (FALSE); } diff --git a/src/lib/libc_bsd/rpc/rpcb_prot.c b/src/lib/libc_bsd/rpc/rpcb_prot.c index 2540910..dbc1eee 100644 --- a/src/lib/libc_bsd/rpc/rpcb_prot.c +++ b/src/lib/libc_bsd/rpc/rpcb_prot.c @@ -58,10 +58,10 @@ XDR *xdrs; RPCB *objp; { - if (!xdr_u_int32_t(xdrs, &objp->r_prog)) { + if (!xdr_uint32_t(xdrs, &objp->r_prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->r_vers)) { + if (!xdr_uint32_t(xdrs, &objp->r_vers)) { return (FALSE); } if (!xdr_string(xdrs, &objp->r_netid, (u_int)~0)) { @@ -176,7 +176,7 @@ if (!xdr_string(xdrs, &objp->r_nc_netid, (u_int)~0)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->r_nc_semantics)) { + if (!xdr_uint32_t(xdrs, &objp->r_nc_semantics)) { return (FALSE); } if (!xdr_string(xdrs, &objp->r_nc_protofmly, (u_int)~0)) { @@ -255,13 +255,13 @@ buf = XDR_INLINE(xdrs, 3 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->proc)) { + if (!xdr_uint32_t(xdrs, &objp->proc)) { return (FALSE); } } else { @@ -321,7 +321,7 @@ bool_t dummy; void **pp; - if (!xdr_u_int32_t(xdrs, (u_int32_t *) &objp->maxlen)) { + if (!xdr_uint32_t(xdrs, (uint32_t *) &objp->maxlen)) { return (FALSE); } pp = &objp->buf; diff --git a/src/lib/libc_bsd/rpc/rpcb_st_xdr.c b/src/lib/libc_bsd/rpc/rpcb_st_xdr.c index 74b1072..c6f879e 100644 --- a/src/lib/libc_bsd/rpc/rpcb_st_xdr.c +++ b/src/lib/libc_bsd/rpc/rpcb_st_xdr.c @@ -53,10 +53,10 @@ { struct rpcbs_addrlist **pnext; - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } if (!xdr_int(xdrs, &objp->success)) { @@ -93,13 +93,13 @@ if (xdrs->x_op == XDR_ENCODE) { buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->proc)) { + if (!xdr_uint32_t(xdrs, &objp->proc)) { return (FALSE); } if (!xdr_int(xdrs, &objp->success)) { @@ -132,13 +132,13 @@ } else if (xdrs->x_op == XDR_DECODE) { buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->proc)) { + if (!xdr_uint32_t(xdrs, &objp->proc)) { return (FALSE); } if (!xdr_int(xdrs, &objp->success)) { @@ -168,13 +168,13 @@ } return (TRUE); } - if (!xdr_u_int32_t(xdrs, &objp->prog)) { + if (!xdr_uint32_t(xdrs, &objp->prog)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->vers)) { + if (!xdr_uint32_t(xdrs, &objp->vers)) { return (FALSE); } - if (!xdr_u_int32_t(xdrs, &objp->proc)) { + if (!xdr_uint32_t(xdrs, &objp->proc)) { return (FALSE); } if (!xdr_int(xdrs, &objp->success)) { diff --git a/src/lib/libc_bsd/rpc/svc.c b/src/lib/libc_bsd/rpc/svc.c index 6e03283..2e6fda4 100644 --- a/src/lib/libc_bsd/rpc/svc.c +++ b/src/lib/libc_bsd/rpc/svc.c @@ -548,8 +548,8 @@ rply.rm_reply.rp_stat = MSG_ACCEPTED; rply.acpted_rply.ar_verf = xprt->xp_verf; rply.acpted_rply.ar_stat = PROG_MISMATCH; - rply.acpted_rply.ar_vers.low = (u_int32_t)low_vers; - rply.acpted_rply.ar_vers.high = (u_int32_t)high_vers; + rply.acpted_rply.ar_vers.low = (uint32_t)low_vers; + rply.acpted_rply.ar_vers.high = (uint32_t)high_vers; SVC_REPLY(xprt, &rply); } diff --git a/src/lib/libc_bsd/rpc/svc_dg.c b/src/lib/libc_bsd/rpc/svc_dg.c index 9bfe1a0..8217ffb 100644 --- a/src/lib/libc_bsd/rpc/svc_dg.c +++ b/src/lib/libc_bsd/rpc/svc_dg.c @@ -269,7 +269,7 @@ (struct sockaddr *)su->su_srcaddr.buf, &su->su_srcaddr.len); if (rlen == -1 && errno == EINTR) goto again; - if (rlen == -1 || (rlen < (ssize_t)(4 * sizeof (u_int32_t)))) + if (rlen == -1 || (rlen < (ssize_t)(4 * sizeof (uint32_t)))) return (FALSE); if (xprt->xp_rtaddr.len < alen) { if (xprt->xp_rtaddr.len != 0) @@ -490,7 +490,7 @@ /* * Index into cache is xid, proc, vers, prog and address */ - u_int32_t cache_xid; + uint32_t cache_xid; rpcproc_t cache_proc; rpcvers_t cache_vers; rpcprog_t cache_prog; diff --git a/src/lib/libc_bsd/rpc/svc_vc.c b/src/lib/libc_bsd/rpc/svc_vc.c index c2061ff..844130d 100644 --- a/src/lib/libc_bsd/rpc/svc_vc.c +++ b/src/lib/libc_bsd/rpc/svc_vc.c @@ -96,7 +96,7 @@ struct cf_conn { /* kept in xprt->xp_p1 for actual connection */ enum xprt_stat strm_stat; - u_int32_t x_id; + uint32_t x_id; XDR xdrs; char verf_body[MAX_AUTH_BYTES]; u_int sendsize; diff --git a/src/lib/libc_bsd/sparc64/fpu/fpu.c b/src/lib/libc_bsd/sparc64/fpu/fpu.c index fc128c3..2b8a11c 100644 --- a/src/lib/libc_bsd/sparc64/fpu/fpu.c +++ b/src/lib/libc_bsd/sparc64/fpu/fpu.c @@ -116,7 +116,7 @@ #endif #endif /* FPU_DEBUG */ -static int __fpu_execute(struct utrapframe *, struct fpemu *, u_int32_t, +static int __fpu_execute(struct utrapframe *, struct fpemu *, uint32_t, u_long); /* @@ -154,7 +154,7 @@ } fe.fe_fsr = fsr & ~FSR_FTT_MASK; - insn = *(u_int32_t *)uf->uf_pc; + insn = *(uint32_t *)uf->uf_pc; if (IF_OP(insn) != IOP_MISC || (IF_F3_OP3(insn) != INS2_FPop1 && IF_F3_OP3(insn) != INS2_FPop2)) __utrap_panic("bogus FP fault"); @@ -206,8 +206,8 @@ * parameters, and 0 for the other. */ static void -__fpu_mov(struct fpemu *fe, int type, int rd, int rs2, u_int32_t nand, - u_int32_t xor) +__fpu_mov(struct fpemu *fe, int type, int rd, int rs2, uint32_t nand, + uint32_t xor) { if (type == FTYPE_INT || type == FTYPE_SNG) @@ -226,7 +226,7 @@ static __inline void __fpu_ccmov(struct fpemu *fe, int type, int rd, int rs2, - u_int32_t insn, int fcc) + uint32_t insn, int fcc) { if (IF_F4_COND(insn) == fcc) @@ -266,7 +266,7 @@ * multiply two integers this way. */ static int -__fpu_execute(struct utrapframe *uf, struct fpemu *fe, u_int32_t insn, +__fpu_execute(struct utrapframe *uf, struct fpemu *fe, uint32_t insn, u_long tstate) { struct fpn *fp; diff --git a/src/lib/libc_bsd/sparc64/fpu/fpu_explode.c b/src/lib/libc_bsd/sparc64/fpu/fpu_explode.c index 5ee0b01..12d1862 100644 --- a/src/lib/libc_bsd/sparc64/fpu/fpu_explode.c +++ b/src/lib/libc_bsd/sparc64/fpu/fpu_explode.c @@ -263,7 +263,7 @@ int type, reg; { u_int64_t l0, l1; - u_int32_t s; + uint32_t s; if (type == FTYPE_LNG || type == FTYPE_DBL || type == FTYPE_EXT) { l0 = __fpu_getreg64(reg & ~1); diff --git a/src/lib/libc_bsd/sparc64/fpu/fpu_reg.h b/src/lib/libc_bsd/sparc64/fpu/fpu_reg.h index 6d44201..b88016d 100644 --- a/src/lib/libc_bsd/sparc64/fpu/fpu_reg.h +++ b/src/lib/libc_bsd/sparc64/fpu/fpu_reg.h @@ -45,7 +45,7 @@ #define FPU_ST64_SZ 8 /* Typedefs for convenient casts in the functions below. */ -typedef void (fp_ldst32_fn)(u_int32_t *); +typedef void (fp_ldst32_fn)(uint32_t *); typedef void (fp_ldst64_fn)(u_int64_t *); /* @@ -53,10 +53,10 @@ * access the fp registers. They are usually not used more than once, so * cacheing needs not be done here. */ -static __inline u_int32_t +static __inline uint32_t __fpu_getreg(int r) { - u_int32_t rv; + uint32_t rv; ((fp_ldst32_fn *)&__fpu_st32[r * FPU_ST32_SZ])(&rv); return (rv); @@ -72,7 +72,7 @@ } static __inline void -__fpu_setreg(int r, u_int32_t v) +__fpu_setreg(int r, uint32_t v) { ((fp_ldst32_fn *)&__fpu_ld32[r * FPU_LD32_SZ])(&v); diff --git a/src/lib/libc_bsd/stdlib/hcreate.c b/src/lib/libc_bsd/stdlib/hcreate.c index 0866172..8ed2d21 100644 --- a/src/lib/libc_bsd/stdlib/hcreate.c +++ b/src/lib/libc_bsd/stdlib/hcreate.c @@ -82,7 +82,7 @@ #define MAX_BUCKETS ((size_t)1 << MAX_BUCKETS_LG2) /* Default hash function, from db/hash/hash_func.c */ -extern u_int32_t (*__default_hash)(const void *, size_t); +extern uint32_t (*__default_hash)(const void *, size_t); static struct internal_head *htable; static size_t htablesize; diff --git a/src/lib/libc_bsd/xdr/Symbol.map b/src/lib/libc_bsd/xdr/Symbol.map index 868c301..79d4bff 100644 --- a/src/lib/libc_bsd/xdr/Symbol.map +++ b/src/lib/libc_bsd/xdr/Symbol.map @@ -10,7 +10,7 @@ xdr_long; xdr_u_long; xdr_int32_t; - xdr_u_int32_t; + xdr_uint32_t; xdr_short; xdr_u_short; xdr_int16_t; diff --git a/src/lib/libc_bsd/xdr/xdr.c b/src/lib/libc_bsd/xdr/xdr.c index 1a5d299..cbd7e3a 100644 --- a/src/lib/libc_bsd/xdr/xdr.c +++ b/src/lib/libc_bsd/xdr/xdr.c @@ -203,7 +203,7 @@ /* * XDR 32-bit integers - * same as xdr_u_int32_t - open coded to save a proc call! + * same as xdr_uint32_t - open coded to save a proc call! */ bool_t xdr_int32_t(xdrs, int32_p) @@ -237,9 +237,9 @@ * same as xdr_int32_t - open coded to save a proc call! */ bool_t -xdr_u_int32_t(xdrs, u_int32_p) +xdr_uint32_t(xdrs, u_int32_p) XDR *xdrs; - u_int32_t *u_int32_p; + uint32_t *u_int32_p; { u_long l; @@ -253,7 +253,7 @@ if (!XDR_GETLONG(xdrs, (long *)&l)) { return (FALSE); } - *u_int32_p = (u_int32_t) l; + *u_int32_p = (uint32_t) l; return (TRUE); case XDR_FREE: @@ -284,7 +284,7 @@ if (!XDR_GETLONG(xdrs, (long *)&l)) { return (FALSE); } - *u_int32_p = (u_int32_t) l; + *u_int32_p = (uint32_t) l; return (TRUE); case XDR_FREE: diff --git a/src/lib/libc_bsd/xdr/xdr_mem.c b/src/lib/libc_bsd/xdr/xdr_mem.c index e89c920..6bc0ba9 100644 --- a/src/lib/libc_bsd/xdr/xdr_mem.c +++ b/src/lib/libc_bsd/xdr/xdr_mem.c @@ -129,7 +129,7 @@ if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - *lp = ntohl(*(u_int32_t *)xdrs->x_private); + *lp = ntohl(*(uint32_t *)xdrs->x_private); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE); } @@ -143,7 +143,7 @@ if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - *(u_int32_t *)xdrs->x_private = htonl((u_int32_t)*lp); + *(uint32_t *)xdrs->x_private = htonl((uint32_t)*lp); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE); } @@ -153,7 +153,7 @@ XDR *xdrs; long *lp; { - u_int32_t l; + uint32_t l; if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); @@ -169,12 +169,12 @@ XDR *xdrs; const long *lp; { - u_int32_t l; + uint32_t l; if (xdrs->x_handy < sizeof(int32_t)) return (FALSE); xdrs->x_handy -= sizeof(int32_t); - l = htonl((u_int32_t)*lp); + l = htonl((uint32_t)*lp); memmove(xdrs->x_private, &l, sizeof(int32_t)); xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t); return (TRUE); diff --git a/src/lib/libc_bsd/xdr/xdr_rec.c b/src/lib/libc_bsd/xdr/xdr_rec.c index d9fff6d..f44e748 100644 --- a/src/lib/libc_bsd/xdr/xdr_rec.c +++ b/src/lib/libc_bsd/xdr/xdr_rec.c @@ -106,7 +106,7 @@ * meet the needs of xdr and rpc based on tcp. */ -#define LAST_FRAG ((u_int32_t)(1U << 31)) +#define LAST_FRAG ((uint32_t)(1U << 31)) typedef struct rec_strm { char *tcp_handle; @@ -117,7 +117,7 @@ char *out_base; /* output buffer (points to frag header) */ char *out_finger; /* next output position */ char *out_boundry; /* data cannot up to this address */ - u_int32_t *frag_header; /* beginning of curren fragment */ + uint32_t *frag_header; /* beginning of curren fragment */ bool_t frag_sent; /* true if buffer sent in middle of record */ /* * in-coming bits @@ -134,7 +134,7 @@ bool_t nonblock; bool_t in_haveheader; - u_int32_t in_header; + uint32_t in_header; char *in_hdrp; int in_hdrlen; int in_reclen; @@ -205,8 +205,8 @@ rstrm->readit = readit; rstrm->writeit = writeit; rstrm->out_finger = rstrm->out_boundry = rstrm->out_base; - rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_base; - rstrm->out_finger += sizeof(u_int32_t); + rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base; + rstrm->out_finger += sizeof(uint32_t); rstrm->out_boundry += sendsize; rstrm->frag_sent = FALSE; rstrm->in_size = recvsize; @@ -240,14 +240,14 @@ /* first try the inline, fast case */ if ((rstrm->fbtbc >= sizeof(int32_t)) && (((long)rstrm->in_boundry - (long)buflp) >= sizeof(int32_t))) { - *lp = (long)ntohl((u_int32_t)(*buflp)); + *lp = (long)ntohl((uint32_t)(*buflp)); rstrm->fbtbc -= sizeof(int32_t); rstrm->in_finger += sizeof(int32_t); } else { if (! xdrrec_getbytes(xdrs, (char *)(void *)&mylong, sizeof(int32_t))) return (FALSE); - *lp = (long)ntohl((u_int32_t)mylong); + *lp = (long)ntohl((uint32_t)mylong); } return (TRUE); } @@ -272,7 +272,7 @@ dest_lp = ((int32_t *)(void *)(rstrm->out_finger)); rstrm->out_finger += sizeof(int32_t); } - *dest_lp = (int32_t)htonl((u_int32_t)(*lp)); + *dest_lp = (int32_t)htonl((uint32_t)(*lp)); return (TRUE); } @@ -517,16 +517,16 @@ u_long len; /* fragment length */ if (sendnow || rstrm->frag_sent || - ((u_long)rstrm->out_finger + sizeof(u_int32_t) >= + ((u_long)rstrm->out_finger + sizeof(uint32_t) >= (u_long)rstrm->out_boundry)) { rstrm->frag_sent = FALSE; return (flush_out(rstrm, TRUE)); } len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->frag_header) - - sizeof(u_int32_t); - *(rstrm->frag_header) = htonl((u_int32_t)len | LAST_FRAG); - rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_finger; - rstrm->out_finger += sizeof(u_int32_t); + sizeof(uint32_t); + *(rstrm->frag_header) = htonl((uint32_t)len | LAST_FRAG); + rstrm->frag_header = (uint32_t *)(void *)rstrm->out_finger; + rstrm->out_finger += sizeof(uint32_t); return (TRUE); } @@ -639,18 +639,18 @@ RECSTREAM *rstrm; bool_t eor; { - u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0; - u_int32_t len = (u_int32_t)((u_long)(rstrm->out_finger) - - (u_long)(rstrm->frag_header) - sizeof(u_int32_t)); + uint32_t eormask = (eor == TRUE) ? LAST_FRAG : 0; + uint32_t len = (uint32_t)((u_long)(rstrm->out_finger) - + (u_long)(rstrm->frag_header) - sizeof(uint32_t)); *(rstrm->frag_header) = htonl(len | eormask); - len = (u_int32_t)((u_long)(rstrm->out_finger) - + len = (uint32_t)((u_long)(rstrm->out_finger) - (u_long)(rstrm->out_base)); if ((*(rstrm->writeit))(rstrm->tcp_handle, rstrm->out_base, (int)len) != (int)len) return (FALSE); - rstrm->frag_header = (u_int32_t *)(void *)rstrm->out_base; - rstrm->out_finger = (char *)rstrm->out_base + sizeof(u_int32_t); + rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base; + rstrm->out_finger = (char *)rstrm->out_base + sizeof(uint32_t); return (TRUE); } @@ -659,16 +659,16 @@ RECSTREAM *rstrm; { char *where; - u_int32_t i; + uint32_t i; int len; if (rstrm->nonblock) return FALSE; where = rstrm->in_base; - i = (u_int32_t)((u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT); + i = (uint32_t)((u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT); where += i; - len = (u_int32_t)(rstrm->in_size - i); + len = (uint32_t)(rstrm->in_size - i); if ((len = (*(rstrm->readit))(rstrm->tcp_handle, where, len)) == -1) return (FALSE); rstrm->in_finger = where; @@ -714,7 +714,7 @@ set_input_fragment(rstrm) RECSTREAM *rstrm; { - u_int32_t header; + uint32_t header; if (rstrm->nonblock) return FALSE; @@ -741,7 +741,7 @@ RECSTREAM *rstrm; long cnt; { - u_int32_t current; + uint32_t current; while (cnt > 0) { current = (size_t)((long)rstrm->in_boundry - @@ -751,7 +751,7 @@ return (FALSE); continue; } - current = (u_int32_t)((cnt < current) ? cnt : current); + current = (uint32_t)((cnt < current) ? cnt : current); rstrm->in_finger += current; cnt -= current; } diff --git a/src/lib/libc_bsd/xdr/xdr_stdio.c b/src/lib/libc_bsd/xdr/xdr_stdio.c index 4f10e1e..92499cf 100644 --- a/src/lib/libc_bsd/xdr/xdr_stdio.c +++ b/src/lib/libc_bsd/xdr/xdr_stdio.c @@ -113,7 +113,7 @@ XDR *xdrs; long *lp; { - u_int32_t temp; + uint32_t temp; if (fread(&temp, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1) return (FALSE); @@ -126,7 +126,7 @@ XDR *xdrs; const long *lp; { - int32_t mycopy = htonl((u_int32_t)*lp); + int32_t mycopy = htonl((uint32_t)*lp); if (fwrite(&mycopy, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1) return (FALSE); diff --git a/src/sys/.settings/language.settings.xml b/src/sys/.settings/language.settings.xml index 4f90b13..a242386 100644 --- a/src/sys/.settings/language.settings.xml +++ b/src/sys/.settings/language.settings.xml @@ -4,8 +4,8 @@

- - + +

diff --git a/src/sys/armv6/exec.c b/src/sys/armv6/exec.c index 7123c4b..abc2539 100644 --- a/src/sys/armv6/exec.c +++ b/src/sys/armv6/exec.c @@ -160,7 +160,7 @@ int i = 0x0; int x = 0x0; - u_int32_t *tmp = 0x0; + uint32_t *tmp = 0x0; fileDescriptor *tmpFd = 0x0; elfHeader *binaryHeader = 0x0; @@ -323,8 +323,8 @@ if (_current->id > 4) kprintf("argv[0]: [%s]\n",argv[0]); kprintf("argv: [0x%X]\n",argv); - tmp[0] = (u_int32_t)argv; - tmp[1] = (u_int32_t)argv; + tmp[0] = (uint32_t)argv; + tmp[1] = (uint32_t)argv; /* Switch Back To The Kernels VM Space */ @@ -529,7 +529,7 @@ //if (_current->id > 3) { - iFrame->user_esp = ((u_int32_t)STACK_ADDR) - (sizeof(u_int32_t) * (argc + 3)); + iFrame->user_esp = ((uint32_t)STACK_ADDR) - (sizeof(uint32_t) * (argc + 3)); tmp = (void *)iFrame->user_esp; //! build argc and argv[] @@ -541,10 +541,10 @@ tmp[argc + 2] = 0x1; //} //else { - //tmp = (u_int32_t *)STACK_ADDR - 2; + //tmp = (uint32_t *)STACK_ADDR - 2; //tmp[0] = 0x1; //tmp[1] = 0x0; - //tmp[1] = (u_int32_t)argv; + //tmp[1] = (uint32_t)argv; //} kfree(argvNew); /* Now That We Relocated The Binary We Can Unmap And Free Header Info */ @@ -563,12 +563,12 @@ int i = 0x0; int x = 0x0; int argc = 0x0; - u_int32_t *tmp = 0x0; - u_int32_t seg_size = 0x0; - u_int32_t seg_addr = 0x0; - u_int32_t addr = 0x0; - u_int32_t eip = 0x0; - u_int32_t proghdr = 0x0; + uint32_t *tmp = 0x0; + uint32_t seg_size = 0x0; + uint32_t seg_addr = 0x0; + uint32_t addr = 0x0; + uint32_t eip = 0x0; + uint32_t proghdr = 0x0; char *args = 0x0; char *interp = 0x0; char **argv = 0x0; @@ -695,7 +695,7 @@ //if (_current->id > 3) { - iFrame->user_esp = ((u_int32_t)STACK_ADDR) - (sizeof(u_int32_t) * (argc + 4 + (sizeof(Elf_Auxargs) * 2))); + iFrame->user_esp = ((uint32_t)STACK_ADDR) - (sizeof(uint32_t) * (argc + 4 + (sizeof(Elf_Auxargs) * 2))); kprintf("\n\n\nuser_esp: [0x%X]\n",iFrame->user_esp); tmp = iFrame->user_esp; diff --git a/src/sys/armv6/sched.c b/src/sys/armv6/sched.c index 0988476..013524f 100644 --- a/src/sys/armv6/sched.c +++ b/src/sys/armv6/sched.c @@ -155,7 +155,7 @@ /* HACK */ for (i=0;i<3;i++) { fp = (void *)kmalloc(sizeof(struct file)); - tmpTask->td.o_files[i] = (u_int32_t)fp; + tmpTask->td.o_files[i] = (uint32_t)fp; fp->f_flag = 0x4; } diff --git a/src/sys/fs/common/crc32.c b/src/sys/fs/common/crc32.c index fd8dccd..8c5b5ea 100644 --- a/src/sys/fs/common/crc32.c +++ b/src/sys/fs/common/crc32.c @@ -47,7 +47,7 @@ #include #include -static const u_int32_t crc32_tab[] = { +static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, @@ -93,11 +93,11 @@ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -u_int32_t +uint32_t crc32(const void *buf, size_t size) { const u_int8_t *p = buf; - u_int32_t crc; + uint32_t crc; crc = ~0U; while (size--) diff --git a/src/sys/fs/common/gpt.c b/src/sys/fs/common/gpt.c index 4520d2c..55212b6 100644 --- a/src/sys/fs/common/gpt.c +++ b/src/sys/fs/common/gpt.c @@ -184,7 +184,7 @@ } static int gptread_hdr( const char *which, struct device_interface *devInfo, struct gpt_hdr *hdr, u_int64_t hdrlba ) { - u_int32_t crc; + uint32_t crc; if ( devInfo->read( devInfo->info, secbuf, hdrlba, 1 ) ) { kprintf( "%s: unable to read %s GPT header\n", BOOTPROG, which ); diff --git a/src/sys/fs/devfs/devfs.c b/src/sys/fs/devfs/devfs.c index 1ce85ce..99079ed 100644 --- a/src/sys/fs/devfs/devfs.c +++ b/src/sys/fs/devfs/devfs.c @@ -88,7 +88,7 @@ case 0: case 1: device = device_find( tmpDev->devMajor, tmpDev->devMinor ); - fd->start = (u_int32_t *) tmpDev; /* MrOlsen (2016-01-19) FIX: I Don't Understand This */ + fd->start = (uint32_t *) tmpDev; /* MrOlsen (2016-01-19) FIX: I Don't Understand This */ fd->size = device->devInfo->size; break; default: diff --git a/src/sys/i386/i386_exec.c b/src/sys/i386/i386_exec.c index 156aa8d..8e1db22 100644 --- a/src/sys/i386/i386_exec.c +++ b/src/sys/i386/i386_exec.c @@ -169,7 +169,7 @@ int i = 0x0; int x = 0x0; - u_int32_t *tmp = 0x0; + uint32_t *tmp = 0x0; fileDescriptor *tmpFd = 0x0; elfHeader *binaryHeader = 0x0; @@ -333,7 +333,7 @@ tmp[3] = STACK_ADDR - 12; //tmp = (uInt32 *) STACK_ADDR - 2; - tmp = (u_int32_t *) _current->tss.esp; + tmp = (uint32_t *) _current->tss.esp; /* if ( _current->id > 4 ) @@ -347,8 +347,8 @@ *tmp-- = 0x0; /* - tmp[0] = (u_int32_t) argv; - tmp[1] = (u_int32_t) argv; + tmp[0] = (uint32_t) argv; + tmp[1] = (uint32_t) argv; */ /* Switch Back To The Kernels VM Space */ @@ -380,10 +380,10 @@ int i = 0x0; int x = 0x0; int argc = 0x0; - u_int32_t cr3 = 0x0; + uint32_t cr3 = 0x0; unsigned int *tmp = 0x0; - //u_int32_t memAddr = 0x0; + //uint32_t memAddr = 0x0; uInt32 ldAddr = 0x0; uInt32 seg_size = 0x0; @@ -428,9 +428,9 @@ _current->imageFd = fd; //! Clean the virtual of COW pages left over from the fork - //vmm_cleanVirtualSpace( (u_int32_t) _current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SHIFT) ); + //vmm_cleanVirtualSpace( (uint32_t) _current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SHIFT) ); //MrOlsen 2017-12-15 - FIX! - This should be done before it was causing a lot of problems why did I free space after loading binary???? - vmm_cleanVirtualSpace( (u_int32_t) 0x8048000 ); + vmm_cleanVirtualSpace( (uint32_t) 0x8048000 ); /* Load ELF Header */ if ( (binaryHeader = (elfHeader *) kmalloc( sizeof(elfHeader) )) == 0x0 ) @@ -633,7 +633,7 @@ iFrame->ebp = STACK_ADDR; iFrame->eip = binaryHeader->eEntry; - iFrame->user_esp = ((u_int32_t) STACK_ADDR) - (sizeof(u_int32_t) * (argc + 3)); + iFrame->user_esp = ((uint32_t) STACK_ADDR) - (sizeof(uint32_t) * (argc + 3)); tmp = (void *) iFrame->user_esp; //MrOlsen 2017-11-14 iFrame->user_ebp; @@ -673,10 +673,10 @@ //} //else { - //tmp = (u_int32_t *)STACK_ADDR - 2; + //tmp = (uint32_t *)STACK_ADDR - 2; //tmp[0] = 0x1; //tmp[1] = 0x0; - //tmp[1] = (u_int32_t)argv; + //tmp[1] = (uint32_t)argv; //} kfree( argvNew ); /* Now That We Relocated The Binary We Can Unmap And Free Header Info */ @@ -711,7 +711,7 @@ /* kfree (iFrameNew); - memAddr = (u_int32_t) & (_current->tss); + memAddr = (uint32_t) & (_current->tss); ubixGDT[4].descriptor.baseLow = (memAddr & 0xFFFF); ubixGDT[4].descriptor.baseMed = ((memAddr >> 16) & 0xFF); ubixGDT[4].descriptor.baseHigh = (memAddr >> 24); @@ -744,12 +744,12 @@ int i = 0x0; int x = 0x0; int argc = 0x0; - u_int32_t *tmp = 0x0; - u_int32_t seg_size = 0x0; - u_int32_t seg_addr = 0x0; - u_int32_t addr = 0x0; - u_int32_t eip = 0x0; - u_int32_t proghdr = 0x0; + uint32_t *tmp = 0x0; + uint32_t seg_size = 0x0; + uint32_t seg_addr = 0x0; + uint32_t addr = 0x0; + uint32_t eip = 0x0; + uint32_t proghdr = 0x0; char *args = 0x0; char *interp = 0x0; char **argv = 0x0; @@ -875,7 +875,7 @@ } //! Clean the virtual of COW pages left over from the fork - vmm_cleanVirtualSpace( (u_int32_t) _current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SHIFT) ); + vmm_cleanVirtualSpace( (uint32_t) _current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SHIFT) ); //! Adjust iframe iFrame = (struct i386_frame *) _current->tss.esp0 - sizeof(struct i386_frame); @@ -884,25 +884,25 @@ //if (_current->id > 3) { - iFrame->user_esp = ((u_int32_t) STACK_ADDR) - (sizeof(u_int32_t) * (argc + 4 + (sizeof(Elf_Auxargs) * 2))); + iFrame->user_esp = ((uint32_t) STACK_ADDR) - (sizeof(uint32_t) * (argc + 4 + (sizeof(Elf_Auxargs) * 2))); kprintf( "\n\n\nuser_esp: [0x%X]\n", iFrame->user_esp ); - tmp = (u_int32_t *) iFrame->user_esp; + tmp = (uint32_t *) iFrame->user_esp; //! build argc and argv[] tmp[0] = argc; for ( i = 0; i < argc; i++ ) { - tmp[i + 1] = (u_int32_t) argv[i]; + tmp[i + 1] = (uint32_t) argv[i]; } //! Build ENV args = (char *) vmmGetFreeVirtualPage( _current->id, 1, VM_TASK ); memset( args, 0x0, 0x1000 ); strcpy( args, "LIBRARY_PATH=/lib" ); - tmp[argc + 2] = (u_int32_t) args; + tmp[argc + 2] = (uint32_t) args; kprintf( "env: [0x%X][0x%X]\n", (uInt32) tmp + argc + 2, tmp[argc + 2] ); tmp[argc + 3] = 0x0; kprintf( "env: [0x%X][0x%X]\n", (uInt32) tmp + argc + 2, tmp[argc + 2] ); //auxargs = iFrame->user_esp + argc + 3; - tmp = (u_int32_t *) iFrame->user_esp; + tmp = (uint32_t *) iFrame->user_esp; tmp += argc + 4; auxargs->execfd = -1; diff --git a/src/sys/i386/sched.c b/src/sys/i386/sched.c index 603d382..1cb8edd 100644 --- a/src/sys/i386/sched.c +++ b/src/sys/i386/sched.c @@ -48,7 +48,7 @@ static kTask_t *taskList = 0x0; static kTask_t *delList = 0x0; -static u_int32_t nextID = -1; +static uint32_t nextID = -1; kTask_t *_current = 0x0; kTask_t *_usedMath = 0x0; @@ -82,7 +82,7 @@ } void sched() { - u_int32_t memAddr = 0x0; + uint32_t memAddr = 0x0; kTask_t *tmpTask = 0x0; kTask_t *delTask = 0x0; @@ -123,13 +123,13 @@ asm("cli"); - memAddr = (u_int32_t) & (_current->tss); + memAddr = (uint32_t) & (_current->tss); ubixGDT[4].descriptor.baseLow = (memAddr & 0xFFFF); ubixGDT[4].descriptor.baseMed = ((memAddr >> 16) & 0xFF); ubixGDT[4].descriptor.baseHigh = (memAddr >> 24); ubixGDT[4].descriptor.access = '\x89'; - // memAddr = STACK_ADDR; //(u_int32_t) & (_current->tss); + // memAddr = STACK_ADDR; //(uint32_t) & (_current->tss); ubixGDT[10].descriptor.baseLow = (STACK_ADDR & 0xFFFF); ubixGDT[10].descriptor.baseMed = ((STACK_ADDR >> 16) & 0xFF); ubixGDT[10].descriptor.baseHigh = (STACK_ADDR >> 24); @@ -169,7 +169,7 @@ for ( i = 0; i < 3; i++ ) { fp = (void *) kmalloc( sizeof(struct file) ); - //kprintf("DB: [0x%X]\n", (u_int32_t) fp); + //kprintf("DB: [0x%X]\n", (uint32_t) fp); tmpTask->td.o_files[i] = (void *) fp; fp->f_flag = 0x4; } @@ -225,7 +225,7 @@ return (tmpTask); } -kTask_t *schedFindTask( u_int32_t id ) { +kTask_t *schedFindTask( uint32_t id ) { kTask_t *tmpTask = 0x0; for ( tmpTask = taskList; tmpTask; tmpTask = tmpTask->next ) { diff --git a/src/sys/i386/syscall.c b/src/sys/i386/syscall.c index 5ffa196..f49b543 100644 --- a/src/sys/i386/syscall.c +++ b/src/sys/i386/syscall.c @@ -122,7 +122,7 @@ Notes: ************************************************************************/ -int sysGetFreePage( struct thread *td, u_int32_t *count) { +int sysGetFreePage( struct thread *td, uint32_t *count) { //MrOlsen 2017-12-15 kprintf("sysGetFreePage - Count: %i\n", *count); return((int) vmmGetFreeVirtualPage(_current->id, *count, VM_THRD)); //return(vmmGetFreeVirtualPage(_current->id, *count, VM_TASK)); diff --git a/src/sys/include/fs/common/crc32.h b/src/sys/include/fs/common/crc32.h index b5e0e0f..43e722b 100644 --- a/src/sys/include/fs/common/crc32.h +++ b/src/sys/include/fs/common/crc32.h @@ -8,6 +8,6 @@ #ifndef _CRC32_H_ #define _CRC32_H_ -u_int32_t crc32(const void *buf, size_t size); +uint32_t crc32(const void *buf, size_t size); #endif /* !_CRC32_H_ */ diff --git a/src/sys/include/fs/common/gpt.h b/src/sys/include/fs/common/gpt.h index ebf7977..460b6f6 100644 --- a/src/sys/include/fs/common/gpt.h +++ b/src/sys/include/fs/common/gpt.h @@ -44,20 +44,20 @@ struct gpt_hdr { char hdr_sig[8]; #define GPT_HDR_SIG "EFI PART" - u_int32_t hdr_revision; + uint32_t hdr_revision; #define GPT_HDR_REVISION 0x00010000 - u_int32_t hdr_size; - u_int32_t hdr_crc_self; - u_int32_t __reserved; + uint32_t hdr_size; + uint32_t hdr_crc_self; + uint32_t __reserved; u_int64_t hdr_lba_self; u_int64_t hdr_lba_alt; u_int64_t hdr_lba_start; u_int64_t hdr_lba_end; struct uuid hdr_uuid; u_int64_t hdr_lba_table; - u_int32_t hdr_entries; - u_int32_t hdr_entsz; - u_int32_t hdr_crc_table; + uint32_t hdr_entries; + uint32_t hdr_entsz; + uint32_t hdr_crc_table; /* * The header as defined in the EFI spec is not a multiple of 8 bytes * and given that the alignment requirement is on an 8 byte boundary, @@ -65,7 +65,7 @@ * correct the value returned by sizeof() when we put the size of the * header in field hdr_size, or otherwise use offsetof(). */ - u_int32_t padding; + uint32_t padding; }; struct gpt_ent { diff --git a/src/sys/include/pci/hd.h b/src/sys/include/pci/hd.h index 7c3dca5..6f6029d 100644 --- a/src/sys/include/pci/hd.h +++ b/src/sys/include/pci/hd.h @@ -165,15 +165,15 @@ struct driveInfo { struct driveDiskLabel *diskLabel; struct ata_identify_data *ata_identify; - u_int32_t lba_high; - u_int32_t lba_low; - u_int32_t sector_size; + uint32_t lba_high; + uint32_t lba_low; + uint32_t sector_size; char hdEnable; char hdDev; char hdFlags; char hdShift; long hdMask; - u_int32_t hdMulti; + uint32_t hdMulti; long hdPort; long hdSize; long hdCalc; @@ -209,7 +209,7 @@ #define MAXPARTITIONS 8 struct bsd_disklabel { - u_int32_t d_magic; /* the magic number */ + uint32_t d_magic; /* the magic number */ u_int16_t d_type; /* drive type */ u_int16_t d_subtype; /* controller/d_type specific */ char d_typename[16]; /* type name, e.g. "eagle" */ @@ -217,12 +217,12 @@ char d_packname[16]; /* pack identifier */ /* disk geometry: */ - u_int32_t d_secsize; /* # of bytes per sector */ - u_int32_t d_nsectors; /* # of data sectors per track */ - u_int32_t d_ntracks; /* # of tracks per cylinder */ - u_int32_t d_ncylinders; /* # of data cylinders per unit */ - u_int32_t d_secpercyl; /* # of data sectors per cylinder */ - u_int32_t d_secperunit; /* # of data sectors per unit */ + uint32_t d_secsize; /* # of bytes per sector */ + uint32_t d_nsectors; /* # of data sectors per track */ + uint32_t d_ntracks; /* # of tracks per cylinder */ + uint32_t d_ncylinders; /* # of data cylinders per unit */ + uint32_t d_secpercyl; /* # of data sectors per cylinder */ + uint32_t d_secperunit; /* # of data sectors per unit */ /* * Spares (bad sector replacements) below are not counted in @@ -236,7 +236,7 @@ * Alternate cylinders include maintenance, replacement, configuration * description areas, etc. */ - u_int32_t d_acylinders; /* # of alt. cylinders per unit */ + uint32_t d_acylinders; /* # of alt. cylinders per unit */ /* hardware characteristics: */ /* @@ -259,24 +259,24 @@ u_int16_t d_interleave; /* hardware sector interleave */ u_int16_t d_trackskew; /* sector 0 skew, per track */ u_int16_t d_cylskew; /* sector 0 skew, per cylinder */ - u_int32_t d_headswitch; /* head switch time, usec */ - u_int32_t d_trkseek; /* track-to-track seek, usec */ - u_int32_t d_flags; /* generic flags */ + uint32_t d_headswitch; /* head switch time, usec */ + uint32_t d_trkseek; /* track-to-track seek, usec */ + uint32_t d_flags; /* generic flags */ #define NDDATA 5 - u_int32_t d_drivedata[NDDATA]; /* drive-type specific information */ + uint32_t d_drivedata[NDDATA]; /* drive-type specific information */ #define NSPARE 5 - u_int32_t d_spare[NSPARE]; /* reserved for future use */ - u_int32_t d_magic2; /* the magic number (again) */ + uint32_t d_spare[NSPARE]; /* reserved for future use */ + uint32_t d_magic2; /* the magic number (again) */ u_int16_t d_checksum; /* xor of data incl. partitions */ /* filesystem and partition information: */ u_int16_t d_npartitions; /* number of partitions in following */ - u_int32_t d_bbsize; /* size of boot area at sn0, bytes */ - u_int32_t d_sbsize; /* max size of fs superblock, bytes */ + uint32_t d_bbsize; /* size of boot area at sn0, bytes */ + uint32_t d_sbsize; /* max size of fs superblock, bytes */ struct partition { /* the partition table */ - u_int32_t p_size; /* number of sectors in partition */ - u_int32_t p_offset; /* starting sector */ - u_int32_t p_fsize; /* filesystem basic fragment size */ + uint32_t p_size; /* number of sectors in partition */ + uint32_t p_offset; /* starting sector */ + uint32_t p_fsize; /* filesystem basic fragment size */ u_int8_t p_fstype; /* filesystem type, see below */ u_int8_t p_frag; /* filesystem fragments per block */ u_int16_t p_cpg; /* filesystem cylinders per group */ diff --git a/src/sys/include/sys/elf.h b/src/sys/include/sys/elf.h index 00426c5..348489a 100644 --- a/src/sys/include/sys/elf.h +++ b/src/sys/include/sys/elf.h @@ -192,20 +192,20 @@ typedef struct { int32_t execfd; - u_int32_t phdr; - u_int32_t phent; - u_int32_t phnum; - u_int32_t pagesz; - u_int32_t base; - u_int32_t flags; - u_int32_t entry; - u_int32_t trace; + uint32_t phdr; + uint32_t phent; + uint32_t phnum; + uint32_t pagesz; + uint32_t base; + uint32_t flags; + uint32_t entry; + uint32_t trace; } Elf_Auxargs; char *elfGetShType( int ); char *elfGetPhType( int ); char *elfGetRelType( int ); -int elf_loadfile( kTask_t *p, const char *file, u_int32_t *addr, u_int32_t *entry ); +int elf_loadfile( kTask_t *p, const char *file, uint32_t *addr, uint32_t *entry ); #define ELF32_R_SYM(i) ((i)>>8) #define ELF32_R_TYPE(i) ((unsigned char)(i)) diff --git a/src/sys/include/sys/sysproto.h b/src/sys/include/sys/sysproto.h index d7cea6a..e96fe4a 100644 --- a/src/sys/include/sys/sysproto.h +++ b/src/sys/include/sys/sysproto.h @@ -135,10 +135,9 @@ char buf_l_[PADL_( char * )]; char *buf; char buf_r_[PADR_( char * )]; - - char size_l_[PADL_( u_int32_t )]; - u_int32_t size; - char size_r_[PADR_( u_int32_t )]; + char size_l_[PADL_( uint32_t )]; + uint32_t size; + char size_r_[PADR_( uint32_t )]; }; struct sys_setUID_args { @@ -292,12 +291,13 @@ u_int namelen; char namelen_r_[PADR_( u_int )]; char old_l_[PADL_( void * )]; - void * old; + void *old; char old_r_[PADR_( void * )]; char oldlenp_l_[PADL_( size_t * )]; size_t * oldlenp; char oldlenp_r_[PADR_( size_t * )]; - char new_l_[PADL_( void * )];void * new; + char new_l_[PADL_( void * )]; + void * new; char new_r_[PADR_( void * )]; char newlen_l_[PADL_( size_t )]; size_t newlen; diff --git a/src/sys/include/sys/tss.h b/src/sys/include/sys/tss.h index ec31ee9..6cdf7ef 100644 --- a/src/sys/include/sys/tss.h +++ b/src/sys/include/sys/tss.h @@ -83,28 +83,28 @@ }; struct i386_frame { - u_int32_t gs; - u_int32_t fs; - u_int32_t es; - u_int32_t ds; - u_int32_t ss; - u_int32_t edi; - u_int32_t esi; - u_int32_t ebp; - u_int32_t esp; - u_int32_t ebx; - u_int32_t edx; - u_int32_t ecx; - u_int32_t eax; + uint32_t gs; + uint32_t fs; + uint32_t es; + uint32_t ds; + uint32_t ss; + uint32_t edi; + uint32_t esi; + uint32_t ebp; + uint32_t esp; + uint32_t ebx; + uint32_t edx; + uint32_t ecx; + uint32_t eax; /* - u_int32_t vector; - u_int32_t error_code; + uint32_t vector; + uint32_t error_code; */ - u_int32_t eip; - u_int32_t cs; - u_int32_t flags; - u_int32_t user_esp; - u_int32_t user_ss; + uint32_t eip; + uint32_t cs; + uint32_t flags; + uint32_t user_esp; + uint32_t user_ss; }; #endif diff --git a/src/sys/include/sys/types.h b/src/sys/include/sys/types.h index d8585b9..b87b4fd 100644 --- a/src/sys/include/sys/types.h +++ b/src/sys/include/sys/types.h @@ -57,7 +57,7 @@ typedef __uint8_t u_int8_t; /* unsigned integrals (deprecated) */ typedef __uint16_t u_int16_t; -typedef __uint32_t u_int32_t; +typedef __uint32_t uint32_t; typedef __uint64_t u_int64_t; //typedef long long int quad_t; typedef __uint64_t quad_t; @@ -121,11 +121,11 @@ #endif /* MrOlsen (2016-01-11) NOTE: Note sure if i need this in here but will for now */ -typedef u_int32_t uintmax_t; +typedef uint32_t uintmax_t; typedef int32_t intmax_t; typedef int32_t ptrdiff_t; -typedef u_int32_t uintptr_t; -typedef u_int32_t u_quad_t; +typedef uint32_t uintptr_t; +typedef uint32_t u_quad_t; #define __ULONG_MAX 0xffffffffUL #define __USHRT_MAX 0xffff /* max value for an unsigned short */ diff --git a/src/sys/include/ubixos/access.h b/src/sys/include/ubixos/access.h index d20e234..44de351 100644 --- a/src/sys/include/ubixos/access.h +++ b/src/sys/include/ubixos/access.h @@ -33,11 +33,11 @@ #include struct sys_setUID_args { - u_int32_t uid; + uint32_t uid; }; struct sys_setGID_args { - u_int32_t gid; + uint32_t gid; }; int sys_getUID( struct thread *, void * ); diff --git a/src/sys/include/ubixos/sched.h b/src/sys/include/ubixos/sched.h index 5723eff..b6649d7 100644 --- a/src/sys/include/ubixos/sched.h +++ b/src/sys/include/ubixos/sched.h @@ -61,8 +61,8 @@ struct osInfo oInfo; fileDescriptor *imageFd; tState state; - u_int32_t gid; - u_int32_t uid; + uint32_t gid; + uint32_t uid; uInt16 usedMath; tty_term *term; struct thread td; diff --git a/src/sys/include/ufs/ufs.h b/src/sys/include/ufs/ufs.h index b1fb505..e17c93c 100644 --- a/src/sys/include/ufs/ufs.h +++ b/src/sys/include/ufs/ufs.h @@ -106,9 +106,9 @@ struct ufs2_dinode { u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ int16_t di_nlink; /* 2: File link count. */ - u_int32_t di_uid; /* 4: File owner. */ - u_int32_t di_gid; /* 8: File group. */ - u_int32_t di_blksize; /* 12: Inode blocksize. */ + uint32_t di_uid; /* 4: File owner. */ + uint32_t di_gid; /* 8: File group. */ + uint32_t di_blksize; /* 12: Inode blocksize. */ u_int64_t di_size; /* 16: File byte count. */ u_int64_t di_blocks; /* 24: Bytes actually held. */ ufs_time_t di_atime; /* 32: Last access time. */ @@ -120,8 +120,8 @@ int32_t di_ctimensec; /* 72: Last inode change time. */ int32_t di_birthnsec; /* 76: Inode creation time. */ int32_t di_gen; /* 80: Generation number. */ - u_int32_t di_kernflags; /* 84: Kernel flags. */ - u_int32_t di_flags; /* 88: Status flags (chflags). */ + uint32_t di_kernflags; /* 84: Kernel flags. */ + uint32_t di_flags; /* 88: Status flags (chflags). */ int32_t di_extsize; /* 92: External attributes block. */ ufs2_daddr_t di_extb[NXADDR];/* 96: External attributes block. */ ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */ @@ -144,11 +144,11 @@ int32_t di_ctimensec; /* 36: Last inode change time. */ ufs1_daddr_t di_db[NDADDR]; /* 40: Direct disk blocks. */ ufs1_daddr_t di_ib[NIADDR]; /* 88: Indirect disk blocks. */ - u_int32_t di_flags; /* 100: Status flags (chflags). */ + uint32_t di_flags; /* 100: Status flags (chflags). */ int32_t di_blocks; /* 104: Blocks actually held. */ int32_t di_gen; /* 108: Generation number. */ - u_int32_t di_uid; /* 112: File owner. */ - u_int32_t di_gid; /* 116: File group. */ + uint32_t di_uid; /* 112: File owner. */ + uint32_t di_gid; /* 116: File group. */ int32_t di_spare[2]; /* 120: Reserved; currently unused */ }; diff --git a/src/sys/include/vfs/mount.h b/src/sys/include/vfs/mount.h index 57e3e38..d9e1a65 100644 --- a/src/sys/include/vfs/mount.h +++ b/src/sys/include/vfs/mount.h @@ -38,8 +38,8 @@ typedef struct fsid { int32_t val[2]; } fsid_t; /* filesystem id type */ struct statfs { - u_int32_t f_version; /* structure version number */ - u_int32_t f_type; /* type of filesystem */ + uint32_t f_version; /* structure version number */ + uint32_t f_type; /* type of filesystem */ u_int64_t f_flags; /* copy of mount exported flags */ u_int64_t f_bsize; /* filesystem fragment size */ u_int64_t f_iosize; /* optimal transfer block size */ @@ -53,7 +53,7 @@ u_int64_t f_syncreads; /* count of sync reads since mount */ u_int64_t f_asyncreads; /* count of async reads since mount */ u_int64_t f_spare[10]; /* unused spare */ - u_int32_t f_namemax; /* maximum filename length */ + uint32_t f_namemax; /* maximum filename length */ uid_t f_owner; /* user that mounted the filesystem */ fsid_t f_fsid; /* filesystem id */ char f_charspare[80]; /* spare string space */ diff --git a/src/sys/include/vmm/paging.h b/src/sys/include/vmm/paging.h index f6cfd22..b3a1c35 100644 --- a/src/sys/include/vmm/paging.h +++ b/src/sys/include/vmm/paging.h @@ -1,65 +1,56 @@ -/***************************************************************************************** - Copyright (c) 2002-2004, 2016 The UbixOS Project - All rights reserved. +/*- + * Copyright (c) 2002-2004, 2016, 2017 The UbixOS Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this list of + * conditions, the following disclaimer and the list of authors. Redistributions in binary + * form must reproduce the above copyright notice, this list of conditions, the following + * disclaimer and the list of authors in the documentation and/or other materials provided + * with the distribution. Neither the name of the UbixOS Project nor the names of its + * contributors may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ - Redistribution and use in source and binary forms, with or without modification, are - permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this list of - conditions, the following disclaimer and the list of authors. Redistributions in binary - form must reproduce the above copyright notice, this list of conditions, the following - disclaimer and the list of authors in the documentation and/or other materials provided - with the distribution. Neither the name of the UbixOS Project nor the names of its - contributors may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - $Id: paging.h 233 2016-01-24 01:49:43Z reddawg $ - - *****************************************************************************************/ - -#ifndef _PAGING_H_ -#define _PAGING_H_ +#ifndef _VMM_PAGING_H_ +#define _VMM_PAGING_H_ #include #include #include -#define PD_INDEX(v_addr) (v_addr >> 22) -#define PD_OFFSET(v_addr) (v_addr >> 0xA) -#define PT_INDEX(v_addr) ((v_addr >> 12) & 0x03FF) +#define PAGE_SHIFT 12 // Page Shift +#define PAGE_SIZE 0x1000 // Page Size +#define PAGE_MASK (PAGE_SIZE-1) // Page Mask -#define PD_BASE_ADDR2 ((PAGE_SIZE << 0xA) + VMM_KERN_START) +#define PD_INDEX(v_addr) (v_addr >> 22) // Calc Page Directory Index +#define PD_OFFSET(v_addr) (v_addr >> 0xA) // Calc Page Directory OFfset +#define PT_INDEX(v_addr) ((v_addr >> 12) & 0x03FF) // Calc Page Table Offset +#define PD_BASE_ADDR2 ((PAGE_SIZE << 0xA) + VMM_KERN_START) // Find Out What This Was For -#define PD_BASE_ADDR 0xC0400000 -#define PT_BASE_ADDR 0xC0000000 +#define PD_BASE_ADDR 0xC0400000 //Page Directory Base Address +#define PT_BASE_ADDR 0xC0000000 // Page Table Base Address -#define PD_ENTRIES (PAGE_SIZE/4) -#define PT_ENTRIES (PAGE_SIZE/4) +#define PD_ENTRIES (PAGE_SIZE/4) //Return Page Directory Entries +#define PT_ENTRIES (PAGE_SIZE/4) //Return Page Table Entries -#define VM_THRD 0 -#define VM_TASK 1 +#define VM_THRD 0 // Thread +#define VM_TASK 1 // Task -/* - #define pageLength 0x00000400 - #define pageSize 4096 - #define pageEntries (pageSize/4) - */ -/* - #define tablesBaseAddress 0xBFC00000 - #define parentPageDirAddr 0x100000 - */ - +// Page Flags #define PAGE_PRESENT 0x00000001 #define PAGE_WRITE 0x00000002 #define PAGE_USER 0x00000004 @@ -76,16 +67,13 @@ #define PAGE_DEFAULT (PAGE_PRESENT|PAGE_WRITE|PAGE_USER) #define KERNEL_PAGE_DEFAULT (PAGE_PRESENT|PAGE_WRITE) -#define PAGE_SHIFT 12 /* LOG2(PAGE_SIZE) */ -#define PAGE_SIZE 0x1000 /* bytes/page */ -#define PAGE_MASK (PAGE_SIZE-1) - #define trunc_page(x) ((x) & ~PAGE_MASK) #define round_page(x) (((x) + PAGE_MASK) & ~PAGE_MASK) #define ctob(x) ((x)<>PAGE_SHIFT) + int vmmClearVirtualPage(uInt32 pageAddr); void vmmUnmapPage(uInt32, int); @@ -104,19 +92,14 @@ int vmm_pagingInit(); void *vmm_getFreeMallocPage(uInt16 count); //void vmm_pageFault( uInt32, uInt32, uInt32 ); -void vmm_pageFault(struct trapframe *, u_int32_t); +void vmm_pageFault(struct trapframe *, uint32_t); void _vmm_pageFault(); int mmap(struct thread *, struct sys_mmap_args *); int obreak(struct thread *, struct obreak_args *); int munmap(struct thread *, struct munmap_args *); -int vmm_cleanVirtualSpace(u_int32_t); +int vmm_cleanVirtualSpace(uint32_t); extern uInt32 *kernelPageDirectory; #endif - -/*** - END - ***/ - diff --git a/src/sys/include/vmm/vmm.h b/src/sys/include/vmm/vmm.h index 5919e61..d1f208b 100644 --- a/src/sys/include/vmm/vmm.h +++ b/src/sys/include/vmm/vmm.h @@ -27,12 +27,16 @@ *****************************************************************************************/ -#ifndef _VMM_H_ -#define _VMM_H_ +#ifndef _VMM_VMM_H_ +#define _VMM_VMM_H_ #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define memAvail 1 #define memNotavail 2 #define vmmID -3 @@ -78,7 +82,7 @@ }; typedef struct { - u_int32_t pageAddr; + uint32_t pageAddr; u_int16_t status; u_int16_t reserved; pid_t pid; @@ -91,12 +95,14 @@ int vmm_init(); int vmmMemMapInit(); int countMemory(); -u_int32_t vmmFindFreePage( pidType pid ); +uint32_t vmmFindFreePage( pidType pid ); int freePage( uInt32 pageAddr ); int adjustCowCounter( uInt32 baseAddr, int adjustment ); void vmmFreeProcessPages( pidType pid ); -//MrOlsen (2016-01-14) NOTE: Doing BSD Compat -//int freebsd6_mmap(struct thread *td, struct freebsd6_mmap_args *uap); +#ifdef __cplusplus +} #endif + +#endif // _VMM_VMM_H diff --git a/src/sys/kernel/elf.c b/src/sys/kernel/elf.c index 2d2a98e..eb93c3d 100644 --- a/src/sys/kernel/elf.c +++ b/src/sys/kernel/elf.c @@ -110,12 +110,12 @@ return((char *)elfRelType[relType].relTypeName); } -int elf_loadfile(kTask_t *p,const char *file,u_int32_t *addr,u_int32_t *entry) { +int elf_loadfile(kTask_t *p,const char *file,uint32_t *addr,uint32_t *entry) { int i = 0x0; int x = 0x0; int numsegs = 0x0; - u_int32_t base = 0x0; - u_int32_t base_addr = 0x0; + uint32_t base = 0x0; + uint32_t base_addr = 0x0; elfHeader *binaryHeader = 0x0; elfProgramHeader *programHeader = 0x0; fileDescriptor *exec_fd = 0x0; diff --git a/src/sys/kernel/kern_sysctl.c b/src/sys/kernel/kern_sysctl.c index bcc4d6c..2daf858 100644 --- a/src/sys/kernel/kern_sysctl.c +++ b/src/sys/kernel/kern_sysctl.c @@ -72,13 +72,13 @@ name[0] = 1; name[1] = 37; page_val = 0x1; - sysctl_add( name, name_len, "kern_arnd", &page_val, sizeof(u_int32_t) ); + sysctl_add( name, name_len, "kern_arnd", &page_val, sizeof(uint32_t) ); /* HW: NCPU */ name[0] = 6; name[1] = 3; page_val = 0x1; - sysctl_add( name, name_len, "hw.ncpu", &page_val, sizeof(u_int32_t) ); + sysctl_add( name, name_len, "hw.ncpu", &page_val, sizeof(uint32_t) ); } int sysctl_init() { @@ -191,7 +191,7 @@ endTask( _current->id ); } - if ( (u_int32_t) uap->oldlenp < tmpCtl->val_len ) + if ( (uint32_t) uap->oldlenp < tmpCtl->val_len ) memcpy( uap->old, tmpCtl->value, (uInt32) uap->oldlenp ); else memcpy( uap->old, tmpCtl->value, tmpCtl->val_len ); @@ -224,7 +224,7 @@ return (-1); } - if ( (u_int32_t) args->oldlenp < tmpCtl->val_len ) + if ( (uint32_t) args->oldlenp < tmpCtl->val_len ) memcpy( args->oldp, tmpCtl->value, (uInt32) args->oldlenp ); else memcpy( args->oldp, tmpCtl->value, tmpCtl->val_len ); diff --git a/src/sys/kernel/syscall_new.c b/src/sys/kernel/syscall_new.c index 4fb1501..84aa0c0 100644 --- a/src/sys/kernel/syscall_new.c +++ b/src/sys/kernel/syscall_new.c @@ -40,7 +40,7 @@ spinLock_t Master = SPIN_LOCK_INITIALIZER; void syscall( struct trapframe *frame ) { - u_int32_t code = 0x0; + uint32_t code = 0x0; caddr_t params; struct thread *td = &_current->td; @@ -62,8 +62,8 @@ if ( code > totalCalls ) { kprintf( "Invalid Call: [%i]\n", frame->tf_eax ); } - else if ( (u_int32_t) systemCalls[code].sc_status == SYSCALL_INVALID ) { - kprintf( "Invalid Call: [%i][0x%X]\n", code, (u_int32_t) systemCalls[code].sc_name ); + else if ( (uint32_t) systemCalls[code].sc_status == SYSCALL_INVALID ) { + kprintf( "Invalid Call: [%i][0x%X]\n", code, (uint32_t) systemCalls[code].sc_name ); frame->tf_eax = -1; frame->tf_edx = 0x0; } diff --git a/src/sys/lib/bcopy.c b/src/sys/lib/bcopy.c index c114179..ac7c8ca 100644 --- a/src/sys/lib/bcopy.c +++ b/src/sys/lib/bcopy.c @@ -43,7 +43,7 @@ * SO THAT wmask BELOW IS ALL ONES */ typedef int word; /* "word" used for optimal copy speed */ -typedef u_int32_t uintptr_t; +typedef uint32_t uintptr_t; #define wsize sizeof(word) #define wmask (wsize - 1) diff --git a/src/sys/vmm/copyvirtualspace.c b/src/sys/vmm/copyvirtualspace.c index b216fa2..a178895 100644 --- a/src/sys/vmm/copyvirtualspace.c +++ b/src/sys/vmm/copyvirtualspace.c @@ -49,30 +49,30 @@ Which Task Has Which Physical Pages ************************************************************************/ -void *vmmCopyVirtualSpace( pidType pid ) { +void *vmm_copyVirtualSpace(pidType pid) { void *newPageDirectoryAddress = 0x0; uInt32 *parentPageDirectory = 0x0, *newPageDirectory = 0x0; uInt32 *parentPageTable = 0x0, *newPageTable = 0x0; uInt32 *parentStackPage = 0x0, *newStackPage = 0x0; uInt16 x = 0, i = 0, s = 0; - spinLock( &cvsSpinLock ); + spinLock(&cvsSpinLock); /* Set Address Of Parent Page Directory */ parentPageDirectory = (uInt32 *) PD_BASE_ADDR; /* Allocate A New Page For The New Page Directory */ - if ( (newPageDirectory = (uInt32 *) vmmGetFreeKernelPage( pid, 1 )) == 0x0 ) - kpanic( "Error: newPageDirectory == NULL, File: %s, Line: %i\n", __FILE__, __LINE__ ); + if ((newPageDirectory = (uInt32 *) vmmGetFreeKernelPage(pid, 1)) == 0x0) + kpanic("Error: newPageDirectory == NULL, File: %s, Line: %i\n", __FILE__, __LINE__); /* Set newPageDirectoryAddress To The Newly Created Page Directories Page */ - newPageDirectoryAddress = (void *) vmm_getPhysicalAddr( (uInt32) newPageDirectory ); + newPageDirectoryAddress = (void *) vmm_getPhysicalAddr((uInt32) newPageDirectory); /* First Set Up A Flushed Page Directory */ - memset( newPageDirectory, 0x0, 0x1000 ); + memset(newPageDirectory, 0x0, 0x1000); /* Map The Top 1GB Region Of The VM Space */ - for ( x = 768; x < PD_ENTRIES; x++ ) + for (x = 768; x < PD_ENTRIES; x++) newPageDirectory[x] = parentPageDirectory[x]; /* @@ -81,41 +81,41 @@ * Because The Two VM Spaces Will Be Sharing Some Pages */ - for ( x = 0x1; x <= PD_INDEX( VMM_USER_END ); x++ ) { + for (x = 0x1; x <= PD_INDEX(VMM_USER_END); x++) { /* If Page Table Exists Map It */ - if ( (parentPageDirectory[x] & PAGE_PRESENT) == PAGE_PRESENT ) { + if ((parentPageDirectory[x] & PAGE_PRESENT) == PAGE_PRESENT) { /* Set Parent To Propper Page Table */ parentPageTable = (uInt32 *) (PT_BASE_ADDR + (0x1000 * x)); /* Allocate A New Page Table */ - if ( (newPageTable = (uInt32 *) vmmGetFreeKernelPage( pid, 1 )) == 0x0 ) - kpanic( "Error: newPageTable == NULL, File: %s, Line: %i\n", __FILE__, __LINE__ ); + if ((newPageTable = (uInt32 *) vmmGetFreeKernelPage(pid, 1)) == 0x0) + kpanic("Error: newPageTable == NULL, File: %s, Line: %i\n", __FILE__, __LINE__); /* Set Parent And New Pages To COW */ - for ( i = 0; i < PD_ENTRIES; i++ ) { + for (i = 0; i < PD_ENTRIES; i++) { /* If Page Is Mapped */ - if ( (parentPageTable[i] & PAGE_PRESENT) == PAGE_PRESENT ) { + if ((parentPageTable[i] & PAGE_PRESENT) == PAGE_PRESENT) { /* Check To See If Its A Stack Page */ - if ( ((uInt32) parentPageTable[i] & PAGE_STACK) == PAGE_STACK ) { + if (((uInt32) parentPageTable[i] & PAGE_STACK) == PAGE_STACK) { /* Alloc A New Page For This Stack Page */ - if ( (newStackPage = (uInt32 *) vmmGetFreeKernelPage( pid, 1 )) == 0x0 ) - kpanic( "Error: newStackPage == NULL, File: %s, Line: %i\n", __FILE__, __LINE__ ); + if ((newStackPage = (uInt32 *) vmmGetFreeKernelPage(pid, 1)) == 0x0) + kpanic("Error: newStackPage == NULL, File: %s, Line: %i\n", __FILE__, __LINE__); /* Set Pointer To Parents Stack Page */ parentStackPage = (uInt32 *) (((1024 * 4096) * x) + (4096 * i)); /* Copy The Tack Byte For Byte (I Should Find A Faster Way) */ - for ( s = 0x0; s < PD_ENTRIES; s++ ) { + for (s = 0x0; s < PD_ENTRIES; s++) { newStackPage[s] = parentStackPage[s]; } /* Insert New Stack Into Page Table */ - newPageTable[i] = (vmm_getPhysicalAddr( (uInt32) newStackPage ) | PAGE_DEFAULT | PAGE_STACK); + newPageTable[i] = (vmm_getPhysicalAddr((uInt32) newStackPage) | PAGE_DEFAULT | PAGE_STACK); /* Unmap From Kernel Space */ - vmmUnmapPage( (uInt32) newStackPage, 1 ); + vmmUnmapPage((uInt32) newStackPage, 1); } else { @@ -123,11 +123,11 @@ /* Set Page To COW In Parent And Child Space */ newPageTable[i] = (((uInt32) parentPageTable[i] & 0xFFFFF000) | (PAGE_DEFAULT | PAGE_COW)); /* Increment The COW Counter For This Page */ - if ( ((uInt32) parentPageTable[i] & PAGE_COW) == PAGE_COW ) { - adjustCowCounter( ((uInt32) parentPageTable[i] & 0xFFFFF000), 1 ); + if (((uInt32) parentPageTable[i] & PAGE_COW) == PAGE_COW) { + adjustCowCounter(((uInt32) parentPageTable[i] & 0xFFFFF000), 1); } else { - adjustCowCounter( ((uInt32) parentPageTable[i] & 0xFFFFF000), 2 ); + adjustCowCounter(((uInt32) parentPageTable[i] & 0xFFFFF000), 2); parentPageTable[i] = newPageTable[i]; } } @@ -138,9 +138,9 @@ } /* Put New Page Table Into New Page Directory */ - newPageDirectory[x] = (vmm_getPhysicalAddr( (uInt32) newPageTable ) | PAGE_DEFAULT); + newPageDirectory[x] = (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT); /* Unmap Page From Kernel Space But Keep It Marked As Not Avail */ - vmmUnmapPage( (uInt32) newPageTable, 1 ); + vmmUnmapPage((uInt32) newPageTable, 1); } else { newPageDirectory[x] = (uInt32) 0x0; @@ -151,33 +151,33 @@ * Allocate A New Page For The The First Page Table Where We Will Map The * Lower Region */ - if ( (newPageTable = (uInt32 *) vmmGetFreeKernelPage( pid, 1 )) == 0x0 ) - kpanic( "Error: newPageTable == NULL, File: %s, Line: %i\n", __FILE__, __LINE__ ); + if ((newPageTable = (uInt32 *) vmmGetFreeKernelPage(pid, 1)) == 0x0) + kpanic("Error: newPageTable == NULL, File: %s, Line: %i\n", __FILE__, __LINE__); /* Flush The Page From Garbage In Memory */ - memset( newPageTable, 0x0, 0x1000 ); + memset(newPageTable, 0x0, 0x1000); /* Map This Into The Page Directory */ - newPageDirectory[0] = (vmm_getPhysicalAddr( (uInt32) newPageTable ) | PAGE_DEFAULT); + newPageDirectory[0] = (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT); /* Set Address Of Parents Page Table */ parentPageTable = (uInt32 *) PT_BASE_ADDR; /* Map The First 1MB Worth Of Pages */ - for ( x = 0; x < (PD_ENTRIES / 4); x++ ) { + for (x = 0; x < (PD_ENTRIES / 4); x++) { newPageTable[x] = parentPageTable[x]; } /* Map The Next 3MB Worth Of Pages But Make Them COW */ - for ( x = (PD_ENTRIES / 4) + 1; x < PD_ENTRIES; x++ ) { + for (x = (PD_ENTRIES / 4) + 1; x < PD_ENTRIES; x++) { /* If Page Is Avaiable Map It */ - if ( (parentPageTable[x] & 0xFFFFF000) != 0x0 ) { + if ((parentPageTable[x] & 0xFFFFF000) != 0x0) { /* Set Pages To COW */ newPageTable[x] = (((uInt32) parentPageTable[x] & 0xFFFFF000) | (PAGE_DEFAULT | PAGE_COW)); /* Increment The COW Counter For This Page */ - if ( ((uInt32) parentPageTable[x] & PAGE_COW) == PAGE_COW ) { - adjustCowCounter( ((uInt32) parentPageTable[x] & 0xFFFFF000), 1 ); + if (((uInt32) parentPageTable[x] & PAGE_COW) == PAGE_COW) { + adjustCowCounter(((uInt32) parentPageTable[x] & 0xFFFFF000), 1); } else { - adjustCowCounter( ((uInt32) parentPageTable[x] & 0xFFFFF000), 2 ); + adjustCowCounter(((uInt32) parentPageTable[x] & 0xFFFFF000), 2); parentPageTable[x] = newPageTable[x]; } } @@ -192,14 +192,14 @@ * First Page After Page Tables * This must be mapped into the page directory before we map all 1024 page directories into the memory space */ - newPageTable = (uInt32 *) vmmGetFreePage( pid ); + newPageTable = (uInt32 *) vmmGetFreePage(pid); - newPageDirectory[PD_INDEX( PD_BASE_ADDR )] = (u_int32_t)( vmm_getPhysicalAddr( (uInt32) newPageTable ) | PAGE_DEFAULT ); + newPageDirectory[PD_INDEX(PD_BASE_ADDR)] = (uint32_t) (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT); - newPageTable[0] = (u_int32_t)( (u_int32_t)( newPageDirectoryAddress ) | PAGE_DEFAULT ); + newPageTable[0] = (uint32_t) ((uint32_t) (newPageDirectoryAddress) | PAGE_DEFAULT); //MrOlsen (2017-12-15) - kprintf( "PD3: %i - 0x%X - 0x%X\n", PD_INDEX( PD_BASE_ADDR ), newPageDirectoryAddress, newPageTable[0] ); - vmmUnmapPage( (uInt32) newPageTable, 1 ); + vmmUnmapPage((uInt32) newPageTable, 1); /* * @@ -208,25 +208,25 @@ * */ - newPageTable = (uInt32 *) vmmGetFreePage( pid ); + newPageTable = (uInt32 *) vmmGetFreePage(pid); - newPageDirectory[PD_INDEX( PT_BASE_ADDR )] = (u_int32_t)( vmm_getPhysicalAddr( (uInt32) newPageTable ) | PAGE_DEFAULT ); + newPageDirectory[PD_INDEX(PT_BASE_ADDR)] = (uint32_t) (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT); /* Flush The Page From Garbage In Memory */ - for ( x = 0; x < PD_ENTRIES; x++ ) + for (x = 0; x < PD_ENTRIES; x++) newPageTable[x] = (uInt32) 0x0; - for ( x = 0; x < PD_ENTRIES; x++ ) + for (x = 0; x < PD_ENTRIES; x++) newPageTable[x] = newPageDirectory[x]; /* Unmap Page From Virtual Space */ - vmmUnmapPage( (uInt32) newPageTable, 1 ); + vmmUnmapPage((uInt32) newPageTable, 1); /* Now We Are Done With The Page Directory So Lets Unmap That Too */ - vmmUnmapPage( (uInt32) newPageDirectory, 1 ); + vmmUnmapPage((uInt32) newPageDirectory, 1); - spinUnlock( &cvsSpinLock ); + spinUnlock(&cvsSpinLock); /* Return Physical Address Of Page Directory */ return (newPageDirectoryAddress); diff --git a/src/sys/vmm/createvirtualspace.c b/src/sys/vmm/createvirtualspace.c index faef67b..563c2f6 100644 --- a/src/sys/vmm/createvirtualspace.c +++ b/src/sys/vmm/createvirtualspace.c @@ -52,7 +52,7 @@ Set Of Pages ************************************************************************/ -void *vmmCreateVirtualSpace( pid_t pid ) { +void *vmm_createVirtualSpace(pid_t pid) { void *newPageDirectoryAddress = 0x0; uInt32 *parentPageDirectory = 0x0, *newPageDirectory = 0x0; uInt32 *parentPageTable = 0x0, *newPageTable = 0x0; @@ -63,19 +63,19 @@ /* Allocate A New Page For The New Page Directory */ - newPageDirectory = (uInt32 *) vmmGetFreePage( pid ); + newPageDirectory = (uInt32 *) vmmGetFreePage(pid); /* Set newPageDirectoryAddress To The Newly Created Page Directories Page */ - newPageDirectoryAddress = (void *) vmm_getPhysicalAddr( (uInt32) newPageDirectory ); + newPageDirectoryAddress = (void *) vmm_getPhysicalAddr((uInt32) newPageDirectory); /* First Set Up A Flushed Page Directory */ - for ( x = 0; x < PD_ENTRIES; x++ ) { + for (x = 0; x < PD_ENTRIES; x++) { newPageDirectory[x] = (uInt32) 0x0; } /* Map The Top Kernel (APPROX 1GB) Region Of The VM Space */ - for ( x = PD_INDEX( VMM_KERN_START ); x < PD_ENTRIES; x++ ) { + for (x = PD_INDEX(VMM_KERN_START); x < PD_ENTRIES; x++) { newPageDirectory[x] = parentPageDirectory[x]; } @@ -84,26 +84,26 @@ * Lower Region */ - newPageTable = (uInt32 *) vmmGetFreePage( pid ); + newPageTable = (uInt32 *) vmmGetFreePage(pid); /* Flush The Page From Garbage In Memory */ - for ( x = 0; x < PD_ENTRIES; x++ ) { + for (x = 0; x < PD_ENTRIES; x++) { newPageTable[x] = (uInt32) 0x0; } /* Map This Into The Page Directory */ - newPageDirectory[0] = (vmm_getPhysicalAddr( (uInt32) newPageTable ) | PAGE_DEFAULT); + newPageDirectory[0] = (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT); /* Set Address Of Parents Page Table */ parentPageTable = (uInt32 *) PT_BASE_ADDR; /* Map The First 1MB Worth Of Pages */ - for ( x = 0; x < (PD_ENTRIES / 4); x++ ) { + for (x = 0; x < (PD_ENTRIES / 4); x++) { newPageTable[x] = parentPageTable[x]; } /* Unmap Page From Virtual Space */ - vmmUnmapPage( (uInt32) newPageTable, 1 ); + vmmUnmapPage((uInt32) newPageTable, 1); /* * @@ -111,14 +111,14 @@ * First Page After Page Tables * This must be mapped into the page directory before we map all 1024 page directories into the memory space */ - newPageTable = (uInt32 *) vmmGetFreePage( pid ); + newPageTable = (uInt32 *) vmmGetFreePage(pid); - newPageDirectory[PD_INDEX( PD_BASE_ADDR )] = (u_int32_t)( vmm_getPhysicalAddr( (uInt32) newPageTable ) | PAGE_DEFAULT ); + newPageDirectory[PD_INDEX(PD_BASE_ADDR)] = (uint32_t) (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT); - newPageTable[0] = (u_int32_t)( (u_int32_t)( newPageDirectoryAddress ) | PAGE_DEFAULT ); + newPageTable[0] = (uint32_t) ((uint32_t) (newPageDirectoryAddress) | PAGE_DEFAULT); //MrOlsen 2017-12-15 kprintf( "PD3: %i - 0x%X - 0x%X\n", PD_INDEX( PD_BASE_ADDR ), newPageDirectoryAddress, newPageTable[0] ); - vmmUnmapPage( (uInt32) newPageTable, 1 ); + vmmUnmapPage((uInt32) newPageTable, 1); /* * @@ -127,23 +127,23 @@ * */ - newPageTable = (uInt32 *) vmmGetFreePage( pid ); + newPageTable = (uInt32 *) vmmGetFreePage(pid); - newPageDirectory[PD_INDEX( PT_BASE_ADDR )] = (u_int32_t)( vmm_getPhysicalAddr( (uInt32) newPageTable ) | PAGE_DEFAULT ); + newPageDirectory[PD_INDEX(PT_BASE_ADDR)] = (uint32_t) (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT); /* Flush The Page From Garbage In Memory */ - for ( x = 0; x < PD_ENTRIES; x++ ) + for (x = 0; x < PD_ENTRIES; x++) newPageTable[x] = (uInt32) 0x0; - for ( x = 0; x < PD_ENTRIES; x++ ) + for (x = 0; x < PD_ENTRIES; x++) newPageTable[x] = newPageDirectory[x]; /* Unmap Page From Virtual Space */ - vmmUnmapPage( (uInt32) newPageTable, 1 ); + vmmUnmapPage((uInt32) newPageTable, 1); /* Now We Are Done With The Page Directory So Lets Unmap That Too */ - vmmUnmapPage( (uInt32) newPageDirectory, 1 ); + vmmUnmapPage((uInt32) newPageDirectory, 1); /* Return Physical Address Of Page Directory */ return (newPageDirectoryAddress); } diff --git a/src/sys/vmm/getfreepage.c b/src/sys/vmm/getfreepage.c index 9a11682..7a1d6e5 100644 --- a/src/sys/vmm/getfreepage.c +++ b/src/sys/vmm/getfreepage.c @@ -44,7 +44,7 @@ 07/30/02 - This Returns A Free Page In The Top 1GB For The Kernel ************************************************************************/ -void *vmmGetFreePage( pidType pid ) { +void *vmm_getFreePage( pidType pid ) { uInt16 x = 0x0, y = 0x0; uInt32 *pageTableSrc = 0x0; diff --git a/src/sys/vmm/getfreevirtualpage.c b/src/sys/vmm/getfreevirtualpage.c index d43f887..3cbfc62 100644 --- a/src/sys/vmm/getfreevirtualpage.c +++ b/src/sys/vmm/getfreevirtualpage.c @@ -48,9 +48,9 @@ ************************************************************************/ void *vmmGetFreeVirtualPage( pidType pid, int count, int type ) { int y = 0, counter = 0, pdI = 0x0, ptI = 0x0; - u_int32_t *pageTableSrc = 0x0; - u_int32_t *pageDir = 0x0; - u_int32_t start_page = 0x0; + uint32_t *pageTableSrc = 0x0; + uint32_t *pageDir = 0x0; + uint32_t start_page = 0x0; spinLock( &fvpSpinLock ); @@ -62,7 +62,7 @@ /* Get Our Starting Address */ if ( type == VM_THRD ) { - start_page = (u_int32_t)( _current->td.vm_daddr + ctob( _current->td.vm_dsize ) ); + start_page = (uint32_t)( _current->td.vm_daddr + ctob( _current->td.vm_dsize ) ); } else if ( type == VM_TASK ) { //kprintf("vmStart"); diff --git a/src/sys/vmm/getphysicaladdr.c b/src/sys/vmm/getphysicaladdr.c index ab97c84..1ccdb86 100644 --- a/src/sys/vmm/getphysicaladdr.c +++ b/src/sys/vmm/getphysicaladdr.c @@ -37,7 +37,7 @@ */ -u_int32_t vmm_getPhysicalAddr(uInt32 pageAddr) { +uint32_t vmm_getPhysicalAddr(uInt32 pageAddr) { int pageDirectoryIndex = 0x0, pageTableIndex = 0x0; uInt32 *pageTable = 0x0; @@ -54,7 +54,7 @@ } -u_int32_t vmm_getRealAddr(uint32_t addr) { +uint32_t vmm_getRealAddr(uint32_t addr) { int pageDirectoryIndex = 0x0, pageTableIndex = 0x0; uint32_t *pageTable = 0x0; diff --git a/src/sys/vmm/pagefault.c b/src/sys/vmm/pagefault.c index 4cd53c3..a722c04 100644 --- a/src/sys/vmm/pagefault.c +++ b/src/sys/vmm/pagefault.c @@ -52,14 +52,14 @@ *****************************************************************************************/ /* void vmm_pageFault(uInt32 memAddr,uInt32 eip,uInt32 esp) { */ -void vmm_pageFault(struct trapframe *frame, u_int32_t cr2) { +void vmm_pageFault(struct trapframe *frame, uint32_t cr2) { uInt32 i = 0x0, pageTableIndex = 0x0, pageDirectoryIndex = 0x0; uInt32 *pageDir = 0x0, *pageTable = 0x0; uInt32 *src = 0x0, *dst = 0x0; - u_int32_t esp = frame->tf_esp; - u_int32_t eip = frame->tf_eip; - u_int32_t memAddr = cr2; + uint32_t esp = frame->tf_esp; + uint32_t eip = frame->tf_eip; + uint32_t memAddr = cr2; //MrOlsen 2017-12-15 - kprintf("CR2: [0x%X], EIP: 0x%X, ERR: 0x%X\n", cr2, frame->tf_eip, frame->tf_err); diff --git a/src/sys/vmm/paging.c b/src/sys/vmm/paging.c index f2872f6..885c709 100644 --- a/src/sys/vmm/paging.c +++ b/src/sys/vmm/paging.c @@ -1,31 +1,28 @@ -/***************************************************************************************** - Copyright (c) 2002-2004, 2016 The UbixOS Project - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, are - permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this list of - conditions, the following disclaimer and the list of authors. Redistributions in binary - form must reproduce the above copyright notice, this list of conditions, the following - disclaimer and the list of authors in the documentation and/or other materials provided - with the distribution. Neither the name of the UbixOS Project nor the names of its - contributors may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - $Id: paging.c 237 2016-01-24 03:04:33Z reddawg $ - - *****************************************************************************************/ +/*- + * Copyright (c) 2002-2004, 2016, 2017 The UbixOS Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this list of + * conditions, the following disclaimer and the list of authors. Redistributions in binary + * form must reproduce the above copyright notice, this list of conditions, the following + * disclaimer and the list of authors in the documentation and/or other materials provided + * with the distribution. Neither the name of the UbixOS Project nor the names of its + * contributors may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + * THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #include #include @@ -37,7 +34,7 @@ #include #include -u_int32_t *kernelPageDirectory = 0x0; +uint32_t *kernelPageDirectory = 0x0; // Pointer To Kernel Page Directory static spinLock_t fkpSpinLock = SPIN_LOCK_INITIALIZER; static spinLock_t rmpSpinLock = SPIN_LOCK_INITIALIZER; @@ -55,29 +52,29 @@ *****************************************************************************************/ int vmm_pagingInit() { - u_int32_t i = 0x0; - u_int32_t *pageTable = 0x0; + uint32_t i = 0x0; + uint32_t *pageTable = 0x0; /* Allocate A Page Of Memory For Kernels Page Directory */ - kernelPageDirectory = (u_int32_t *) vmmFindFreePage( sysID ); + kernelPageDirectory = (uint32_t *) vmmFindFreePage( sysID); - if ( kernelPageDirectory == 0x0 ) { - K_PANIC( "Error: vmmFindFreePage Failed" ); + if (kernelPageDirectory == 0x0) { + K_PANIC("Error: vmmFindFreePage Failed"); } /* end if */ /* Clear The Memory To Ensure There Is No Garbage */ - for ( i = 0; i < PD_ENTRIES; i++ ) { - kernelPageDirectory[i] = (u_int32_t) 0x0; + for (i = 0; i < PD_ENTRIES; i++) { + kernelPageDirectory[i] = (uint32_t) 0x0; } /* end for */ /* Allocate a page for the first 4MB of memory */ - if ( (pageTable = (u_int32_t *) vmmFindFreePage( sysID )) == 0x0 ) - K_PANIC( "Error: vmmFindFreePage Failed" ); + if ((pageTable = (uint32_t *) vmmFindFreePage( sysID)) == 0x0) + K_PANIC("Error: vmmFindFreePage Failed"); /* Make Sure The Page Table Is Clean */ - memset( pageTable, 0x0, 0x1000 ); + memset(pageTable, 0x0, 0x1000); - kernelPageDirectory[0] = (u_int32_t)( (u_int32_t)( pageTable ) | PAGE_DEFAULT ); + kernelPageDirectory[0] = (uint32_t) ((uint32_t) (pageTable) | PAGE_DEFAULT); /* * Map the first 1MB of Memory to the kernel MM space because our kernel starts @@ -86,8 +83,8 @@ */ /* MrOlsen (2016-01-15) NOTE: I'm Mappying It For Now Until I Can Figure Out Why FS:0x0 */ - for ( i = 0x0; i < (PD_ENTRIES / 0x4); i++ ) { - pageTable[i] = (u_int32_t)( (i * 0x1000) | PAGE_DEFAULT ); + for (i = 0x0; i < (PD_ENTRIES / 0x4); i++) { + pageTable[i] = (uint32_t) ((i * 0x1000) | PAGE_DEFAULT); } /* end for */ /* @@ -95,34 +92,34 @@ * for kernel space and will be shared with each process */ - kprintf( "PD: %i\n", PD_INDEX( VMM_KERN_START ) ); + kprintf("PD: %i\n", PD_INDEX(VMM_KERN_START)); - for ( i = PD_INDEX( VMM_KERN_START ); i < PD_ENTRIES; i++ ) { - if ( (pageTable = (u_int32_t *) vmmFindFreePage( sysID )) == 0x0 ) - K_PANIC( "Error: vmmFindFreePage Failed" ); + for (i = PD_INDEX(VMM_KERN_START); i < PD_ENTRIES; i++) { + if ((pageTable = (uint32_t *) vmmFindFreePage( sysID)) == 0x0) + K_PANIC("Error: vmmFindFreePage Failed"); /* Make Sure The Page Table Is Clean */ - memset( pageTable, 0x0, 0x1000 ); + memset(pageTable, 0x0, 0x1000); /* Map In The Page Directory */ - kernelPageDirectory[i] = (u_int32_t)( (u_int32_t)( pageTable ) | KERNEL_PAGE_DEFAULT | PAGE_GLOBAL ); + kernelPageDirectory[i] = (uint32_t) ((uint32_t) (pageTable) | KERNEL_PAGE_DEFAULT | PAGE_GLOBAL); } /* end for */ /* * Map Page Tables Into VM Space * The First Page Table (4MB) Maps To All Page Directories */ - if ( kernelPageDirectory[PD_INDEX( PT_BASE_ADDR )] == 0 ) { - if ( (pageTable = (u_int32_t *) vmmFindFreePage( sysID )) == 0x0 ) - K_PANIC( "Error: vmmFindFreePage Failed" ); + if (kernelPageDirectory[PD_INDEX(PT_BASE_ADDR)] == 0) { + if ((pageTable = (uint32_t *) vmmFindFreePage( sysID)) == 0x0) + K_PANIC("Error: vmmFindFreePage Failed"); - kernelPageDirectory[PD_INDEX( PT_BASE_ADDR )] = (u_int32_t)( (u_int32_t)( pageTable ) | KERNEL_PAGE_DEFAULT ); + kernelPageDirectory[PD_INDEX(PT_BASE_ADDR)] = (uint32_t) ((uint32_t) (pageTable) | KERNEL_PAGE_DEFAULT); } - kprintf( "PD2: %i\n", PD_INDEX( PT_BASE_ADDR ) ); - pageTable = (u_int32_t *) (kernelPageDirectory[PD_INDEX( PT_BASE_ADDR )] & 0xFFFFF000); + kprintf("PD2: %i\n", PD_INDEX(PT_BASE_ADDR)); + pageTable = (uint32_t *) (kernelPageDirectory[PD_INDEX(PT_BASE_ADDR)] & 0xFFFFF000); - for ( i = 0; i < PD_ENTRIES; i++ ) { + for (i = 0; i < PD_ENTRIES; i++) { pageTable[i] = kernelPageDirectory[i]; } /* end for */ @@ -130,46 +127,46 @@ * Map Page Directory Into VM Space * First Page After Page Tables */ - kprintf( "PPD3: %i\n", PD_INDEX( PD_BASE_ADDR ) ); - if ( kernelPageDirectory[PD_INDEX( PD_BASE_ADDR )] == 0 ) { - if ( (pageTable = (u_int32_t *) vmmFindFreePage( sysID )) == 0x0 ) - K_PANIC( "Error: vmmFindFreePage Failed" ); + kprintf("PPD3: %i\n", PD_INDEX(PD_BASE_ADDR)); + if (kernelPageDirectory[PD_INDEX(PD_BASE_ADDR)] == 0) { + if ((pageTable = (uint32_t *) vmmFindFreePage( sysID)) == 0x0) + K_PANIC("Error: vmmFindFreePage Failed"); - kernelPageDirectory[PD_INDEX( PD_BASE_ADDR )] = (u_int32_t)( (u_int32_t)( pageTable ) | KERNEL_PAGE_DEFAULT ); + kernelPageDirectory[PD_INDEX(PD_BASE_ADDR)] = (uint32_t) ((uint32_t) (pageTable) | KERNEL_PAGE_DEFAULT); } - pageTable = (u_int32_t *) (kernelPageDirectory[PD_INDEX( PD_BASE_ADDR )] & 0xFFFFF000); - pageTable[0] = (u_int32_t)( (u_int32_t)( kernelPageDirectory ) | PAGE_DEFAULT ); + pageTable = (uint32_t *) (kernelPageDirectory[PD_INDEX(PD_BASE_ADDR)] & 0xFFFFF000); + pageTable[0] = (uint32_t) ((uint32_t) (kernelPageDirectory) | PAGE_DEFAULT); /* Also Set Up Page Directory To Be The The First Page In 0xE0400000 */ /* - pageTable = (u_int32_t *) (kernelPageDirectory[0] & 0xFFFFF000); + pageTable = (uint32_t *) (kernelPageDirectory[0] & 0xFFFFF000); - pageTable[256] = (u_int32_t)( (u_int32_t)( kernelPageDirectory ) | PAGE_DEFAULT ); + pageTable[256] = (uint32_t)( (uint32_t)( kernelPageDirectory ) | PAGE_DEFAULT ); */ /* Now Lets Turn On Paging With This Initial Page Table */ asm volatile( - "movl %0,%%eax \n" - "movl %%eax,%%cr3 \n" - "movl %%cr0,%%eax \n" - "orl $0x80010000,%%eax \n" /* Turn on memory protection */ - "movl %%eax,%%cr0 \n" - : - : "d"((u_int32_t *) (kernelPageDirectory)) + "movl %0,%%eax \n" + "movl %%eax,%%cr3 \n" + "movl %%cr0,%%eax \n" + "orl $0x80010000,%%eax \n" /* Turn on memory protection */ + "movl %%eax,%%cr0 \n" + : + : "d"((uint32_t *) (kernelPageDirectory)) ); /* Remap The Memory List */ - for ( i = 0x101000; i <= (0x101000 + (numPages * sizeof(mMap))); i += 0x1000 ) { - if ( (vmm_remapPage( i, (VMM_MMAP_ADDR_PMODE + (i - 0x101000)), PAGE_DEFAULT )) == 0x0 ) - K_PANIC( "vmmRemapPage failed\n" ); + for (i = 0x101000; i <= (0x101000 + (numPages * sizeof(mMap))); i += 0x1000) { + if ((vmm_remapPage(i, (VMM_MMAP_ADDR_PMODE + (i - 0x101000)), PAGE_DEFAULT)) == 0x0) + K_PANIC("vmmRemapPage failed\n"); } /* Set New Address For Memory Map Since Its Relocation */ vmmMemoryMap = (mMap *) VMM_MMAP_ADDR_PMODE; /* Print information on paging */ - kprintf( "paging0 - Address: [0x%X], PagingISR Address: [0x%X]\n", kernelPageDirectory, &_vmm_pageFault ); + kprintf("paging0 - Address: [0x%X], PagingISR Address: [0x%X]\n", kernelPageDirectory, &_vmm_pageFault); /* Return so we know everything went well */ return (0x0); @@ -186,89 +183,89 @@ 07/28/04 - If perms == 0x0 set to PAGE_DEFAULT *****************************************************************************************/ -int vmm_remapPage( u_int32_t source, u_int dest, uInt16 perms ) { +int vmm_remapPage(uint32_t source, u_int dest, uInt16 perms) { uInt16 destPageDirectoryIndex = 0x0, destPageTableIndex = 0x0; u_int *pageDir = 0x0, *pageTable = 0x0; short i = 0x0; - if ( source == 0x0 ) - K_PANIC( "source == 0x0" ); + if (source == 0x0) + K_PANIC("source == 0x0"); - if ( dest == 0x0 ) - K_PANIC( "dest == 0x0" ); + if (dest == 0x0) + K_PANIC("dest == 0x0"); - spinLock( &rmpSpinLock ); + spinLock(&rmpSpinLock); - if ( perms == 0x0 ) + if (perms == 0x0) perms = KERNEL_PAGE_DEFAULT; /* Set Pointer pageDirectory To Point To The Virtual Mapping Of The Page Directory */ pageDir = PD_BASE_ADDR; /* Get Index Into The Page Directory */ - destPageDirectoryIndex = PD_INDEX( dest ); + destPageDirectoryIndex = PD_INDEX(dest); - if ( (pageDir[destPageDirectoryIndex] & PAGE_PRESENT) != PAGE_PRESENT ) { - kprintf( "Page Not Present: 0x%X, Source: 0x%X, Dest: 0x%X, dPDI: 0x%X\n", dest, source, dest, destPageDirectoryIndex ); + if ((pageDir[destPageDirectoryIndex] & PAGE_PRESENT) != PAGE_PRESENT) { + kprintf("Page Not Present: 0x%X, Source: 0x%X, Dest: 0x%X, dPDI: 0x%X\n", dest, source, dest, destPageDirectoryIndex); /* If Page Table Is Non Existant Then Set It Up */ /* UBU Why does the page table need to be user writable? */ - pageDir[destPageDirectoryIndex] = (u_int32_t) vmmFindFreePage( _current->id ) | PAGE_DEFAULT; + pageDir[destPageDirectoryIndex] = (uint32_t) vmmFindFreePage(_current->id) | PAGE_DEFAULT; /* Also Add It To Virtual Space So We Can Make Changes Later */ - pageTable = (u_int32_t *) (PT_BASE_ADDR + (PD_INDEX( PT_BASE_ADDR ) * 0x1000)); /* Table that maps that 4b */ + pageTable = (uint32_t *) (PT_BASE_ADDR + (PD_INDEX( PT_BASE_ADDR ) * 0x1000)); /* Table that maps that 4b */ pageTable[destPageDirectoryIndex] = (pageDir[destPageDirectoryIndex] & 0xFFFFF000) | PAGE_DEFAULT; /* Is This Why Page Needs To Be User As Well? */ pageTable = (PT_BASE_ADDR + (destPageDirectoryIndex * 0x1000)); /* Need To Figure Out invlpg */ asm volatile( - "push %eax \n" - "mov %cr3,%eax \n" - "mov %eax,%cr3 \n" - "pop %eax \n" + "push %eax \n" + "mov %cr3,%eax \n" + "mov %eax,%cr3 \n" + "pop %eax \n" ); - memset( pageTable, 0x0, 0x1000 ); + memset(pageTable, 0x0, 0x1000); } /* Set Address To Page Table */ - pageTable = (u_int32_t *) (PT_BASE_ADDR + (0x1000 * destPageDirectoryIndex)); + pageTable = (uint32_t *) (PT_BASE_ADDR + (0x1000 * destPageDirectoryIndex)); /* Get The Index To The Page Table */ - destPageTableIndex = PT_INDEX( dest ); //((dest - (destPageDirectoryIndex * 0x400000)) / 0x1000); + destPageTableIndex = PT_INDEX(dest); //((dest - (destPageDirectoryIndex * 0x400000)) / 0x1000); /* If The Page Is Mapped In Free It Before We Remap */ - if ( (pageTable[destPageTableIndex] & PAGE_PRESENT) == PAGE_PRESENT ) { - if ( (pageTable[destPageTableIndex] & PAGE_STACK) == PAGE_STACK ) - kprintf( "Stack Page: [0x%X]\n", dest ); + if ((pageTable[destPageTableIndex] & PAGE_PRESENT) == PAGE_PRESENT) { + if ((pageTable[destPageTableIndex] & PAGE_STACK) == PAGE_STACK) + kprintf("Stack Page: [0x%X]\n", dest); - if ( (pageTable[destPageTableIndex] & PAGE_COW) != PAGE_COW ) { - kprintf( "Page NOT COW\n" ); - kprintf( "Page Present: [0x%X][0x%X]", dest, pageTable[destPageTableIndex] ); + if ((pageTable[destPageTableIndex] & PAGE_COW) != PAGE_COW) { + kprintf("Page NOT COW\n"); + kprintf("Page Present: [0x%X][0x%X]", dest, pageTable[destPageTableIndex]); source = 0x0; goto rmDone; } /* Clear The Page First For Security Reasons */ - freePage( ((u_int32_t) pageTable[destPageTableIndex] & 0xFFFFF000) ); + freePage(((uint32_t) pageTable[destPageTableIndex] & 0xFFFFF000)); } /* Set The Source Address In The Destination */ - pageTable[destPageTableIndex] = (u_int32_t)( source | perms ); + pageTable[destPageTableIndex] = (uint32_t) (source | perms); /* Reload The Page Table; */ asm volatile( - "push %eax \n" - "movl %cr3,%eax\n" - "movl %eax,%cr3\n" - "pop %eax \n" + "push %eax \n" + "movl %cr3,%eax\n" + "movl %eax,%cr3\n" + "pop %eax \n" ); rmDone: /* Return */ - spinUnlock( &rmpSpinLock ); + spinUnlock(&rmpSpinLock); return (source); } @@ -281,51 +278,51 @@ 07/30/02 - This Returns A Free Page In The Top 1GB For The Kernel ************************************************************************/ -void *vmmGetFreeKernelPage( pidType pid, uInt16 count ) { +void *vmm_getFreeKernelPage(pidType pid, uint16_t count) { int x = 0, y = 0, c = 0; - u_int32_t *pageTableSrc = 0x0; + uint32_t *pageTableSrc = 0x0; - spinLock( &fkpSpinLock ); + spinLock(&fkpSpinLock); /* Lets Search For A Free Page */ - for ( x = 768; x < 1024; x++ ) { + for (x = 768; x < 1024; x++) { /* Set Page Table Address */ - pageTableSrc = (u_int32_t *) (PT_BASE_ADDR + (4096 * x)); + pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (4096 * x)); - for ( y = 0; y < 1024; y++ ) { + for (y = 0; y < 1024; y++) { /* Loop Through The Page Table Find An UnAllocated Page */ - if ( (u_int32_t) pageTableSrc[y] == (u_int32_t) 0x0 ) { - if ( count > 1 ) { - for ( c = 0; c < count; c++ ) { - if ( y + c < 1024 ) { - if ( (u_int32_t) pageTableSrc[y + c] != (u_int32_t) 0x0 ) { + if ((uint32_t) pageTableSrc[y] == (uint32_t) 0x0) { + if (count > 1) { + for (c = 0; c < count; c++) { + if (y + c < 1024) { + if ((uint32_t) pageTableSrc[y + c] != (uint32_t) 0x0) { c = -1; break; } } } - if ( c != -1 ) { - for ( c = 0; c < count; c++ ) { - if ( (vmm_remapPage( (u_int32_t) vmmFindFreePage( pid ), ((x * (1024 * 4096)) + ((y + c) * 4096)), KERNEL_PAGE_DEFAULT )) == 0x0 ) - K_PANIC( "vmmRemapPage failed: gfkp-1\n" ); - vmmClearVirtualPage( (u_int32_t)( (x * (1024 * 4096)) + ((y + c) * 4096) ) ); + if (c != -1) { + for (c = 0; c < count; c++) { + if ((vmm_remapPage((uint32_t) vmmFindFreePage(pid), ((x * (1024 * 4096)) + ((y + c) * 4096)), KERNEL_PAGE_DEFAULT)) == 0x0) + K_PANIC("vmmRemapPage failed: gfkp-1\n"); + vmmClearVirtualPage((uint32_t) ((x * (1024 * 4096)) + ((y + c) * 4096))); } - spinUnlock( &fkpSpinLock ); + spinUnlock(&fkpSpinLock); return ((void *) ((x * (1024 * 4096)) + (y * 4096))); } } else { /* Map A Physical Page To The Virtual Page */ - if ( (vmm_remapPage( (u_int32_t) vmmFindFreePage( pid ), ((x * (1024 * 4096)) + (y * 4096)), KERNEL_PAGE_DEFAULT )) == 0x0 ) - K_PANIC( "vmmRemapPage failed: gfkp-2\n" ); + if ((vmm_remapPage((uint32_t) vmmFindFreePage(pid), ((x * (1024 * 4096)) + (y * 4096)), KERNEL_PAGE_DEFAULT)) == 0x0) + K_PANIC("vmmRemapPage failed: gfkp-2\n"); /* Clear This Page So No Garbage Is There */ - vmmClearVirtualPage( (u_int32_t)( (x * (1024 * 4096)) + (y * 4096) ) ); + vmmClearVirtualPage((uint32_t) ((x * (1024 * 4096)) + (y * 4096))); - spinUnlock( &fkpSpinLock ); + spinUnlock(&fkpSpinLock); /* Return The Address Of The Newly Allocate Page */ return ((void *) ((x * (1024 * 4096)) + (y * 4096))); } @@ -334,71 +331,71 @@ } /* If No Free Page Was Found Return NULL */ - spinUnlock( &fkpSpinLock ); + spinUnlock(&fkpSpinLock); return (0x0); } /************************************************************************ - Function: void vmmClearVirtualPage(u_int32_t pageAddr); + Function: void vmmClearVirtualPage(uint32_t pageAddr); Description: This Will Null Out A Page Of Memory Notes: ************************************************************************/ -int vmmClearVirtualPage( u_int32_t pageAddr ) { - u_int32_t *src = 0x0; +int vmm_clearVirtualPage(uint32_t pageAddr) { + uint32_t *src = 0x0; int counter = 0x0; /* Set Source Pointer To Virtual Page Address */ - src = (u_int32_t *) pageAddr; + src = (uint32_t *) pageAddr; /* Clear Out The Page */ - for ( counter = 0x0; counter < PD_ENTRIES; counter++ ) { - src[counter] = (u_int32_t) 0x0; + for (counter = 0x0; counter < PD_ENTRIES; counter++) { + src[counter] = (uint32_t) 0x0; } /* Return */ return (0x0); } -void *vmmMapFromTask( pidType pid, void *ptr, u_int32_t size ) { +void *vmm_mapFromTask(pidType pid, void *ptr, uint32_t size) { kTask_t *child = 0x0; - u_int32_t i = 0x0, x = 0x0, y = 0x0, count = ((size + 4095) / 0x1000), c = 0x0; + uint32_t i = 0x0, x = 0x0, y = 0x0, count = ((size + 4095) / 0x1000), c = 0x0; uInt16 dI = 0x0, tI = 0x0; - u_int32_t baseAddr = 0x0, offset = 0x0; - u_int32_t *childPageDir = (u_int32_t *) 0x5A00000; - u_int32_t *childPageTable = 0x0; - u_int32_t *pageTableSrc = 0x0; - offset = (u_int32_t) ptr & 0xFFF; - baseAddr = (u_int32_t) ptr & 0xFFFFF000; - child = schedFindTask( pid ); + uint32_t baseAddr = 0x0, offset = 0x0; + uint32_t *childPageDir = (uint32_t *) 0x5A00000; + uint32_t *childPageTable = 0x0; + uint32_t *pageTableSrc = 0x0; + offset = (uint32_t) ptr & 0xFFF; + baseAddr = (uint32_t) ptr & 0xFFFFF000; + child = schedFindTask(pid); //Calculate The Page Table Index And Page Directory Index dI = (baseAddr / (1024 * 4096)); tI = ((baseAddr - (dI * (1024 * 4096))) / 4096); - if ( vmm_remapPage( child->tss.cr3, 0x5A00000, KERNEL_PAGE_DEFAULT ) == 0x0 ) - K_PANIC( "vmmFailed" ); + if (vmm_remapPage(child->tss.cr3, 0x5A00000, KERNEL_PAGE_DEFAULT) == 0x0) + K_PANIC("vmmFailed"); - for ( i = 0; i < 0x1000; i++ ) { - if ( vmm_remapPage( childPageDir[i], 0x5A01000 + (i * 0x1000), KERNEL_PAGE_DEFAULT ) == 0x0 ) - K_PANIC( "Returned NULL" ); + for (i = 0; i < 0x1000; i++) { + if (vmm_remapPage(childPageDir[i], 0x5A01000 + (i * 0x1000), KERNEL_PAGE_DEFAULT) == 0x0) + K_PANIC("Returned NULL"); } - for ( x = (_current->oInfo.vmStart / (1024 * 4096)); x < 1024; x++ ) { + for (x = (_current->oInfo.vmStart / (1024 * 4096)); x < 1024; x++) { - pageTableSrc = (u_int32_t *) (PT_BASE_ADDR + (4096 * x)); + pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (4096 * x)); - for ( y = 0; y < 1024; y++ ) { + for (y = 0; y < 1024; y++) { //Loop Through The Page Table Find An UnAllocated Page - if ( (u_int32_t) pageTableSrc[y] == (u_int32_t) 0x0 ) { + if ((uint32_t) pageTableSrc[y] == (uint32_t) 0x0) { - if ( count > 1 ) { + if (count > 1) { - for ( c = 0; ((c < count) && (y + c < 1024)); c++ ) { + for (c = 0; ((c < count) && (y + c < 1024)); c++) { - if ( (u_int32_t) pageTableSrc[y + c] != (u_int32_t) 0x0 ) { + if ((uint32_t) pageTableSrc[y + c] != (uint32_t) 0x0) { c = -1; break; @@ -407,28 +404,28 @@ } - if ( c != -1 ) { + if (c != -1) { - for ( c = 0; c < count; c++ ) { + for (c = 0; c < count; c++) { - if ( (tI + c) >= 0x1000 ) { + if ((tI + c) >= 0x1000) { dI++; tI = 0 - c; } - childPageTable = (u_int32_t *) (0x5A01000 + (0x1000 * dI)); + childPageTable = (uint32_t *) (0x5A01000 + (0x1000 * dI)); - if ( vmm_remapPage( childPageTable[tI + c], ((x * (1024 * 4096)) + ((y + c) * 4096)), KERNEL_PAGE_DEFAULT ) == 0x0 ) - K_PANIC( "remap == NULL" ); + if (vmm_remapPage(childPageTable[tI + c], ((x * (1024 * 4096)) + ((y + c) * 4096)), KERNEL_PAGE_DEFAULT) == 0x0) + K_PANIC("remap == NULL"); } - vmmUnmapPage( 0x5A00000, 1 ); + vmmUnmapPage(0x5A00000, 1); - for ( i = 0; i < 0x1000; i++ ) { - vmmUnmapPage( (0x5A01000 + (i * 0x1000)), 1 ); + for (i = 0; i < 0x1000; i++) { + vmmUnmapPage((0x5A01000 + (i * 0x1000)), 1); } return ((void *) ((x * (1024 * 4096)) + (y * 4096) + offset)); @@ -439,16 +436,16 @@ else { //Map A Physical Page To The Virtual Page - childPageTable = (u_int32_t *) (0x5A01000 + (0x1000 * dI)); + childPageTable = (uint32_t *) (0x5A01000 + (0x1000 * dI)); - if ( vmm_remapPage( childPageTable[tI], ((x * (1024 * 4096)) + (y * 4096)), KERNEL_PAGE_DEFAULT ) == 0x0 ) - K_PANIC( "remap Failed" ); + if (vmm_remapPage(childPageTable[tI], ((x * (1024 * 4096)) + (y * 4096)), KERNEL_PAGE_DEFAULT) == 0x0) + K_PANIC("remap Failed"); //Return The Address Of The Mapped In Memory - vmmUnmapPage( 0x5A00000, 1 ); + vmmUnmapPage(0x5A00000, 1); - for ( i = 0; i < 0x1000; i++ ) { - vmmUnmapPage( (0x5A01000 + (i * 0x1000)), 1 ); + for (i = 0; i < 0x1000; i++) { + vmmUnmapPage((0x5A01000 + (i * 0x1000)), 1); } return ((void *) ((x * (1024 * 4096)) + (y * 4096) + offset)); @@ -464,59 +461,59 @@ return (0x0); } -void *vmm_getFreeMallocPage( uInt16 count ) { +void *vmm_getFreeMallocPage(uInt16 count) { uInt16 x = 0x0, y = 0x0; int c = 0x0; - u_int32_t *pageTableSrc = 0x0; + uint32_t *pageTableSrc = 0x0; - spinLock( &fkpSpinLock ); + spinLock(&fkpSpinLock); /* Lets Search For A Free Page */ - for ( x = 960; x < 1024; x++ ) { + for (x = 960; x < 1024; x++) { /* Set Page Table Address */ - pageTableSrc = (u_int32_t *) (PT_BASE_ADDR + (0x1000 * x)); - for ( y = 0; y < 1024; y++ ) { + pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (0x1000 * x)); + for (y = 0; y < 1024; y++) { /* Loop Through The Page Table Find An UnAllocated Page */ - if ( (u_int32_t) pageTableSrc[y] == (u_int32_t) 0x0 ) { - if ( count > 1 ) { - for ( c = 0; c < count; c++ ) { - if ( y + c < 1024 ) { - if ( (u_int32_t) pageTableSrc[y + c] != (u_int32_t) 0x0 ) { + if ((uint32_t) pageTableSrc[y] == (uint32_t) 0x0) { + if (count > 1) { + for (c = 0; c < count; c++) { + if (y + c < 1024) { + if ((uint32_t) pageTableSrc[y + c] != (uint32_t) 0x0) { c = -1; break; } } } - if ( c != -1 ) { - for ( c = 0; c < count; c++ ) { - if ( vmm_remapPage( (u_int32_t) vmmFindFreePage( sysID ), ((x * 0x400000) + ((y + c) * 0x1000)), KERNEL_PAGE_DEFAULT ) == 0x0 ) - K_PANIC( "remap Failed" ); + if (c != -1) { + for (c = 0; c < count; c++) { + if (vmm_remapPage((uint32_t) vmmFindFreePage( sysID), ((x * 0x400000) + ((y + c) * 0x1000)), KERNEL_PAGE_DEFAULT) == 0x0) + K_PANIC("remap Failed"); - vmmClearVirtualPage( (u_int32_t)( (x * 0x400000) + ((y + c) * 0x1000) ) ); + vmmClearVirtualPage((uint32_t) ((x * 0x400000) + ((y + c) * 0x1000))); } - spinUnlock( &fkpSpinLock ); + spinUnlock(&fkpSpinLock); return ((void *) ((x * 0x400000) + (y * 0x1000))); } } else { /* Map A Physical Page To The Virtual Page */ - if ( vmm_remapPage( (u_int32_t) vmmFindFreePage( sysID ), ((x * 0x400000) + (y * 0x1000)), KERNEL_PAGE_DEFAULT ) == 0x0 ) - K_PANIC( "Failed" ); + if (vmm_remapPage((uint32_t) vmmFindFreePage( sysID), ((x * 0x400000) + (y * 0x1000)), KERNEL_PAGE_DEFAULT) == 0x0) + K_PANIC("Failed"); /* Clear This Page So No Garbage Is There */ - vmmClearVirtualPage( (u_int32_t)( (x * 0x400000) + (y * 0x1000) ) ); + vmmClearVirtualPage((uint32_t) ((x * 0x400000) + (y * 0x1000))); /* Return The Address Of The Newly Allocate Page */ - spinUnlock( &fkpSpinLock ); + spinUnlock(&fkpSpinLock); return ((void *) ((x * 0x400000) + (y * 0x1000))); } } } } /* If No Free Page Was Found Return NULL */ - spinUnlock( &fkpSpinLock ); + spinUnlock(&fkpSpinLock); return (0x0); } -int sys_mmap( struct thread *td, struct sys_mmap_args *uap ) { +int sys_mmap(struct thread *td, struct sys_mmap_args *uap) { vm_offset_t addr = 0x0; char *tmp = 0x0; struct file *fd = 0x0; @@ -526,126 +523,124 @@ /* #ifdef _VMM_DEBUG */ - if ( uap->addr != 0x0 ) { - kprintf( "Address hints are not supported yet.\n" ); + if (uap->addr != 0x0) { + kprintf("Address hints are not supported yet.\n"); } - kprintf( "uap->flags: [0x%X]\n", uap->flags ); - kprintf( "uap->addr: [0x%X]\n", uap->addr ); - kprintf( "uap->len: [0x%X]\n", uap->len ); - kprintf( "uap->prot: [0x%X]\n", uap->prot ); - kprintf( "uap->fd: [%i]\n", uap->fd ); - kprintf( "uap->pad: [0x%X]\n", uap->pad ); - kprintf( "uap->pos: [0x%X]\n", uap->pos ); + kprintf("uap->flags: [0x%X]\n", uap->flags); + kprintf("uap->addr: [0x%X]\n", uap->addr); + kprintf("uap->len: [0x%X]\n", uap->len); + kprintf("uap->prot: [0x%X]\n", uap->prot); + kprintf("uap->fd: [%i]\n", uap->fd); + kprintf("uap->pad: [0x%X]\n", uap->pad); + kprintf("uap->pos: [0x%X]\n", uap->pos); /* #endif */ - if ( uap->fd == -1 ) { + if (uap->fd == -1) { //td->td_retval[0] = (int) vmmGetFreeVirtualPage( _current->id, uap->len / 0x1000, VM_TASK ); //td->td_retval[0] = (int) - return (vmmGetFreeVirtualPage( _current->id, round_page( uap->len ) / 0x1000, VM_THRD )); + return (vmmGetFreeVirtualPage(_current->id, round_page( uap->len ) / 0x1000, VM_THRD)); } else { - kprintf( "uap->flags: [0x%X]\n", uap->flags ); - kprintf( "uap->addr: [0x%X]\n", uap->addr ); - kprintf( "uap->len: [0x%X]\n", uap->len ); - kprintf( "uap->prot: [0x%X]\n", uap->prot ); - kprintf( "uap->fd: [%i]\n", uap->fd ); - kprintf( "uap->pad: [0x%X]\n", uap->pad ); - kprintf( "uap->pos: [0x%X]\n", uap->pos ); + kprintf("uap->flags: [0x%X]\n", uap->flags); + kprintf("uap->addr: [0x%X]\n", uap->addr); + kprintf("uap->len: [0x%X]\n", uap->len); + kprintf("uap->prot: [0x%X]\n", uap->prot); + kprintf("uap->fd: [%i]\n", uap->fd); + kprintf("uap->pad: [0x%X]\n", uap->pad); + kprintf("uap->pos: [0x%X]\n", uap->pos); //K_PANIC("NOT YET\n"); - getfd( td, &fd, uap->fd ); - tmp = (char *) vmmGetFreeVirtualPage( _current->id, uap->len / 0x1000, VM_TASK ); - fread( tmp, uap->len, 0x1, fd->fd ); + getfd(td, &fd, uap->fd); + tmp = (char *) vmmGetFreeVirtualPage(_current->id, uap->len / 0x1000, VM_TASK); + fread(tmp, uap->len, 0x1, fd->fd); td->td_retval[0] = (int) tmp; } return (0x0); } -int obreak( struct thread *td, struct obreak_args *uap ) { - u_int32_t i = 0x0; +int obreak(struct thread *td, struct obreak_args *uap) { + uint32_t i = 0x0; vm_offset_t old = 0x0; vm_offset_t base = 0x0; - vm_offset_t - new = 0x0; + vm_offset_t new = 0x0; /* #ifdef _VMM_DEBUG */ - kprintf( "vm_offset_t: [%i]\n", sizeof(vm_offset_t) ); - kprintf( "nsize: [0x%X]\n", uap->nsize ); - kprintf( "vm_daddr: [0x%X]\n", td->vm_daddr ); - kprintf( "vm_dsize: [0x%X]\n", td->vm_dsize ); - kprintf( "total: [0x%X]\n", td->vm_daddr + td->vm_dsize ); + kprintf("vm_offset_t: [%i]\n", sizeof(vm_offset_t)); + kprintf("nsize: [0x%X]\n", uap->nsize); + kprintf("vm_daddr: [0x%X]\n", td->vm_daddr); + kprintf("vm_dsize: [0x%X]\n", td->vm_dsize); + kprintf("total: [0x%X]\n", td->vm_daddr + td->vm_dsize); /* #endif */ - new = round_page((vm_offset_t)uap->nsize); + new = round_page((vm_offset_t )uap->nsize); - base = round_page( (vm_offset_t) td->vm_daddr ); + base = round_page((vm_offset_t ) td->vm_daddr); - old = base + ctob( td->vm_dsize ); + old = base + ctob(td->vm_dsize); - if ( new < base ) - K_PANIC( "EINVAL" ); + if (new < base) + K_PANIC("EINVAL"); - if ( new > old ) { - for (i = old;i < new;i += 0x1000 - ) { - if (vmm_remapPage(vmmFindFreePage(_current->id),i,PAGE_DEFAULT) == 0x0) + if (new > old) { + for (i = old; i < new; i += 0x1000) { + if (vmm_remapPage(vmmFindFreePage(_current->id), i, PAGE_DEFAULT) == 0x0) K_PANIC("remap Failed"); - } - td->vm_dsize += btoc(new - old); } - else if ( new < old ) { - K_PANIC( "new < old" ); + td->vm_dsize += btoc(new - old); + } + else if (new < old) { + K_PANIC("new < old"); td->vm_dsize -= btoc(old - new); } return (0x0); } -int munmap( struct thread *td, struct munmap_args *uap ) { +int munmap(struct thread *td, struct munmap_args *uap) { /* HACK */ - kprintf( "munmap" ); + kprintf("munmap"); return (0x0); } -int vmm_cleanVirtualSpace( u_int32_t addr ) { +int vmm_cleanVirtualSpace(uint32_t addr) { int x = 0x0; int y = 0x0; - u_int32_t *pageTableSrc = 0x0; - u_int32_t *pageDir = 0x0; + uint32_t *pageTableSrc = 0x0; + uint32_t *pageDir = 0x0; - pageDir = (u_int32_t *) PD_BASE_ADDR; + pageDir = (uint32_t *) PD_BASE_ADDR; /* #ifdef DEBUG */ - kprintf( "CVS: [0x%X]\n", addr ); + kprintf("CVS: [0x%X]\n", addr); /* #endif */ - for ( x = (addr / (1024 * 4096)); x < PD_INDEX( VMM_USER_END ); x++ ) { - if ( (pageDir[x] & PAGE_PRESENT) == PAGE_PRESENT ) { - pageTableSrc = (u_int32_t *) (PT_BASE_ADDR + (0x1000 * x)); - for ( y = 0; y < 1024; y++ ) { - if ( (pageTableSrc[y] & PAGE_PRESENT) == PAGE_PRESENT ) { - if ( (pageTableSrc[y] & PAGE_COW) == PAGE_COW ) { + for (x = (addr / (1024 * 4096)); x < PD_INDEX(VMM_USER_END); x++) { + if ((pageDir[x] & PAGE_PRESENT) == PAGE_PRESENT) { + pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (0x1000 * x)); + for (y = 0; y < 1024; y++) { + if ((pageTableSrc[y] & PAGE_PRESENT) == PAGE_PRESENT) { + if ((pageTableSrc[y] & PAGE_COW) == PAGE_COW) { //kprintf( "COW: 0x%X", (x * 0x400000) + (y * 0x1000) ); pageTableSrc[y] = 0x0; } - else if ( (pageTableSrc[y] & PAGE_STACK) == PAGE_STACK ) { + else if ((pageTableSrc[y] & PAGE_STACK) == PAGE_STACK) { //kprintf("Page Stack!: 0x%X", (x * 0x400000) + (y * 0x1000)); // pageTableSrc[y] = 0x0; //MrOlsen (2016-01-18) NOTE: WHat should I Do Here? kprintf( "STACK: (%i:%i)", x, y ); } else { - //MrOlsen 2017-12-15 - kprintf( "Page Regular!: 0x%X", (x * 0x400000) + (y * 0x1000) ); + //MrOlsen 2017-12-15 - kprintf( "Page Regular!: 0x%X", (x * 0x400000) + (y * 0x1000) ); pageTableSrc[y] = 0x0; } } @@ -654,8 +649,8 @@ } asm( - "movl %cr3,%eax\n" - "movl %eax,%cr3\n" + "movl %cr3,%eax\n" + "movl %eax,%cr3\n" ); return (0x0); diff --git a/src/sys/vmm/unmappage.c b/src/sys/vmm/unmappage.c index ca8d367..7624d38 100644 --- a/src/sys/vmm/unmappage.c +++ b/src/sys/vmm/unmappage.c @@ -25,36 +25,34 @@ $Id: unmappage.c 188 2016-01-23 03:09:10Z reddawg $ -*****************************************************************************************/ + *****************************************************************************************/ #include /************************************************************************ -Function: void vmmUnmapPage(uInt32 pageAddr,int flags); -Description: This Function Will Unmap A Page From The Kernel VM Space - The Flags Variable Decides If Its To Free The Page Or Not - A Flag Of 0 Will Free It And A Flag Of 1 Will Keep It -Notes: + Function: void vmmUnmapPage(uInt32 pageAddr,int flags); + Description: This Function Will Unmap A Page From The Kernel VM Space + The Flags Variable Decides If Its To Free The Page Or Not + A Flag Of 0 Will Free It And A Flag Of 1 Will Keep It + Notes: -07/30/02 - I Have Decided That This Should Free The Physical Page There - Is No Reason To Keep It Marked As Not Available + 07/30/02 - I Have Decided That This Should Free The Physical Page There + Is No Reason To Keep It Marked As Not Available -07/30/02 - Ok A Found A Reason To Keep It Marked As Available I Admit - Even I Am Not Perfect Ok The Case Where You Wouldn't Want To - Free It Would Be On Something Like Where I Allocated A Page - To Create A New Virtual Space So Now It Has A Flag + 07/30/02 - Ok A Found A Reason To Keep It Marked As Available I Admit + Even I Am Not Perfect Ok The Case Where You Wouldn't Want To + Free It Would Be On Something Like Where I Allocated A Page + To Create A New Virtual Space So Now It Has A Flag -************************************************************************/ -void -vmmUnmapPage(uInt32 pageAddr, int flags) -{ - int pageDirectoryIndex = 0, pageTableIndex = 0; - uInt32 *pageTable = 0x0; + ************************************************************************/ +void vmm_unmapPage(uInt32 pageAddr, int flags) { + int pageDirectoryIndex = 0, pageTableIndex = 0; + uInt32 *pageTable = 0x0; /* Get The Index To The Page Directory */ pageDirectoryIndex = (pageAddr >> 22); - + //Calculate The Page Table Index pageTableIndex = ((pageAddr >> 12) & 0x3FF); @@ -72,46 +70,44 @@ pageTable[pageTableIndex] = 0x0; /* Rehash The Page Directory */ asm volatile( - "movl %cr3,%eax\n" - "movl %eax,%cr3\n" - ); + "movl %cr3,%eax\n" + "movl %eax,%cr3\n" + ); /* Return */ return; } - - /************************************************************************ -Function: void vmmUnmapPages(uInt32 pageAddr,int flags); -Description: This Function Will Unmap A Page From The Kernel VM Space - The Flags Variable Decides If Its To Free The Page Or Not - A Flag Of 0 Will Free It And A Flag Of 1 Will Keep It -Notes: + Function: void vmmUnmapPages(uInt32 pageAddr,int flags); + Description: This Function Will Unmap A Page From The Kernel VM Space + The Flags Variable Decides If Its To Free The Page Or Not + A Flag Of 0 Will Free It And A Flag Of 1 Will Keep It + Notes: -07/30/02 - I Have Decided That This Should Free The Physical Page There - Is No Reason To Keep It Marked As Not Available + 07/30/02 - I Have Decided That This Should Free The Physical Page There + Is No Reason To Keep It Marked As Not Available -07/30/02 - Ok A Found A Reason To Keep It Marked As Available I Admit - Even I Am Not Perfect Ok The Case Where You Wouldn't Want To - Free It Would Be On Something Like Where I Allocated A Page - To Create A New Virtual Space So Now It Has A Flag + 07/30/02 - Ok A Found A Reason To Keep It Marked As Available I Admit + Even I Am Not Perfect Ok The Case Where You Wouldn't Want To + Free It Would Be On Something Like Where I Allocated A Page + To Create A New Virtual Space So Now It Has A Flag -************************************************************************/ -void vmmUnmapPages(void *ptr,uInt32 size) { - uInt32 baseAddr = (uInt32)ptr & 0xFFFFF000; - uInt32 dI = 0x0,tI = 0x0; + ************************************************************************/ +void vmm_unmapPages(void *ptr, uint32_t size) { + uInt32 baseAddr = (uInt32) ptr & 0xFFFFF000; + uInt32 dI = 0x0, tI = 0x0; uInt32 y = 0x0; uInt32 *pageTable = 0x0; - dI = (baseAddr/(1024*4096)); - tI = ((baseAddr-(dI*(1024*4096)))/4096); - pageTable = (uInt32 *)(PT_BASE_ADDR + (4096*dI)); - for (y=tI;y<(tI+((size+4095)/4096));y++) { + dI = (baseAddr / (1024 * 4096)); + tI = ((baseAddr - (dI * (1024 * 4096))) / 4096); + pageTable = (uInt32 *) (PT_BASE_ADDR + (4096 * dI)); + for (y = tI; y < (tI + ((size + 4095) / 4096)); y++) { pageTable[y] = 0x0; - } - return; } + return; +} /*** $Log: unmappage.c,v $ diff --git a/src/sys/vmm/vmm_memory.c b/src/sys/vmm/vmm_memory.c index 432a69f..cb5366c 100644 --- a/src/sys/vmm/vmm_memory.c +++ b/src/sys/vmm/vmm_memory.c @@ -55,7 +55,7 @@ 02/20/2004 - Made It Report Real And Available Memory ************************************************************************/ -int vmmMemMapInit() { +int vmm_memMapInit() { int i = 0x0; int memStart = 0x0; @@ -66,7 +66,7 @@ vmmMemoryMap = (mMap *) VMM_MMAP_ADDR_RMODE; /* Initialize Map Make All Pages Not Available */ - for ( i = 0x0; i < numPages; i++ ) { + for (i = 0x0; i < numPages; i++) { vmmMemoryMap[i].cowCounter = 0x0; vmmMemoryMap[i].status = memNotavail; vmmMemoryMap[i].pid = vmmID; @@ -83,17 +83,17 @@ freePages++; - for ( i = memStart; i < numPages; i++ ) { + for (i = memStart; i < numPages; i++) { vmmMemoryMap[i].status = memAvail; freePages++; } - if ( systemVitals ) + if (systemVitals) systemVitals->freePages = freePages; /* Print Out Amount Of Memory */ - kprintf( "Real Memory: %iKB\n", numPages * 4 ); - kprintf( "Available Memory: %iKB\n", freePages * 4 ); + kprintf("Real Memory: %iKB\n", numPages * 4); + kprintf("Available Memory: %iKB\n", freePages * 4); /* Return */ return (0); @@ -119,12 +119,12 @@ * Save The States Of Both IRQ 1 And 2 So We Can Turn Them Off And Restore * Them Later */ - irq1State = inportByte( 0x21 ); - irq2State = inportByte( 0xA1 ); + irq1State = inportByte(0x21); + irq2State = inportByte(0xA1); /* Turn Off IRQ 1 And 2 To Prevent Chances Of Faults While Examining Memory */ - outportByte( 0x21, 0xFF ); - outportByte( 0xA1, 0xFF ); + outportByte(0x21, 0xFF); + outportByte(0xA1, 0xFF); /* Save The State Of Register CR0 */ cr0 = rcr0(); @@ -139,7 +139,7 @@ asm volatile ("wbinvd"); - load_cr0( cr0 | 0x00000001 | 0x40000000 | 0x20000000 ); + load_cr0(cr0 | 0x00000001 | 0x40000000 | 0x20000000); /* asm volatile ( @@ -150,10 +150,10 @@ ); */ - while ( memKb < 4096 && memCount != 0 ) { + while (memKb < 4096 && memCount != 0) { memKb++; - if ( memCount == -1 ) + if (memCount == -1) memCount = 8388608; else memCount += 1024 * 1024; @@ -166,13 +166,13 @@ asm("": : :"memory"); - if ( *mem != 0x55AA55AA ) { + if (*mem != 0x55AA55AA) { memCount = 0; } else { *mem = 0xAA55AA55; asm("": : :"memory"); - if ( *mem != 0xAA55AA55 ) { + if (*mem != 0xAA55AA55) { memCount = 0; } } @@ -187,7 +187,7 @@ asm("nop"); - load_cr0( cr0 ); + load_cr0(cr0); /* asm volatile ( @@ -201,8 +201,8 @@ asm("nop"); /* Restore States For Both IRQ 1 And 2 */ - outportByte( 0x21, irq1State ); - outportByte( 0xA1, irq2State ); + outportByte(0x21, irq1State); + outportByte(0xA1, irq2State); asm("nop"); @@ -220,37 +220,36 @@ Notes: ************************************************************************/ -uInt32 vmmFindFreePage( pidType pid ) { +uInt32 vmm_findFreePage(pidType pid) { int i = 0x0; /* Lets Look For A Free Page */ - if ( pid < sysID ) - kpanic( "Error: invalid PID %i\n", pid ); + if (pid < sysID) + kpanic("Error: invalid PID %i\n", pid); - spinLock( &vmmSpinLock ); + spinLock(&vmmSpinLock); - for ( i = 0; i <= numPages; i++ ) { + for (i = 0; i <= numPages; i++) { /* * If We Found A Free Page Set It To Not Available After That Set Its Own * And Return The Address */ - if ( (vmmMemoryMap[i].status == memAvail) - && (vmmMemoryMap[i].cowCounter == 0) ) { + if ((vmmMemoryMap[i].status == memAvail) && (vmmMemoryMap[i].cowCounter == 0)) { vmmMemoryMap[i].status = memNotavail; vmmMemoryMap[i].pid = pid; freePages--; - if ( systemVitals ) + if (systemVitals) systemVitals->freePages = freePages; //kprintf("vFFP: 0x%X\n", vmmMemoryMap[i].pageAddr); - spinUnlock( &vmmSpinLock ); + spinUnlock(&vmmSpinLock); return (vmmMemoryMap[i].pageAddr); } } /* If No Free Memory Is Found Return NULL */ - kpanic( "Out Of Memory!!!!" ); + kpanic("Out Of Memory!!!!"); return (0x0); } @@ -263,16 +262,16 @@ Notes: ************************************************************************/ -int freePage( uInt32 pageAddr ) { +int freePage(uInt32 pageAddr) { int pageIndex = 0x0; - assert( (pageAddr & 0xFFF) == 0x0 ); - spinLock( &vmmSpinLock ); + assert((pageAddr & 0xFFF) == 0x0); + spinLock(&vmmSpinLock); /* Find The Page Index To The Memory Map */ pageIndex = (pageAddr / 4096); /* Check If Page COW Is Greater Then 0 If It Is Dec It If Not Free It */ - if ( vmmMemoryMap[pageIndex].cowCounter == 0 ) { + if (vmmMemoryMap[pageIndex].cowCounter == 0) { /* Set Page As Avail So It Can Be Used Again */ vmmMemoryMap[pageIndex].status = memAvail; vmmMemoryMap[pageIndex].cowCounter = 0x0; @@ -282,9 +281,9 @@ } else { /* Adjust The COW Counter */ - adjustCowCounter( ((uInt32) vmmMemoryMap[pageIndex].pageAddr), -1 ); + adjustCowCounter(((uInt32) vmmMemoryMap[pageIndex].pageAddr), -1); } - spinUnlock( &vmmSpinLock ); + spinUnlock(&vmmSpinLock); /* Return */ return (0); } @@ -301,21 +300,21 @@ 08/01/02 - I Think If Counter Gets To 0 I Should Free The Page ************************************************************************/ -int adjustCowCounter( uInt32 baseAddr, int adjustment ) { +int adjustCowCounter(uInt32 baseAddr, int adjustment) { int vmmMemoryMapIndex = (baseAddr / 4096); - assert( (baseAddr & 0xFFF) == 0x0 ); - spinLock( &vmmCowSpinLock ); + assert((baseAddr & 0xFFF) == 0x0); + spinLock(&vmmCowSpinLock); /* Adjust COW Counter */ vmmMemoryMap[vmmMemoryMapIndex].cowCounter += adjustment; - if ( vmmMemoryMap[vmmMemoryMapIndex].cowCounter == 0 ) { + if (vmmMemoryMap[vmmMemoryMapIndex].cowCounter == 0) { vmmMemoryMap[vmmMemoryMapIndex].cowCounter = 0x0; vmmMemoryMap[vmmMemoryMapIndex].pid = vmmID; vmmMemoryMap[vmmMemoryMapIndex].status = memAvail; freePages++; systemVitals->freePages = freePages; } - spinUnlock( &vmmCowSpinLock ); + spinUnlock(&vmmCowSpinLock); /* Return */ return (0); } @@ -331,31 +330,31 @@ 08/04/02 - Added Checking For COW Pages First ************************************************************************/ -void vmmFreeProcessPages( pidType pid ) { +void vmm_freeProcessPages(pidType pid) { int i = 0, x = 0; uInt32 *tmpPageTable = 0x0; uInt32 *tmpPageDir = (uInt32 *) PD_BASE_ADDR; - spinLock( &vmmSpinLock ); + spinLock(&vmmSpinLock); /* Check Page Directory For An Avail Page Table */ - for ( i = 0; i <= 0x300; i++ ) { - if ( tmpPageDir[i] != 0 ) { + for (i = 0; i <= 0x300; i++) { + if (tmpPageDir[i] != 0) { /* Set Up Page Table Pointer */ tmpPageTable = (uInt32 *) (PT_BASE_ADDR + (i * 0x1000)); /* Check The Page Table For COW Pages */ - for ( x = 0; x < PD_ENTRIES; x++ ) { + for (x = 0; x < PD_ENTRIES; x++) { /* If The Page Is COW Adjust COW Counter */ - if ( ((uInt32) tmpPageTable[x] & PAGE_COW) == PAGE_COW ) { - adjustCowCounter( ((uInt32) tmpPageTable[x] & 0xFFFFF000), -1 ); + if (((uInt32) tmpPageTable[x] & PAGE_COW) == PAGE_COW) { + adjustCowCounter(((uInt32) tmpPageTable[x] & 0xFFFFF000), -1); } } } } /* Loop Through Pages To Find Pages Owned By Process */ - for ( i = 0; i < numPages; i++ ) { - if ( vmmMemoryMap[i].pid == pid ) { + for (i = 0; i < numPages; i++) { + if (vmmMemoryMap[i].pid == pid) { /* Check To See If The cowCounter Is Zero If So We Can Ree It */ - if ( vmmMemoryMap[i].cowCounter == 0 ) { + if (vmmMemoryMap[i].cowCounter == 0) { vmmMemoryMap[i].status = memAvail; vmmMemoryMap[i].cowCounter = 0x0; vmmMemoryMap[i].pid = vmmID; @@ -365,7 +364,7 @@ } } /* Return */ - spinUnlock( &vmmSpinLock ); + spinUnlock(&vmmSpinLock); return; } diff --git a/t.c b/t.c index 0384e84..5747164 100644 --- a/t.c +++ b/t.c @@ -81,7 +81,7 @@ union descriptorTableUnion *LDT; printf("sizeof(long) - %i\n", sizeof(long)); - printf("sizeof(u_int32_t) - %i\n", sizeof(u_int32_t)); + printf("sizeof(uint32_t) - %i\n", sizeof(uint32_t)); printf("end: 0x%X, etext: 0x%X, edata: 0x%X\n", &end, &etext, &edata); asm( @@ -232,7 +232,7 @@ //td = malloc(sizeof(struct thread)); printf("Base: 0x%X, Size: 0x%X, Shift: 0x%X\n", base, size, (base + (size << PAGE_SHIFT))); - printf("Base: 0x%X, Size: 0x%X, Shift: 0x%X\n", (u_int32_t)td.vm_daddr, td.vm_dsize, (u_int32_t)td.vm_daddr + (td.vm_dsize << PAGE_SHIFT)); + printf("Base: 0x%X, Size: 0x%X, Shift: 0x%X\n", (uint32_t)td.vm_daddr, td.vm_dsize, (uint32_t)td.vm_daddr + (td.vm_dsize << PAGE_SHIFT)); printf("sizeof(int *) = %i\n", sizeof(int *));

u_int32_t vmmFindFreePage uint32_t vmmFindFreePage ( pidType pid


Data Fields
u_int32_t	o_files [64]
uint32_t	o_files [64]
int	td_retval [2]

Typedefs

Functions

Function Documentation

Function Documentation

Functions

Functions

Function Documentation

Data Fields

Detailed Description

Data Fields

Detailed Description

Data Fields

Detailed Description

Detailed Description


Functions
int	elf_loadfile (kTask_t p, const char file, u_int32_t addr, u_int32_t entry)
int	elf_loadfile (kTask_t p, const char file, uint32_t addr, uint32_t entry)
char *	elfGetPhType (int phType)

		u_int32_t *	uint32_t *	addr,
		u_int32_t *	uint32_t *	entry
#define	R_386_RELATIVE 8
Functions
int	elf_loadfile (kTask_t p, const char file, u_int32_t addr, u_int32_t entry)
int	elf_loadfile (kTask_t p, const char file, uint32_t addr, uint32_t entry)
char *	elfGetPhType (int)


Functions
u_int32_t	vmm_getPhysicalAddr (uInt32 pageAddr)
uint32_t	vmm_getPhysicalAddr (uInt32 pageAddr)

u_int32_t vmm_getPhysicalAddr	uint32_t vmm_getPhysicalAddr	(	uInt32	pageAddr
typedef __uint16_t	u_int16_t
typedef __uint32_t	u_int32_t
typedef __uint32_t	uint32_t
typedef __uint64_t	u_int64_t


Data Fields
u_int32_t	base
uint32_t	base
u_int32_t	entry
uint32_t	entry
int32_t	execfd
u_int32_t	flags
uint32_t	flags
u_int32_t	pagesz
uint32_t	pagesz
u_int32_t	phdr
uint32_t	phdr
u_int32_t	phent
uint32_t	phent
u_int32_t	phnum
uint32_t	phnum
u_int32_t	trace
uint32_t	trace


Data Fields
u_int32_t	d_acylinders
uint32_t	d_acylinders
u_int32_t	d_bbsize
uint32_t	d_bbsize
u_int16_t	d_checksum
u_int16_t	d_cylskew
u_int32_t	d_drivedata [5]
uint32_t	d_drivedata [5]
u_int32_t	d_flags
uint32_t	d_flags
u_int32_t	d_headswitch
uint32_t	d_headswitch
u_int16_t	d_interleave
u_int32_t	d_magic
uint32_t	d_magic
u_int32_t	d_magic2
uint32_t	d_magic2
u_int32_t	d_ncylinders
uint32_t	d_ncylinders
u_int16_t	d_npartitions
u_int32_t	d_nsectors
uint32_t	d_nsectors
u_int32_t	d_ntracks
uint32_t	d_ntracks
char	d_packname [16]
u_int16_t	d_rpm
u_int32_t	d_sbsize
uint32_t	d_sbsize
u_int32_t	d_secpercyl
uint32_t	d_secpercyl
u_int32_t	d_secperunit
uint32_t	d_secperunit
u_int32_t	d_secsize
uint32_t	d_secsize
u_int32_t	d_spare [5]
uint32_t	d_spare [5]
u_int16_t	d_sparespercyl
u_int16_t	d_trackskew
u_int32_t	d_trkseek
uint32_t	d_trkseek
u_int16_t	d_type