====== Differences ====== This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
soc:2009:oremanj:journal:week4 [2009/06/20 18:29] rwcr |
soc:2009:oremanj:journal:week4 [2009/06/21 21:00] (current) rwcr |
||
|---|---|---|---|
| Line 187: | Line 187: | ||
| ==== Saturday, 20 June ==== | ==== Saturday, 20 June ==== | ||
| - | Everything has been pushed to mainline-review. :-) | + | Did a bunch of cleanup with no feature changes, and everything has been pushed to mainline-review. :-) |
| - | * Branch **wireless**: deleted! | + | * On branch **wireless**, merged in mainline-review such that wireless and mainline-review now represent the same tree. |
| * On branch **mainline-review**: | * On branch **mainline-review**: | ||
| * [[http://git.etherboot.org/?p=people/oremanj/gpxe.git;a=commit;h=4edf4718760dfb35c6a0c811fc2e019fb176e9fc| | * [[http://git.etherboot.org/?p=people/oremanj/gpxe.git;a=commit;h=4edf4718760dfb35c6a0c811fc2e019fb176e9fc| | ||
| - | [802.11] Add support for 802.11 devices with software MAC layer]] | + | [802.11] Add support for 802.11 devices with software MAC layer]] [+8,006 bytes] |
| * [[http://git.etherboot.org/?p=people/oremanj/gpxe.git;a=commit;h=b23fba30c9847b8fabf651d50cf6e4e323753548| | * [[http://git.etherboot.org/?p=people/oremanj/gpxe.git;a=commit;h=b23fba30c9847b8fabf651d50cf6e4e323753548| | ||
| - | [rtl818x] Add driver for Realtek 8180/8185 wireless cards]] | + | [rtl818x] Add driver for Realtek 8180/8185 wireless cards]] [+3,298 + (2,930 for rtl8180; 8,198 for rtl8185) bytes] |
| * [[http://git.etherboot.org/?p=people/oremanj/gpxe.git;a=commit;h=dcd4ae5d0edbc9abd429bce50f0e58726cdfe00b| | * [[http://git.etherboot.org/?p=people/oremanj/gpxe.git;a=commit;h=dcd4ae5d0edbc9abd429bce50f0e58726cdfe00b| | ||
| - | [iwmgmt] Add user-level 802.11 management commands and common error tables]] | + | [iwmgmt] Add user-level 802.11 management commands and common error tables]] [+1,779 bytes] |
| - | * [[http://git.etherboot.org/?p=people/oremanj/gpxe.git;a=commit;h=c35f15c32c3891711f0b0a99b8439aefd025b5ce| | + | |
| - | Merge branch 'wireless' into mainline-review]] (merge style "ours", no modifications introduced) | + | I took the opportunity to make the Realtek naming sane: |
| + | % make bin/rtl8180.lkrn # for an 8180 chipset with any of the 802.11b RF modules | ||
| + | % make bin/rtl8185.lkrn # for an 8185 chipset with its 8225 RF module | ||
| + | % make bin/rtl818x--rtl8180_sa2400.lkrn # 8180 chipset with a specific RF module, for the size-pressed | ||
| + | % make bin/10ec8185.rom # rtl8185 generic PCI card ROM (needs to be piggybacked on e.g. an r8169) | ||
| + | The main driver code is now called "rtl818x" to signify that it works for both 8180 and 8185. It was getting quite confusing having some things named rtl8180 and some named rtl818x. The original distinction between the two (from the Linux driver) was that the rtl818x structures also applied to the rtl8187 USB device; I doubt gPXE is ever going to support wireless USB devices, so we don't have to follow that lead. The rtl8180.c and rtl8185.c are each wrapper files (zero bytes compiled) that use ''REQUIRE_OBJECT()'' to pull in the necessary ''rtl818x.o'' main driver and whatever RF modules are required for the type of card they represent; each also contains a dummy list of ''PCI_ROM'' lines for that card, to enable the form of ''make'' shown in the last line above. The real NIC list in ''rtl818x.c'' is presented such that ''parserom.pl'' will not be confused by it. | ||
| + | |||
| + | I also moved the wireless code into net/80211/ (from the root of net/), in recognition that there will be several more files appearing there shortly to support encryption. | ||
| Commits ready for mainline review, in reverse order: | Commits ready for mainline review, in reverse order: | ||
| - | oremanj@xenon /home/oremanj/dev/gpxe/src % git log --pretty=oneline --first-parent mainline-review | head -n 13 | + | oremanj@xenon /home/oremanj/dev/gpxe/src % git log --pretty=oneline mainline-review | head -n 12 |
| dcd4ae5d0edbc9abd429bce50f0e58726cdfe00b [iwmgmt] Add user-level 802.11 management commands and common error tables | dcd4ae5d0edbc9abd429bce50f0e58726cdfe00b [iwmgmt] Add user-level 802.11 management commands and common error tables | ||
| b23fba30c9847b8fabf651d50cf6e4e323753548 [rtl818x] Add driver for Realtek 8180/8185 wireless cards | b23fba30c9847b8fabf651d50cf6e4e323753548 [rtl818x] Add driver for Realtek 8180/8185 wireless cards | ||
| Line 214: | Line 221: | ||
| 18e6470d06d8846d531d97d881be6f1278bd2f15 [nvs] Add init function for Atmel 93C66 EEPROM | 18e6470d06d8846d531d97d881be6f1278bd2f15 [nvs] Add init function for Atmel 93C66 EEPROM | ||
| - | Next up: encryption! | + | Next up: encryption... |
