ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/name_registry.cpp
(Generate patch)

Comparing SheepShaver/src/name_registry.cpp (file contents):
Revision 1.18 by gbeauche, 2005-03-19T04:31:59Z vs.
Revision 1.21 by asvitkine, 2009-08-18T18:26:10Z

# Line 1 | Line 1
1   /*
2   *  name_registry.cpp - Name Registry handling
3   *
4 < *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
4 > *  SheepShaver (C) 1997-2008 Christian Bauer and Marc Hellwig
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 60 | Line 60 | static const uint8 video_driver[] = {
60  
61   // Ethernet driver stub
62   static const uint8 ethernet_driver[] = {
63 + #ifdef USE_ETHER_FULL_DRIVER
64 + #include "EthernetDriverFull.i"
65 + #else
66   #include "EthernetDriverStub.i"
67 + #endif
68   };
69  
70   // Helper for RegEntryID
# Line 93 | Line 97 | void DoPatchNameRegistry(void)
97                  SheepRegEntryID aapl_rom;
98                  if (!RegistryCStrEntryCreate(device_tree.addr(), "AAPL,ROM", aapl_rom.addr())) {
99                          RegistryPropertyCreateStr(aapl_rom.addr(), "device_type", "rom");
100 <                        SheepPair reg(ROM_BASE, ROM_SIZE);
100 >                        SheepPair reg(ROMBase, ROM_SIZE);
101                          RegistryPropertyCreate(aapl_rom.addr(), "reg", reg.addr(), 8);
102                  }
103  
# Line 333 | Line 337 | void DoPatchNameRegistry(void)
337                  }
338  
339                  // Create "ethernet"
336                // XXX the current ethernet driver is not direct addressing clean
337 #if REAL_ADDRESSING
340                  SheepRegEntryID ethernet;
341                  if (!RegistryCStrEntryCreate(device_tree.addr(), "ethernet", ethernet.addr())) {
342                          RegistryPropertyCreateStr(ethernet.addr(), "AAPL,connector", "ethernet");
# Line 345 | Line 347 | void DoPatchNameRegistry(void)
347                          // local-mac-address
348                          // max-frame-size 2048
349                  }
348 #endif
350          }
351          D(bug("done.\n"));
352   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines