Re: Preliminary restructuring layout (was Re: sys/ tree re-structuring proposal)

[Julian Elischer <julian@xxxxxxxxxxxx>]

Matthew Dillon wrote:

>     Also note that architecture-specific drivers will be in subdirectories
>     under dev/<function>, the idea being that there isn't a whole lot of it
>     and it's better to keep things grouped by function so all of our ethernet
>     drivers (for example) are in dev/netif.
>
>     modules/ will be removed entirely and its Makefile's will be integrated
>     into the appropriate drivers.  Having a separate modules/ directory
>     hierarchy was a terrible idea and we are well rid of it.
>
> 					-Matt
>
> .
> ./boot (unchanged)
>
> ./compile

I prefer -current's [arch]/compile

> ./conf
> ./contrib		(TBD)

> ./dev/raid			Raid controllers
> ./dev/raid/aac
> ./dev/raid/vinum
> ./dev/raid/ida
> ./dev/raid/mlx
> ./dev/raid/amr
> ./dev/raid/twe
> ./dev/raid/asr
> ./dev/raid/iir
> ./dev/raid/mly
> ./dev/raid/ciss
> ./dev/raid/dpt

I think raid adapters SHOULD be under 'disk'
dev/disk/raid woudl be fine, except note that (for example) teh mly driver 
exports its virtual disks via the CAM system.. so maybe it should be inder 
dev/scsi


> ./dev/disk			Normal disk controllers (incls scsi)
> ./dev/disk/ata
> ./dev/disk/aha
> ./dev/disk/ahb

I think scsi adapters should not be under disk..
maybe dev/scsi, but maybe as a bus as they are logically similar to USB etc.

> ./dev/disk/aic
> ./dev/disk/aic7xxx
> ./dev/disk/aic7xxx/aicasm
> ./dev/disk/ncv
> ./dev/disk/nsp
> ./dev/disk/stg
> ./dev/disk/vn
> ./dev/disk/md
> ./dev/disk/ccd
> ./dev/disk/trm
> ./dev/disk/isp
> ./dev/disk/ispfw
> ./dev/disk/sym
> ./dev/disk/fd
> ./dev/disk/amd
> ./dev/disk/ncr
> ./dev/disk/simos
> ./dev/disk/buslogic
> ./dev/disk/ct
> ./dev/disk/advansys
> ./dev/disk/i386
> ./dev/disk/i386/bs
> ./dev/disk/ic_layer
> ./dev/disk/mpt
> ./dev/disk/mpt/mpilib
> ./dev/disk/vpo


> ./dev/netif			Network Interfaces

I'd even break them further..
dev/net/ethernet
dev/net/wireless
dev/net/WAN
dev/net/ATM



maybe even reverse it to
net/dev/ethernet

> ./dev/netif/ic_layer
> ./dev/netif/plip
> ./dev/netif/de
> ./dev/netif/fea
> ./dev/netif/fpa
> ./dev/netif/ic
> ./dev/netif/sn
> ./dev/netif/snc
> ./dev/netif/cue
> ./dev/netif/dc
> ./dev/netif/fwe
> ./dev/netif/kue
> ./dev/netif/lnc_p
> ./dev/netif/mn
> ./dev/netif/pcn
> ./dev/netif/ppp
> ./dev/netif/aue
> ./dev/netif/awi
> ./dev/netif/ie
> ./dev/netif/wi
> ./dev/netif/xe
> ./dev/netif/ray
> ./dev/netif/ar
> ./dev/netif/cm
> ./dev/netif/cs
> ./dev/netif/ed
> ./dev/netif/ep
> ./dev/netif/ex
> ./dev/netif/fe
> ./dev/netif/sbni
> ./dev/netif/sbsh
> ./dev/netif/sr
> ./dev/netif/an
> ./dev/netif/bge
> ./dev/netif/em
> ./dev/netif/fxp
> ./dev/netif/gx
> ./dev/netif/lge
> ./dev/netif/my
> ./dev/netif/nge
> ./dev/netif/tx
> ./dev/netif/txp
> ./dev/netif/vx
> ./dev/netif/rl
> ./dev/netif/mii_layer
> ./dev/netif/pdq_layer
> ./dev/netif/sf
> ./dev/netif/sis
> ./dev/netif/sk
> ./dev/netif/ste
> ./dev/netif/ti
> ./dev/netif/tl
> ./dev/netif/vr
> ./dev/netif/wb
> ./dev/netif/wx
> ./dev/netif/xl


> ./dev/atm			ATM devices

dev/net/atm

> ./dev/atm/en
> ./dev/atm/hfa
> ./dev/atm/hea


> ./emulation			Syscall/environment emulation (for now)
> ./emulation/svr4
> ./emulation/svr4/i386


how does isdn come under emulation?

net/proto/isdn/14b maybe

> ./emulation/i4b
> ./emulation/i4b/capi
> ./emulation/i4b/capi/iavc
> ./emulation/i4b/driver
> ./emulation/i4b/include
> ./emulation/i4b/layer1
> ./emulation/i4b/layer1/ifpi
> ./emulation/i4b/layer1/ifpi2
> ./emulation/i4b/layer1/ifpnp
> ./emulation/i4b/layer1/ihfc
> ./emulation/i4b/layer1/isic
> ./emulation/i4b/layer1/itjc
> ./emulation/i4b/layer1/iwic
> ./emulation/i4b/layer2
> ./emulation/i4b/layer3
> ./emulation/i4b/layer4

> ./emulation/posix4
> ./emulation/linux
> ./emulation/linux/i386
> ./emulation/linux/i386/linprocfs
> ./emulation/ibcs2
> ./emulation/ibcs2/i386


net/proto/
> ./netproto			Network protocols (move ip and tcp here?)
> ./netproto/smb
> ./netproto/ipx
> ./netproto/ipsec
> ./netproto/ns
> ./netproto/ncp
> ./netproto/key
> ./netproto/natm
> ./netproto/atm
> ./netproto/atm/ipatm
> ./netproto/atm/sigpvc
> ./netproto/atm/spans
> ./netproto/atm/uni
> ./netproto/atalk
> ./arch				Architectures (TBD)
> ./arch/pc98
> ./arch/i386
> ./kern
> ./libkern
> ./libkern/alpha
> ./net
> ./netgraph

net/proto/inet
net/proto/inet6

> ./netinet
> ./netinet6
> ./opencrypto
> ./sys
> ./vm